source:
patches/glibc-2.9-libgcc_eh-1.patch@
087231b
Last change on this file since 087231b was dbb2738d, checked in by , 16 years ago | |
---|---|
|
|
File size: 4.5 KB |
-
config.make.in
Submitted By: Joe Ciccone <jciccone@gmail.com> 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 Rediffed for 2.9 by Joe Ciccone diff -Naur glibc-2.9.orig/config.make.in glibc-2.9/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.in
diff -Naur glibc-2.9.orig/configure.in glibc-2.9/configure.in
old new 1394 1394 AC_DEFINE(HAVE_CC_WITH_LIBUNWIND) 1395 1395 fi 1396 1396 1397 AC_CACHE_CHECK(whether to link against libgcc_eh, 1398 libc_cv_cc_with_libgcc_eh, [ 1399 cat > conftest.c <<EOF 1400 int main (void) { return 0; } 1401 EOF 1402 if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \ 1403 conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then 1404 libc_cv_cc_with_libgcc_eh=yes 1405 else 1406 libc_cv_cc_with_libgcc_eh=no 1407 fi 1408 rm -f conftest*]) 1409 AC_SUBST(libc_cv_cc_with_libgcc_eh) 1410 if test $libc_cv_cc_with_libgcc_eh = yes; then 1411 AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH) 1412 fi 1413 1397 1414 AC_CACHE_CHECK(for -z nodelete option, 1398 1415 libc_cv_z_nodelete, [dnl 1399 1416 cat > conftest.c <<EOF -
configure
diff -Naur glibc-2.9.orig/configure glibc-2.9/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 … … 6053 6054 6054 6055 fi 6055 6056 6057 { echo "$as_me:$LINENO: checking whether to link against libgcc_eh" >&5 6058 echo $ECHO_N "checking whether to link against libgcc_eh... $ECHO_C" >&6; } 6059 if test "${libc_cv_cc_with_libgcc_eh+set}" = set; then 6060 echo $ECHO_N "(cached) $ECHO_C" >&6 6061 else 6062 6063 cat > conftest.c <<EOF 6064 int main (void) { return 0; } 6065 EOF 6066 if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \ 6067 conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then 6068 libc_cv_cc_with_libgcc_eh=yes 6069 else 6070 libc_cv_cc_with_libgcc_eh=no 6071 fi 6072 rm -f conftest* 6073 fi 6074 { echo "$as_me:$LINENO: result: $libc_cv_cc_with_libgcc_eh" >&5 6075 echo "${ECHO_T}$libc_cv_cc_with_libgcc_eh" >&6; } 6076 6077 if test $libc_cv_cc_with_libgcc_eh = yes; then 6078 cat >>confdefs.h <<\_ACEOF 6079 #define HAVE_CC_WITH_LIBGCC_EH 1 6080 _ACEOF 6081 6082 fi 6083 6056 6084 { echo "$as_me:$LINENO: checking for -z nodelete option" >&5 6057 6085 echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; } 6058 6086 if test "${libc_cv_z_nodelete+set}" = set; then … … 9282 9310 BISON!$BISON$ac_delim 9283 9311 VERSIONING!$VERSIONING$ac_delim 9284 9312 libc_cv_cc_with_libunwind!$libc_cv_cc_with_libunwind$ac_delim 9313 libc_cv_cc_with_libgcc_eh!$libc_cv_cc_with_libgcc_eh$ac_delim 9285 9314 libc_cv_Bgroup!$libc_cv_Bgroup$ac_delim 9286 9315 libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim 9287 9316 libc_cv_as_needed!$libc_cv_as_needed$ac_delim … … 9335 9364 LTLIBOBJS!$LTLIBOBJS$ac_delim 9336 9365 _ACEOF 9337 9366 9338 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5 4; then9367 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then 9339 9368 break 9340 9369 elif $ac_last_try; then 9341 9370 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -
Makeconfig
diff -Naur glibc-2.9.orig/Makeconfig glibc-2.9/Makeconfig
old new 525 525 libunwind = -lunwind 526 526 endif 527 527 ifneq ($(have-as-needed),yes) 528 libgcc_eh := -lgcc_eh $(libunwind) 528 ifneq ($(have-cc-with-libgcc_eh),yes) 529 libgcc_eh := $(libunwind) 530 else 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)
Note:
See TracBrowser
for help on using the repository browser.