summary refs log tree commit diff
path: root/Makeconfig
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-29 18:45:03 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-29 18:45:03 +0000
commitf13df7c79dc6e3f86bf8a33c113e681d1bdeab37 (patch)
tree931507d18ecb7d9dfae0cd256726b2da29c6cc05 /Makeconfig
parent3d49d03c71172f7c7b5ebbfb3f298b09d0ed4db2 (diff)
downloadglibc-f13df7c79dc6e3f86bf8a33c113e681d1bdeab37.tar.gz
glibc-f13df7c79dc6e3f86bf8a33c113e681d1bdeab37.tar.xz
glibc-f13df7c79dc6e3f86bf8a33c113e681d1bdeab37.zip
Update.
2001-08-28  H.J. Lu  <hjl@gnu.org>

	* Makeconfig (combreloc-LDFLAGS): New variable.
	Add it to LDFALGS.so, LDFLAGS-rtld, and +link.
	* config.make.in (have-z-combreloc): New variable.
	* configure.in: Substitute libc_cv_z_combreloc.

	* iconv/strtab.c (searchstring): Use correct length for comparison.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/Makeconfig b/Makeconfig
index b7c3f6b018..74192b408c 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -380,10 +380,17 @@ ifndef static-start-installed-name
 static-start-installed-name = $(start-installed-name)
 endif
 
+ifeq (yesyesyes,$(build-shared)$(elf)$(have-z-combreloc))
+combreloc-LDFLAGS = -Wl,-z,combreloc
+LDFLAGS.so += $(combreloc-LDFLAGS)
+LDFLAGS-rtld += $(combreloc-LDFLAGS)
+endif
+
 # Command for linking programs with the C library.
 ifndef +link
 +link = $(CC) -nostdlib -nostartfiles -o $@ \
 	      $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
+	      $(combreloc-LDFLAGS) \
 	      $(addprefix $(csu-objpfx),$(start-installed-name)) \
 	      $(+preinit) $(+prector) \
 	      $(filter-out $(addprefix $(csu-objpfx),start.o \