mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
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.
This commit is contained in:
@ -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
|
||||
|
@ -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)
|
||||
|
@ -19,6 +19,7 @@ endif
|
||||
|
||||
ifeq ($(subdir),rt)
|
||||
librt-routines += rt-sysdep
|
||||
librt-shared-only-routines += rt-sysdep
|
||||
endif
|
||||
|
||||
ifeq ($(subdir),nptl)
|
||||
|
@ -5,4 +5,5 @@ endif
|
||||
ifeq ($(subdir),nptl)
|
||||
# pull in __syscall_error routine
|
||||
libpthread-routines += sysdep
|
||||
endif
|
||||
libpthread-shared-only-routines += sysdep
|
||||
endif
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -25,4 +25,5 @@ endif
|
||||
ifeq ($(subdir),nptl)
|
||||
# pull in __syscall_error routine
|
||||
libpthread-routines += sysdep
|
||||
libpthread-shared-only-routines += sysdep
|
||||
endif
|
||||
|
Reference in New Issue
Block a user