mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 12:11:10 +00:00
4134b50d67
As previously noted <https://sourceware.org/ml/libc-alpha/2013-05/msg00696.html>, $(elf-objpfx) and $(elfobjdir) are redundant and should be consolidated. This patch consolidates on $(elf-objpfx) (for consistency with $(csu-objpfx)), also changing direct uses of $(common-objpfx)elf/ to use $(elf-objpfx). Tested x86_64, including that installed shared libraries are unchanged by the patch. * Makeconfig [$(build-hardcoded-path-in-tests) = yes] (rtld-tests-LDFLAGS): Use $(elf-objpfx) instead of $(common-objpfx)elf/. (link-libc-before-gnulib): Likewise. (elfobjdir): Remove variable. * Makefile (install): Use $(elf-objpfx) instead of $(common-objpfx)elf/. * Makerules (link-libc-args): Use $(elf-objpfx) instead of $(elfobjdir)/. (link-libc-deps): Likewise. ($(common-objpfx)libc.so): Likewise. ($(common-objpfx)linkobj/libc.so): Likewise. [$(cross-compiling) = no] (symbolic-link-prog): Use $(elf-objpfx) instead of $(common-objpfx)elf/. (symbolic-link-list): Likewise. * iconvdata/Makefile ($(inst_gconvdir)/gconv-modules) [$(cross-compiling) = no]: Likewise. * sysdeps/arm/Makefile (gnulib-arch): Use $(elf-objpfx) instead of $(elfobjdir)/. (static-gnulib-arch): Likewise. * sysdeps/s390/s390-64/Makefile ($(inst_gconvdir)/gconv-modules) [$(cross-compiling) = no]: Use $(elf-objpfx) instead of $(common-objpfx)elf/. localedata/ChangeLog: * Makefile (LOCALEDEF): Use $(elf-objpfx) instead of $(common-objpfx)elf/.
35 lines
1022 B
Makefile
35 lines
1022 B
Makefile
gnulib-arch = $(elf-objpfx)libgcc-stubs.a
|
|
static-gnulib-arch = $(elf-objpfx)libgcc-stubs.a
|
|
|
|
ifeq ($(subdir),elf)
|
|
sysdep-dl-routines += tlsdesc dl-tlsdesc
|
|
sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx tlsdesc dl-tlsdesc
|
|
sysdep-rtld-routines += aeabi_unwind_cpp_pr1 tlsdesc dl-tlsdesc
|
|
shared-only-routines += aeabi_unwind_cpp_pr1
|
|
|
|
$(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os
|
|
$(build-extra-lib)
|
|
|
|
lib-noranlib: $(objpfx)libgcc-stubs.a
|
|
endif
|
|
|
|
ifeq ($(subdir),csu)
|
|
# get offset to rtld_global._dl_hwcap
|
|
gen-as-const-headers += rtld-global-offsets.sym tlsdesc.sym
|
|
aeabi_constants = aeabi_lcsts aeabi_sighandlers aeabi_math
|
|
aeabi_routines = aeabi_assert aeabi_localeconv aeabi_errno_addr \
|
|
aeabi_mb_cur_max aeabi_atexit aeabi_memclr aeabi_memcpy \
|
|
aeabi_memmove aeabi_memset
|
|
|
|
sysdep_routines += $(aeabi_constants) $(aeabi_routines)
|
|
static-only-routines += $(aeabi_constants)
|
|
endif
|
|
|
|
ifeq ($(subdir),gmon)
|
|
sysdep_routines += arm-mcount
|
|
endif
|
|
|
|
ifeq ($(subdir),debug)
|
|
CFLAGS-backtrace.c += -funwind-tables
|
|
endif
|