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.

diff --git a/ChangeLog b/ChangeLog
index ae29267c1eae41bac7e7e6fbf61aa21dd6fa51da..92f7d869302be71ae317ec04cc03a394371a0ca5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2016-08-17  Florian Weimer  <fweimer@redhat.com>
+
+       [BZ #20452]
+       Avoid additional copies of objects in libc.a in static libraries.
+       * sysdeps/ia64/nptl/Makefile (libpthread-shared-only-routines):
+       Add ptw-sysdep, ptw-sigblock, ptw-sigprocmask.
+       * sysdeps/mips/Makefile (librt-shared-only-routines): Add
+       rt-sysdep.
+       * sysdeps/mips/nptl/Makefile (libpthread-shared-only-routines):
+       Add nptl-sysdep.
+       * sysdeps/s390/nptl/Makefile (libpthread-shared-only-routines):
+       Add ptw-sysdep.
+       * sysdeps/unix/alpha/Makefile (librt-shared-only-routines): Add
+       rt-sysdep.
+       * sysdeps/unix/sysv/linux/alpha/Makefile
+       (libpthread-shared-only-routines): Add ptw-sysdep,
+       ptw-sigprocmask, ptw-rt_sigaction.
+       * sysdeps/unix/sysv/linux/ia64/Makefile
+       (librt-shared-only-routines): Add rt-sysdep.
+       * sysdeps/unix/sysv/linux/i386/Makefile
+       (libpthread-shared-only-routines): Add libc-do-syscall.
+       * sysdeps/unix/sysv/linux/microblaze/Makefile
+       (libpthread-shared-only-routines): Add sysdep.
+       * sysdeps/unix/sysv/linux/powerpc/Makefile
+       (librt-shared-only-routines): Add rt-sysdep.
+       (libpthread-shared-only-routines): Add sysdep.
+       * sysdeps/unix/sysv/linux/s390/Makefile
+       (librt-shared-only-routines): Add rt-sysdep.
+       * sysdeps/unix/sysv/linux/sparc/Makefile
+       (librt-shared-only-routines): Add rt-sysdep.
+       (libpthread-shared-only-routines): Add sysdep.
+       * sysdeps/unix/sysv/linux/tile/Makefile
+       (libpthread-shared-only-routines): Likewise.
+
 2016-08-16  Joseph Myers  <joseph@codesourcery.com>
 
        * soft-fp/extended.h [_FP_W_TYPE_SIZE < 64] (FP_UNPACK_RAW_E):

diff --git a/sysdeps/ia64/nptl/Makefile b/sysdeps/ia64/nptl/Makefile
index 48f1327446a04a8098e8d84dcf10599ea20a8941..1e6be8eea86ae3dba1c0ecab645b0328fc70184a 100644 (file)
--- a/sysdeps/ia64/nptl/Makefile
+++ b/sysdeps/ia64/nptl/Makefile
@@ -21,4 +21,5 @@ endif
 
 ifeq ($(subdir),nptl)
 libpthread-routines += ptw-sysdep ptw-sigblock ptw-sigprocmask
+libpthread-shared-only-routines += ptw-sysdep ptw-sigblock ptw-sigprocmask
 endif

diff --git a/sysdeps/mips/Makefile b/sysdeps/mips/Makefile
index 3d3552322b335647d59d02ac0cdc5a8c2170a720..7c1d77941ec154b460af9b2581cec7e82141acdf 100644 (file)
--- 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 117744ffe2ddba63c1ed7c767da25ba8a080706c..dda154d8423867092dc00328ca8eaef030aabf8f 100644 (file)
--- 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

diff --git a/sysdeps/s390/nptl/Makefile b/sysdeps/s390/nptl/Makefile
index 5734b983b0b5ba5ddb13686964afc263d2a96e8f..3a391c82179b9f5a58cedf08214b8696aee8689b 100644 (file)
--- a/sysdeps/s390/nptl/Makefile
+++ b/sysdeps/s390/nptl/Makefile
@@ -21,4 +21,5 @@ endif
 
 ifeq ($(subdir),nptl)
 libpthread-routines += ptw-sysdep
+libpthread-shared-only-routines += ptw-sysdep
 endif

diff --git a/sysdeps/unix/alpha/Makefile b/sysdeps/unix/alpha/Makefile
index 441aa02a83800f8b1288e58afd68a4beb1bb12d7..0660847f15aab061b2d4b2edcfe9e4ac6225ec1c 100644 (file)
--- a/sysdeps/unix/alpha/Makefile
+++ b/sysdeps/unix/alpha/Makefile
@@ -1,3 +1,4 @@
 ifeq ($(subdir),rt)
 librt-sysdep_routines += rt-sysdep
+librt-shared-only-routines += rt-sysdep
 endif

diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile
index c089545e9b84ee65d50a6206741205788ea616cb..3b523b70cfadb003584dbd5fad6548d098ac4863 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/Makefile
+++ b/sysdeps/unix/sysv/linux/alpha/Makefile
@@ -40,4 +40,5 @@ endif   # math
 ifeq ($(subdir),nptl)
 # pull in __syscall_error routine, __sigprocmask, __syscall_rt_sigaction
 libpthread-routines += ptw-sysdep ptw-sigprocmask ptw-rt_sigaction
+libpthread-shared-only-routines += ptw-sysdep ptw-sigprocmask ptw-rt_sigaction
 endif

diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile
index b015ff7c760c189e14027e9f0aa757195427cfc2..6073a9fe04f0b51009b190876d4b60e14e74ee15 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/Makefile
+++ b/sysdeps/unix/sysv/linux/i386/Makefile
@@ -31,6 +31,7 @@ endif
 # libpthread uses six-argument inline syscalls.
 ifeq ($(subdir),nptl)
 libpthread-sysdep_routines += libc-do-syscall
+libpthread-shared-only-routines += libc-do-syscall
 endif
 
 ifeq ($(subdir),resource)

diff --git a/sysdeps/unix/sysv/linux/ia64/Makefile b/sysdeps/unix/sysv/linux/ia64/Makefile
index 1de62c528ae28dee817295efa8cb0de1b4b0d2e3..4d6766db5e73dde5f2d6a5fb3d933b9a0975d6b6 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/Makefile
+++ b/sysdeps/unix/sysv/linux/ia64/Makefile
@@ -19,6 +19,7 @@ endif
 
 ifeq ($(subdir),rt)
 librt-routines += rt-sysdep
+librt-shared-only-routines += rt-sysdep
 endif
 
 ifeq ($(subdir),nptl)

diff --git a/sysdeps/unix/sysv/linux/microblaze/Makefile b/sysdeps/unix/sysv/linux/microblaze/Makefile
index 44a838fa110d2a65ced3bc87188ac9d1fe18efe4..d178bc6f34666782e48c96df97750644d3026c02 100644 (file)
--- a/sysdeps/unix/sysv/linux/microblaze/Makefile
+++ b/sysdeps/unix/sysv/linux/microblaze/Makefile
@@ -5,4 +5,5 @@ endif
 ifeq ($(subdir),nptl)
 # pull in __syscall_error routine
 libpthread-routines += sysdep
-endif
\ No newline at end of file
+libpthread-shared-only-routines += sysdep
+endif

diff --git a/sysdeps/unix/sysv/linux/powerpc/Makefile b/sysdeps/unix/sysv/linux/powerpc/Makefile
index c89ed9ec7dfc222e34a525c7c5d0ba62e155369d..2cfb46eca3c2dd7f3a394d5063c23c7a0e4e495e 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/Makefile
+++ b/sysdeps/unix/sysv/linux/powerpc/Makefile
@@ -8,6 +8,7 @@ abi-64-v2-condition := __WORDSIZE == 64 && _CALL_ELF == 2
 
 ifeq ($(subdir),rt)
 librt-routines += rt-sysdep
+librt-shared-only-routines += rt-sysdep
 endif
 
 ifeq ($(subdir),stdlib)
@@ -34,4 +35,5 @@ ifeq ($(subdir),nptl)
 libpthread-routines += sysdep
 libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
                              elision-trylock
+libpthread-shared-only-routines += sysdep
 endif

diff --git a/sysdeps/unix/sysv/linux/s390/Makefile b/sysdeps/unix/sysv/linux/s390/Makefile
index 497ffd566cbdb2a3949d03c5c8ea05161bfee1fb..f8ed013e9e2bcf6a4d6042fc59c4297ad64a9e92 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/Makefile
+++ b/sysdeps/unix/sysv/linux/s390/Makefile
@@ -6,6 +6,7 @@ abi-64-condition := __WORDSIZE == 64
 
 ifeq ($(subdir),rt)
 librt-routines += rt-sysdep
+librt-shared-only-routines += rt-sysdep
 endif
 
 ifeq ($(subdir),stdlib)

diff --git a/sysdeps/unix/sysv/linux/sparc/Makefile b/sysdeps/unix/sysv/linux/sparc/Makefile
index e67aecf8f0bc472a5e75213b94340dc20eea8f44..a67d199eb5d7705921691dd88f4ca7ee31aa6fdd 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/Makefile
+++ b/sysdeps/unix/sysv/linux/sparc/Makefile
@@ -6,6 +6,7 @@ abi-64-condition := __WORDSIZE == 64
 
 ifeq ($(subdir),rt)
 librt-routines += rt-sysdep
+librt-shared-only-routines += rt-sysdep
 endif
 
 ifeq ($(subdir),sysvipc)
@@ -15,4 +16,5 @@ endif
 ifeq ($(subdir),nptl)
 # pull in __syscall_error routine
 libpthread-routines += sysdep
+libpthread-shared-only-routines += sysdep
 endif

diff --git a/sysdeps/unix/sysv/linux/tile/Makefile b/sysdeps/unix/sysv/linux/tile/Makefile
index 1c1cfff2800e55d11cfdfc4d884a39ee565f00fb..43acea363350931f7a5cad2ed101861e06ff0078 100644 (file)
--- a/sysdeps/unix/sysv/linux/tile/Makefile
+++ b/sysdeps/unix/sysv/linux/tile/Makefile
@@ -25,4 +25,5 @@ endif
 ifeq ($(subdir),nptl)
 # pull in __syscall_error routine
 libpthread-routines += sysdep
+libpthread-shared-only-routines += sysdep
 endif