summaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-12-15 18:54:41 +0000
committerUlrich Drepper <drepper@redhat.com>2004-12-15 18:54:41 +0000
commitcbdb12dec1284048430dbd9c354475ddffd7047e (patch)
tree92289c3e645fd213d888e791740a09f7faf2b844 /Makeconfig
parentf8d8a2650ce753bcc162ccfa55f79a6967c21d06 (diff)
downloadglibc-cbdb12dec1284048430dbd9c354475ddffd7047e.tar.gz
Update.
2004-09-08 H.J. Lu <hongjiu.lu@intel.com> * Makeconfig (libunwind): New. (libgcc_eh): Add $(libunwind). (gnulib): Always set to -lgcc $(libgcc_eh). (static-gnulib): Always set to -lgcc -lgcc_eh $(libunwind). (libc.so-gnulib): New. * Makerules (LDLIBS-c.so): Use $(libc.so-gnulib) instead of $(static-gnulib). * configure.in (libc_cv_cc_with_libunwind): Set to yes if gcc uses -lunwind for static binaries.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig17
1 files changed, 9 insertions, 8 deletions
diff --git a/Makeconfig b/Makeconfig
index 3368b51e51..d267e5af21 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -508,18 +508,19 @@ link-libc-bounded = $(common-objpfx)libc_b.a $(gnulib) $(common-objpfx)libc_b.a
link-extra-libs-bounded = $(foreach lib,$(LDLIBS-$(@F:%-bp=%)),$(common-objpfx)$(lib)_b.a)
ifndef gnulib
-ifneq ($(have-as-needed),yes)
- libgcc_eh := -lgcc_eh
+ifneq ($(have-cc-with-libunwind),yes)
+ libunwind =
else
- libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) -Wl,--no-as-needed
+ libunwind = -lunwind
endif
-ifneq ($(have-cc-with-libunwind),yes)
- gnulib := -lgcc $(libgcc_eh)
- static-gnulib := -lgcc -lgcc_eh
+ifneq ($(have-as-needed),yes)
+ libgcc_eh := -lgcc_eh $(libunwind)
else
- gnulib := -lgcc $(libgcc_eh) -lunwind
- static-gnulib := -lgcc -lgcc_eh -lunwind
+ libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
endif
+gnulib := -lgcc $(libgcc_eh)
+static-gnulib := -lgcc -lgcc_eh $(libunwind)
+libc.so-gnulib := -lgcc
endif
ifeq ($(elf),yes)
+preinit = $(addprefix $(csu-objpfx),crti.o)