Update.

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

	* Makeconfig (config-LDFLAGS): Add ld.so only for ELF.

diff --git a/ChangeLog b/ChangeLog
index a4dc16f61f15c26adad428c43a3e80db02df52a1..629a31d507b718b58e54e2dded531264b82e9271 100644 (file)
--- 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 d6e8b859f2afce8925e766e4b6fc65c20bf0cb04..53513606e236178e7e50a613066b7715d09e5880 100644 (file)
--- 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 ce79071d6a2d101f556dd8facfd7b7482bf77f2a..8035391db678bc825c31b2c5a0d03a3cc4a10691 100644 (file)
--- 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) \