aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--Makeconfig17
-rw-r--r--Makerules4
-rwxr-xr-xconfigure59
-rw-r--r--configure.in18
5 files changed, 44 insertions, 66 deletions
diff --git a/ChangeLog b/ChangeLog
index d2da9d1e7a..257b60f4c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
22004-06-05 Joseph S. Myers <jsm@polyomino.org.uk>
* malloc/Makefile (install-bin): Remove memusage.
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)
diff --git a/Makerules b/Makerules
index 7c6feb7c1f..5d7b24f31f 100644
--- a/Makerules
+++ b/Makerules
@@ -581,8 +581,8 @@ build-shlib-objlist = $(build-module-helper-objlist) \
# Also omits crti.o and crtn.o, which we do not want
# since we define our own `.init' section specially.
LDFLAGS-c.so = -nostdlib -nostartfiles
-# But we still want to link libc.so against $(static-gnulib).
-LDLIBS-c.so += $(static-gnulib)
+# But we still want to link libc.so against $(libc.so-gnulib).
+LDLIBS-c.so += $(libc.so-gnulib)
# Give libc.so an entry point and make it directly runnable itself.
LDFLAGS-c.so += -e __libc_main
# If lazy relocation is disabled add the -z now flag.
diff --git a/configure b/configure
index 2ce30a3265..93fff2a64d 100755
--- a/configure
+++ b/configure
@@ -5399,56 +5399,17 @@ echo $ECHO_N "checking for libunwind-support in compiler... $ECHO_C" >&6
if test "${libc_cv_cc_with_libunwind+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <libunwind.h>
-int
-main ()
-{
- unw_context_t uc;
- unw_cursor_t c;
- unw_getcontext (&uc);
- unw_init_local (&c, &uc)
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- libc_cv_cc_with_libunwind=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-libc_cv_cc_with_libunwind=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+ cat > conftest.c <<EOF
+int main (void) { return 0; }
+EOF
+ if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
+ conftest.c -v 2>&1 >/dev/null | grep -q " -lunwind "; then
+ libc_cv_cc_with_libunwind=yes
+ else
+ libc_cv_cc_with_libunwind=no
+ fi
+ rm -f conftest*
fi
echo "$as_me:$LINENO: result: $libc_cv_cc_with_libunwind" >&5
echo "${ECHO_T}$libc_cv_cc_with_libunwind" >&6
diff --git a/configure.in b/configure.in
index 9b8a1eb26d..559bee0173 100644
--- a/configure.in
+++ b/configure.in
@@ -1260,13 +1260,17 @@ EOF
fi
AC_CACHE_CHECK(for libunwind-support in compiler,
- libc_cv_cc_with_libunwind, [dnl
- AC_TRY_LINK([#include <libunwind.h>], [
- unw_context_t uc;
- unw_cursor_t c;
- unw_getcontext (&uc);
- unw_init_local (&c, &uc)],
- libc_cv_cc_with_libunwind=yes, libc_cv_cc_with_libunwind=no)])
+ libc_cv_cc_with_libunwind, [
+ cat > conftest.c <<EOF
+int main (void) { return 0; }
+EOF
+ if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
+ conftest.c -v 2>&1 >/dev/null | grep -q " -lunwind "; then
+ libc_cv_cc_with_libunwind=yes
+ else
+ libc_cv_cc_with_libunwind=no
+ fi
+ rm -f conftest*])
AC_SUBST(libc_cv_cc_with_libunwind)
if test $libc_cv_cc_with_libunwind = yes; then
AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)