aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@codesourcery.com>2012-01-06 20:14:44 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-01-06 20:14:44 +0000
commit2d80bda39073a35af4b904d27fa1511cd309b26f (patch)
treeace13eb7f21afd7c3eac447c3919f2233738a517
parent50e73d1379b4ed494f733ab699c638f8587a4137 (diff)
downloadglibc-2d80bda39073a35af4b904d27fa1511cd309b26f.tar.xz
glibc-2d80bda39073a35af4b904d27fa1511cd309b26f.zip
Add ARM dependency of libmemusage.so on libc_nonshared.a.
-rw-r--r--ChangeLog.arm6
-rw-r--r--sysdeps/arm/Makefile5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog.arm b/ChangeLog.arm
index 36027d56a1..0d0b6ff584 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,9 @@
+2012-01-05 Nathan Sidwell <nathan@codesourcery.com>
+ Tom de Vries <tom@codesourcery.com>
+
+ * sysdeps/arm/Makefile (libmemusage.so): Add libc_nonshared.a
+ dependency.
+
2012-01-03 Mike Frysinger <vapier@gentoo.org>
[BZ #12354]
diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile
index 5651161516..1a88430a2c 100644
--- a/sysdeps/arm/Makefile
+++ b/sysdeps/arm/Makefile
@@ -7,3 +7,8 @@ endif
ifeq ($(subdir),csu)
gen-as-const-headers += tlsdesc.sym
endif
+
+# to pull in __aeabi_read_tp, needed for tls
+ifeq ($(subdir),malloc)
+$(objpfx)libmemusage.so: $(common-objpfx)libc_nonshared.a
+endif