about summary refs log tree commit diff
path: root/sysdeps/mips
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-08-17 14:57:00 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-08-17 14:57:01 +0200
commitd9067fca40b8aac156d73cfa44d6875813555a6c (patch)
tree093dd2b5de63ad23ed2a938aa25948941f919cd8 /sysdeps/mips
parentc20809709ab330f927c87fefe439554d3b1f643a (diff)
downloadglibc-d9067fca40b8aac156d73cfa44d6875813555a6c.tar.gz
glibc-d9067fca40b8aac156d73cfa44d6875813555a6c.tar.xz
glibc-d9067fca40b8aac156d73cfa44d6875813555a6c.zip
Do not override objects in libc.a in other static libraries [BZ #20452]
With this change, we no longer add sysdep.o and similar objects which
are present in libc.a to other static libraries.
Diffstat (limited to 'sysdeps/mips')
-rw-r--r--sysdeps/mips/Makefile1
-rw-r--r--sysdeps/mips/nptl/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/sysdeps/mips/Makefile b/sysdeps/mips/Makefile
index 3d3552322b..7c1d77941e 100644
--- a/sysdeps/mips/Makefile
+++ b/sysdeps/mips/Makefile
@@ -9,6 +9,7 @@ endif
 
 ifeq ($(subdir),rt)
 librt-sysdep_routines += rt-sysdep
+librt-shared-only-routines += rt-sysdep
 endif
 
 ifeq ($(subdir),debug)
diff --git a/sysdeps/mips/nptl/Makefile b/sysdeps/mips/nptl/Makefile
index 117744ffe2..dda154d842 100644
--- a/sysdeps/mips/nptl/Makefile
+++ b/sysdeps/mips/nptl/Makefile
@@ -21,4 +21,5 @@ endif
 
 ifeq ($(subdir),nptl)
 libpthread-sysdep_routines += nptl-sysdep
+libpthread-shared-only-routines += nptl-sysdep
 endif