aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-11-04 23:43:59 +0000
committerRoland McGrath <roland@gnu.org>2004-11-04 23:43:59 +0000
commit861ff56cb10bc989294bf3f909c7da781c85a757 (patch)
treec8ddaf9778782685563f7264806816139609ca5d
parentad146de70ec85c70a680bb4817f1d9e9f3bc7fd6 (diff)
downloadglibc-861ff56cb10bc989294bf3f909c7da781c85a757.zip
glibc-861ff56cb10bc989294bf3f909c7da781c85a757.tar.gz
glibc-861ff56cb10bc989294bf3f909c7da781c85a757.tar.bz2
* Makeconfig (link-libc, rpath-dirs): Remove AIX cruft definitions.
(LDFLAGS-rpath-ORIGIN, LDFLAGS-soname-fname): Likewise. (LDFLAGS-rdynamic, LDFLAGS-Bsymbolic): Likewise. ($(common-objpfx)gnu/lib-names.stmp): Likewise.
-rw-r--r--ChangeLog7
-rw-r--r--Makeconfig21
2 files changed, 7 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b739eb..69db702 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-04 Roland McGrath <roland@frob.com>
+
+ * Makeconfig (link-libc, rpath-dirs): Remove AIX cruft definitions.
+ (LDFLAGS-rpath-ORIGIN, LDFLAGS-soname-fname): Likewise.
+ (LDFLAGS-rdynamic, LDFLAGS-Bsymbolic): Likewise.
+ ($(common-objpfx)gnu/lib-names.stmp): Likewise.
+
2004-11-01 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sys/procfs.h [__WORDSIZE == 32]
diff --git a/Makeconfig b/Makeconfig
index ea3a782..dc70aa6 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -452,12 +452,6 @@ link-libc = -Wl,-rpath-link=$(rpath-link) \
$(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
# This is how to find at build-time things that will be installed there.
rpath-dirs = math elf dlfcn nss nis rt resolv crypt
-else
-ifneq (,$(filter aix aix%,$(config-os)))
-link-libc = $(common-objpfx)libc.a \
- $(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
-rpath-dirs = math dlfcn nss nis rt resolv crypt
-endif
endif
rpath-link = \
$(common-objdir):$(subst $(empty) ,:,$(patsubst ../$(subdir),.,$(rpath-dirs:%=$(common-objpfx)%)))
@@ -475,13 +469,6 @@ LDFLAGS-rpath-ORIGIN = -Wl,-rpath,'$$ORIGIN'
LDFLAGS-soname-fname = -Wl,-soname,$(@F)
LDFLAGS-rdynamic = -rdynamic
LDFLAGS-Bsymbolic = -Bsymbolic
-else
-ifneq (,$(filter aix aix%,$(config-os)))
-LDFLAGS-rpath-ORIGIN =
-LDFLAGS-soname-fname =
-LDFLAGS-rdynamic = -Wl,-bdynamic
-LDFLAGS-Bsymbolic = -Wl,-bsymbolic
-endif
endif
# Choose the default search path for the dynamic linker based on
@@ -835,13 +822,6 @@ 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; @:
-ifneq (,$(findstring aix,$(config-os)))
-$(common-objpfx)gnu/lib-names.stmp: $(..)sysdeps/unix/sysv/aix/gnu/lib-names.h
- $(make-target-directory)
- @rm -f ${@:stmp=T} $@
- @cp $(..)sysdeps/unix/sysv/aix/gnu/lib-names.h $(common-objpfx)gnu
- touch $@
-else
$(common-objpfx)gnu/lib-names.stmp: $(common-objpfx)soversions.mk
$(make-target-directory)
@rm -f ${@:stmp=T} $@
@@ -870,7 +850,6 @@ $(common-objpfx)gnu/lib-names.stmp: $(common-objpfx)soversions.mk
$(move-if-change) ${@:stmp=T} ${@:stmp=h}
touch $@
endif
-endif
common-generated += gnu/lib-names.h gnu/lib-names.stmp