diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-23 16:42:42 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-23 16:42:42 -0700 |
| commit | 8de69b8360cdb7c2bb787fe343bc46c23aeb57c4 (patch) | |
| tree | 3fff2345b4ce520f8a936fe494154a425bcef252 | |
| parent | 82205f75fd29479a6401dd8b1d4fa7b6e0d777f5 (diff) | |
| download | glibc-8de69b8360cdb7c2bb787fe343bc46c23aeb57c4.tar.gz glibc-8de69b8360cdb7c2bb787fe343bc46c23aeb57c4.tar.xz glibc-8de69b8360cdb7c2bb787fe343bc46c23aeb57c4.zip | |
Revert more lib-names.h and stubs.h changes
| -rw-r--r-- | ChangeLog.x32 | 13 | ||||
| -rw-r--r-- | Makeconfig | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | config.make.in | 3 | ||||
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | configure.in | 10 |
6 files changed, 15 insertions, 27 deletions
diff --git a/ChangeLog.x32 b/ChangeLog.x32 index a619608db6..1f5958ecd8 100644 --- a/ChangeLog.x32 +++ b/ChangeLog.x32 @@ -1,5 +1,18 @@ 2012-05-23 H.J. Lu <hongjiu.lu@intel.com> + * Makeconfig ($(common-objpfx)gnu/lib-names.stmp): Depend on + scripts/lib-names.awk. + + * Makefile ($(inst_includedir)/gnu/stubs.h): Depend on + include/stubs-biarch.h. + + * config.make.in (stubs-biarch_h): Removed. + (lib-names_awk): Likewise. + + * configure.in: Don't subst stubs_biarch_h nor lib_names_awk. + +2012-05-23 H.J. Lu <hongjiu.lu@intel.com> + * sysdeps/unix/sysv/linux/i386/configure.in: Removed. * sysdeps/unix/sysv/linux/i386/configure: Likewise. * sysdeps/unix/sysv/linux/x86_64/configure.in: Likewise. diff --git a/Makeconfig b/Makeconfig index e7de7264f6..3a09764dfa 100644 --- a/Makeconfig +++ b/Makeconfig @@ -843,7 +843,7 @@ postclean-generated += soversions.mk soversions.i \ before-compile += $(common-objpfx)gnu/lib-names.h ifeq ($(soversions.mk-done),t) $(common-objpfx)gnu/lib-names.h: $(common-objpfx)gnu/lib-names.stmp; @: -$(common-objpfx)gnu/lib-names.stmp: $(..)$(lib-names_awk) \ +$(common-objpfx)gnu/lib-names.stmp: $(..)scripts/lib-names.awk \ $(common-objpfx)soversions.i $(make-target-directory) @rm -f ${@:stmp=T} $@ diff --git a/Makefile b/Makefile index d2edf75004..c0a0cfb828 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,7 @@ installed-stubs = $(inst_includedir)/gnu/stubs.h else installed-stubs = $(inst_includedir)/gnu/stubs-$(biarch).h -$(inst_includedir)/gnu/stubs.h: $(stubs-biarch_h) $(+force) +$(inst_includedir)/gnu/stubs.h: include/stubs-biarch.h $(+force) $(make-target-directory) $(INSTALL_DATA) $< $@ diff --git a/config.make.in b/config.make.in index 982fbb804d..f0db19929b 100644 --- a/config.make.in +++ b/config.make.in @@ -77,9 +77,6 @@ oldest-abi = @oldest_abi@ exceptions = @exceptions@ multi-arch = @multi_arch@ -stubs-biarch_h = @stubs_biarch_h@ -lib-names_awk = @lib_names_awk@ - mach-interface-list = @mach_interface_list@ have-bash2 = @libc_cv_have_bash2@ diff --git a/configure b/configure index ae8572fe85..09a06377d7 100755 --- a/configure +++ b/configure @@ -607,8 +607,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS RELEASE VERSION -lib_names_awk -stubs_biarch_h mach_interface_list DEFINES static_nss @@ -7824,16 +7822,6 @@ $as_echo "$libc_cv_pic_default" >&6; } -if test -z "${stubs_biarch_h}"; then - stubs_biarch_h=include/stubs-biarch.h -fi - - -if test -z "${lib_names_awk}"; then - lib_names_awk=scripts/lib-names.awk -fi - - if test "`(cd $srcdir; pwd)`" = "`pwd`"; then config_makefile= else diff --git a/configure.in b/configure.in index 212291cceb..38b55a6784 100644 --- a/configure.in +++ b/configure.in @@ -2181,16 +2181,6 @@ AC_SUBST(DEFINES) dnl See sysdeps/mach/configure.in for this variable. AC_SUBST(mach_interface_list) -if test -z "${stubs_biarch_h}"; then - stubs_biarch_h=include/stubs-biarch.h -fi -AC_SUBST(stubs_biarch_h) - -if test -z "${lib_names_awk}"; then - lib_names_awk=scripts/lib-names.awk -fi -AC_SUBST(lib_names_awk) - if test "`(cd $srcdir; pwd)`" = "`pwd`"; then config_makefile= else |