diff --git a/plat/cpm/descr b/plat/cpm/descr
index 1b2b43777..ecaa066f8 100644
--- a/plat/cpm/descr
+++ b/plat/cpm/descr
@@ -56,7 +56,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -i SEPID=-b1:0
 	mapflag -fp FLOATS={PLATFORMDIR}/libfp.a
 	args {ALIGN} {SEPID?} \
diff --git a/plat/em22/descr b/plat/em22/descr
index c8610ddaf..42638e65c 100644
--- a/plat/em22/descr
+++ b/plat/em22/descr
@@ -31,7 +31,9 @@ name asld
 	to .out
 	outfile e.out
 	program {EM}/lib/ack/em_ass
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# No -lm: the maths functions are in libc.a, which is always linked,
+	# and em_ass cannot take a library twice.
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -+* ASS_F={ASS_F?} -+*
 	mapflag --* ASS_F={ASS_F?} --*
 	mapflag -s* SIZE_FLAG=-s*
diff --git a/plat/linux386/descr b/plat/linux386/descr
index 9ae17a548..2350fe2e0 100644
--- a/plat/linux386/descr
+++ b/plat/linux386/descr
@@ -56,7 +56,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -fp FLOATS={EM}/{LIB}fp
 	args {ALIGN} {SEPID?} \
 		({RTS}:.b=-u _i_main) \
diff --git a/plat/linux68k/descr b/plat/linux68k/descr
index d813f61a8..9a576f56f 100644
--- a/plat/linux68k/descr
+++ b/plat/linux68k/descr
@@ -56,7 +56,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -fp FLOATS={EM}/{LIB}fp
 	args {ALIGN} {SEPID?} \
 		({RTS}:.b=-u _i_main) \
diff --git a/plat/linuxmips/descr b/plat/linuxmips/descr
index 7714d7272..9121e2b70 100644
--- a/plat/linuxmips/descr
+++ b/plat/linuxmips/descr
@@ -57,7 +57,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -fp FLOATS={EM}/{LIB}fp
 	args {ALIGN} {SEPID?} \
 		({RTS}:.b=-u _i_main) \
diff --git a/plat/linuxppc/descr b/plat/linuxppc/descr
index 9e43fabb7..983b2bb59 100644
--- a/plat/linuxppc/descr
+++ b/plat/linuxppc/descr
@@ -56,7 +56,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -fp FLOATS={EM}/{LIB}fp
 	args {ALIGN} {SEPID?} \
 		({RTS}:.b=-u _i_main) \
diff --git a/plat/minix68k/descr b/plat/minix68k/descr
index 461018a3a..472719b6f 100644
--- a/plat/minix68k/descr
+++ b/plat/minix68k/descr
@@ -54,7 +54,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={EM}/{LIB}*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 #	mapflag -i SEPID=-b1:0
 	mapflag -fp LIBFP={EM}/{NLIB}fp
 	mapflag -ansi C_LIB={EM}/{LIB}ac
diff --git a/plat/msdos386/descr b/plat/msdos386/descr
index b6683871b..e2e6822e8 100644
--- a/plat/msdos386/descr
+++ b/plat/msdos386/descr
@@ -44,7 +44,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -fp FLOATS={EM}/{ILIB}fp
 	args {ALIGN} \
 		({RTS}:.b=-u _i_main) \
diff --git a/plat/msdos86/descr b/plat/msdos86/descr
index 2ef1724ee..78f66f514 100644
--- a/plat/msdos86/descr
+++ b/plat/msdos86/descr
@@ -53,7 +53,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -i SEPID=-b1:0
 	mapflag -fp FLOATS={EM}/{ILIB}fp
 	args {ALIGN} {SEPID} \
diff --git a/plat/osx386/descr b/plat/osx386/descr
index 045d2e720..5f1431bc1 100644
--- a/plat/osx386/descr
+++ b/plat/osx386/descr
@@ -54,7 +54,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -fp FLOATS={EM}/{LIB}fp
 	args {ALIGN} {SEPID?} \
 		({RTS}:.b=-u _i_main) \
diff --git a/plat/osxppc/descr b/plat/osxppc/descr
index 77fc45260..ec7bb199d 100644
--- a/plat/osxppc/descr
+++ b/plat/osxppc/descr
@@ -57,7 +57,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -fp FLOATS={EM}/{LIB}fp
 	args {ALIGN} {SEPID?} \
 		({RTS}:.b=-u _i_main) \
diff --git a/plat/pc86/descr b/plat/pc86/descr
index 4f0823c0e..9ada826a5 100644
--- a/plat/pc86/descr
+++ b/plat/pc86/descr
@@ -48,7 +48,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -i SEPID=-b1:0
 	mapflag -fp FLOATS={EM}/{ILIB}fp
 	args {ALIGN} {SEPID?} \
diff --git a/plat/pdpv7/descr b/plat/pdpv7/descr
index f430c6b3c..befb8d36f 100644
--- a/plat/pdpv7/descr
+++ b/plat/pdpv7/descr
@@ -53,7 +53,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -i SEPID=-b1:0
 	mapflag -n ALIGN=-a0:1 -a1:0x2000 -a2:1 -a3:1
 	mapflag -nr ALIGN=-a0:1 -a1:1 -a2:0x2000 -a3:1
diff --git a/plat/qemuppc/descr b/plat/qemuppc/descr
index 9d1a80427..8e2e91cf6 100644
--- a/plat/qemuppc/descr
+++ b/plat/qemuppc/descr
@@ -56,7 +56,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -fp FLOATS={EM}/{LIB}fp
 	args {ALIGN} {SEPID?} \
 		({RTS}:.b=-u _i_main) \
diff --git a/plat/rpi/descr b/plat/rpi/descr
index 43d3256a3..5ba1470c1 100644
--- a/plat/rpi/descr
+++ b/plat/rpi/descr
@@ -47,7 +47,9 @@ name led
 	from .o.a
 	to .out
 	program {EM}/lib/ack/em_led
-	mapflag -l* LNAME={PLATFORMDIR}/lib*
+	# The maths functions are in libc.a: -lm links that.
+	mapflag -lm LNAME={PLATFORMDIR}/libc.a
+	mapflag -l* LNAME={PLATFORMDIR}/lib*.a
 	mapflag -i SEPID=-b1:0
 	mapflag -fp FLOATS={EM}/{ILIB}fp
 	args {ALIGN} {SEPID?} \