diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-05-21 16:52:08 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-05-21 16:52:08 +0000 |
| commit | 4134b50d6789c333707b1861a32314805bd0de5e (patch) | |
| tree | 9500332a208274a6a014485eae02b1a9bf26a6f9 /sysdeps | |
| parent | a6b3657be6bc5067aeec98d990f60765361c6557 (diff) | |
| download | glibc-4134b50d6789c333707b1861a32314805bd0de5e.tar.gz glibc-4134b50d6789c333707b1861a32314805bd0de5e.tar.xz glibc-4134b50d6789c333707b1861a32314805bd0de5e.zip | |
Consistently use $(elf-objpfx).
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/.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/arm/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile index b218e76eac..daaf4aa922 100644 --- a/sysdeps/arm/Makefile +++ b/sysdeps/arm/Makefile @@ -1,5 +1,5 @@ -gnulib-arch = $(elfobjdir)/libgcc-stubs.a -static-gnulib-arch = $(elfobjdir)/libgcc-stubs.a +gnulib-arch = $(elf-objpfx)libgcc-stubs.a +static-gnulib-arch = $(elf-objpfx)libgcc-stubs.a ifeq ($(subdir),elf) sysdep-dl-routines += tlsdesc dl-tlsdesc diff --git a/sysdeps/s390/s390-64/Makefile b/sysdeps/s390/s390-64/Makefile index 37f021c5e0..9fee71b515 100644 --- a/sysdeps/s390/s390-64/Makefile +++ b/sysdeps/s390/s390-64/Makefile @@ -77,7 +77,7 @@ ifeq (no,$(cross-compiling)) # if this libc has more gconv modules than the previously installed one. if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \ LC_ALL=C LANGUAGE=C \ - $(common-objpfx)elf/ld.so --library-path $(rpath-link) \ + $(elf-objpfx)ld.so --library-path $(rpath-link) \ $(common-objpfx)iconv/iconvconfig \ $(addprefix --prefix=,$(install_root)); \ fi |