From 994431ed53a3a6e73867638755bbe27a832b301b Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 8 Jul 2001 15:07:16 +0000
Subject: [PATCH] Update.

	* Makerules [AIX] (build-shlib-helper): Precede linker options
	with -Wl.

	* Makeconfig (config-LDFLAGS): Add ld.so only for ELF.
---
 ChangeLog  | 5 +++++
 Makeconfig | 2 +-
 Makerules  | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a4dc16f..629a31d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-07-08  Ulrich Drepper  <drepper@redhat.com>
 
+	* Makerules [AIX] (build-shlib-helper): Precede linker options
+	with -Wl.
+
+	* Makeconfig (config-LDFLAGS): Add ld.so only for ELF.
+
 	* sysdeps/unix/make_errlist.c: Adjust sys_errlist declaration to
 	what we define in <stdio.h>.
 
diff --git a/Makeconfig b/Makeconfig
index d6e8b85..5351360 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -417,7 +417,7 @@ ifndef +link-bounded
 	      $(link-extra-libs-bounded) $(link-libc-bounded) $(+postctor) $(+postinit)
 endif
 ifndef config-LDFLAGS
-ifeq (yes,$(build-shared))
+ifeq (yesyes,$(build-shared)$(elf))
 config-LDFLAGS = -Wl,-dynamic-linker=$(slibdir)/$(rtld-installed-name)
 endif
 endif
diff --git a/Makerules b/Makerules
index ce79071..8035391 100644
--- a/Makerules
+++ b/Makerules
@@ -410,7 +410,7 @@ endef
 else
 ifneq (,$(findstring aix,$(config-os)))
 define build-shlib-helper
-$(LINK.o) -G -bM:SRE -bnoentry -bE:$(<:a=exp) \
+$(LINK.o) -Wl,-G,-bM:SRE,-bnoentry,-bE:$(<:a=exp) \
 	  $(sysdep-LDFLAGS) $(config-LDFLAGS) $(extra-B-$(@F:lib%.so=%).so) \
 	  $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \
 	  $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%.so=%).so) \
-- 
2.7.4