source:
patches/glibc-2.8-libgcc_eh-1.patch@
175f4d65
Last change on this file since 175f4d65 was 175f4d65, checked in by , 16 years ago | |
---|---|
|
|
File size: 4.5 KB |
-
configure.in
Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org> Date: 2006-11-09 Initial Package Version: 2.5 Origin: Joe Ciccone Upstream Status: Unknown Description: Checks to see if libgcc_eh has been provided by gcc. If it has the glibc will attempt to link to it. Rediffed for 2.7 by Jim Gifford Rediffed for 2.8 by Joe Ciccone diff -Naur glibc-2.8.orig/configure.in glibc-2.8/configure.in
old new 1395 1395 AC_DEFINE(HAVE_CC_WITH_LIBUNWIND) 1396 1396 fi 1397 1397 1398 AC_CACHE_CHECK(whether to link against libgcc_eh, 1399 libc_cv_cc_with_libgcc_eh, [ 1400 cat > conftest.c <<EOF 1401 int main (void) { return 0; } 1402 EOF 1403 if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \ 1404 conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then 1405 libc_cv_cc_with_libgcc_eh=yes 1406 else 1407 libc_cv_cc_with_libgcc_eh=no 1408 fi 1409 rm -f conftest*]) 1410 AC_SUBST(libc_cv_cc_with_libgcc_eh) 1411 if test $libc_cv_cc_with_libgcc_eh = yes; then 1412 AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH) 1413 fi 1414 1398 1415 AC_CACHE_CHECK(for -z nodelete option, 1399 1416 libc_cv_z_nodelete, [dnl 1400 1417 cat > conftest.c <<EOF -
Makeconfig
diff -Naur glibc-2.8.orig/Makeconfig glibc-2.8/Makeconfig
old new 525 525 libunwind = -lunwind 526 526 endif 527 527 ifneq ($(have-as-needed),yes) 528 ifneq ($(have-cc-with-libgcc_eh),yes) 529 libgcc_eh := $(libunwind) 530 else 528 531 libgcc_eh := -lgcc_eh $(libunwind) 532 endif 529 533 else 530 534 libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed 531 535 endif 532 536 gnulib := -lgcc $(libgcc_eh) 533 static-gnulib := -lgcc -lgcc_eh $(libunwind) 537 ifneq ($(have-cc-with-libgcc_eh),yes) 538 static-gnulib := -lgcc $(libunwind) 539 else 540 static-gnulib := -lgcc -lgcc_eh $(libunwind) 541 endif 534 542 libc.so-gnulib := -lgcc 535 543 endif 536 544 ifeq ($(elf),yes) -
config.make.in
diff -Naur glibc-2.8.orig/config.make.in glibc-2.8/config.make.in
old new 60 60 have-libaudit = @have_libaudit@ 61 61 have-libcap = @have_libcap@ 62 62 have-cc-with-libunwind = @libc_cv_cc_with_libunwind@ 63 have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@ 63 64 fno-unit-at-a-time = @fno_unit_at_a_time@ 64 65 bind-now = @bindnow@ 65 66 have-hash-style = @libc_cv_hashstyle@ -
configure
diff -Naur glibc-2.8.orig/configure glibc-2.8/configure
old new 716 716 BISON 717 717 VERSIONING 718 718 libc_cv_cc_with_libunwind 719 libc_cv_cc_with_libgcc_eh 719 720 libc_cv_Bgroup 720 721 libc_cv_libgcc_s_suffix 721 722 libc_cv_as_needed … … 6052 6053 6053 6054 fi 6054 6055 6056 { echo "$as_me:$LINENO: checking whether to link against libgcc_eh" >&5 6057 echo $ECHO_N "checking whether to link against libgcc_eh... $ECHO_C" >&6; } 6058 if test "${libc_cv_cc_with_libgcc_eh+set}" = set; then 6059 echo $ECHO_N "(cached) $ECHO_C" >&6 6060 else 6061 6062 cat > conftest.c <<EOF 6063 int main (void) { return 0; } 6064 EOF 6065 if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \ 6066 conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then 6067 libc_cv_cc_with_libgcc_eh=yes 6068 else 6069 libc_cv_cc_with_libgcc_eh=no 6070 fi 6071 rm -f conftest* 6072 fi 6073 { echo "$as_me:$LINENO: result: $libc_cv_cc_with_libgcc_eh" >&5 6074 echo "${ECHO_T}$libc_cv_cc_with_libgcc_eh" >&6; } 6075 6076 if test $libc_cv_cc_with_libgcc_eh = yes; then 6077 cat >>confdefs.h <<\_ACEOF 6078 #define HAVE_CC_WITH_LIBGCC_EH 1 6079 _ACEOF 6080 6081 fi 6082 6055 6083 { echo "$as_me:$LINENO: checking for -z nodelete option" >&5 6056 6084 echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; } 6057 6085 if test "${libc_cv_z_nodelete+set}" = set; then … … 9250 9278 BISON!$BISON$ac_delim 9251 9279 VERSIONING!$VERSIONING$ac_delim 9252 9280 libc_cv_cc_with_libunwind!$libc_cv_cc_with_libunwind$ac_delim 9281 libc_cv_cc_with_libgcc_eh!$libc_cv_cc_with_libgcc_eh$ac_delim 9253 9282 libc_cv_Bgroup!$libc_cv_Bgroup$ac_delim 9254 9283 libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim 9255 9284 libc_cv_as_needed!$libc_cv_as_needed$ac_delim … … 9301 9330 LTLIBOBJS!$LTLIBOBJS$ac_delim 9302 9331 _ACEOF 9303 9332 9304 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5 2; then9333 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then 9305 9334 break 9306 9335 elif $ac_last_try; then 9307 9336 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Note:
See TracBrowser
for help on using the repository browser.