diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-08-17 14:57:00 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-08-18 11:35:45 +0200 |
| commit | e2e4984ad62330fa1d328d9eeb0a3e42620825b6 (patch) | |
| tree | bf87f5aa4b59092055b8f2a1aed7d2377265e1ed /sysdeps/mips | |
| parent | 0ba4a7522b9491ad32713ab87990e627ef196de4 (diff) | |
| download | glibc-e2e4984ad62330fa1d328d9eeb0a3e42620825b6.zip glibc-e2e4984ad62330fa1d328d9eeb0a3e42620825b6.tar.gz glibc-e2e4984ad62330fa1d328d9eeb0a3e42620825b6.tar.bz2 | |
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.
(cherry picked from commit d9067fca40b8aac156d73cfa44d6875813555a6c)
Diffstat (limited to 'sysdeps/mips')
| -rw-r--r-- | sysdeps/mips/Makefile | 1 | ||||
| -rw-r--r-- | sysdeps/mips/nptl/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sysdeps/mips/Makefile b/sysdeps/mips/Makefile index 3d35523..7c1d779 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 117744f..dda154d 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 |