source:
patches/glibc-2.6.1-libgcc_eh-1.patch@
2978738
Last change on this file since 2978738 was 598efa5d, checked in by , 17 years ago | |
---|---|
|
|
File size: 7.2 KB |
-
config.make.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. diff -Naur glibc-2.6.orig/config.make.in glibc-2.6/config.make.in
old new 59 59 have-libaudit = @have_libaudit@ 60 60 have-libcap = @have_libcap@ 61 61 have-cc-with-libunwind = @libc_cv_cc_with_libunwind@ 62 have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@ 62 63 fno-unit-at-a-time = @fno_unit_at_a_time@ 63 64 bind-now = @bindnow@ 64 65 have-hash-style = @libc_cv_hashstyle@ -
configure.in
diff -Naur glibc-2.6.orig/configure.in glibc-2.6/configure.in
old new 1388 1388 AC_DEFINE(HAVE_CC_WITH_LIBUNWIND) 1389 1389 fi 1390 1390 1391 AC_CACHE_CHECK(whether to link against libgcc_eh, 1392 libc_cv_cc_with_libgcc_eh, [ 1393 cat > conftest.c <<EOF 1394 int main (void) { return 0; } 1395 EOF 1396 if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \ 1397 conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then 1398 libc_cv_cc_with_libgcc_eh=yes 1399 else 1400 libc_cv_cc_with_libgcc_eh=no 1401 fi 1402 rm -f conftest*]) 1403 AC_SUBST(libc_cv_cc_with_libgcc_eh) 1404 if test $libc_cv_cc_with_libgcc_eh = yes; then 1405 AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH) 1406 fi 1407 1391 1408 AC_CACHE_CHECK(for -z nodelete option, 1392 1409 libc_cv_z_nodelete, [dnl 1393 1410 cat > conftest.c <<EOF -
Makeconfig
diff -Naur glibc-2.6.orig/Makeconfig glibc-2.6/Makeconfig
old new 524 524 libunwind = -lunwind 525 525 endif 526 526 ifneq ($(have-as-needed),yes) 527 ifneq ($(have-cc-with-libgcc_eh),yes) 528 libgcc_eh := $(libunwind) 529 else 527 530 libgcc_eh := -lgcc_eh $(libunwind) 531 endif 528 532 else 529 533 libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed 530 534 endif 531 535 gnulib := -lgcc $(libgcc_eh) 532 static-gnulib := -lgcc -lgcc_eh $(libunwind) 536 ifneq ($(have-cc-with-libgcc_eh),yes) 537 static-gnulib := -lgcc $(libunwind) 538 else 539 static-gnulib := -lgcc -lgcc_eh $(libunwind) 540 endif 533 541 libc.so-gnulib := -lgcc 534 542 endif 535 543 ifeq ($(elf),yes) -
configure
diff -Naur glibc-2.6.orig/configure glibc-2.6/configure
old new 313 313 # include <unistd.h> 314 314 #endif" 315 315 316 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons add_on_subdirs base_machine submachine sysnames sysdeps_add_ons INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES CXX_SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_cc_with_libunwind libc_cv_ Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_hashstyle fno_unit_at_a_time libc_cv_ssp libc_cv_gnu89_inline libc_cv_have_initfini no_whole_archive exceptions LIBGD have_libaudit have_libcap have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'316 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons add_on_subdirs base_machine submachine sysnames sysdeps_add_ons INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES CXX_SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_cc_with_libunwind libc_cv_cc_with_libgcc_eh libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_hashstyle fno_unit_at_a_time libc_cv_ssp libc_cv_gnu89_inline libc_cv_have_initfini no_whole_archive exceptions LIBGD have_libaudit have_libcap have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS' 317 317 ac_subst_files='' 318 318 319 319 # Initialize some variables set by options. … … 5542 5542 5543 5543 fi 5544 5544 5545 { echo "$as_me:$LINENO: checking whether to link against libgcc_eh" >&5 5546 echo $ECHO_N "checking whether to link against libgcc_eh... $ECHO_C" >&6; } 5547 if test "${libc_cv_cc_with_libgcc_eh+set}" = set; then 5548 echo $ECHO_N "(cached) $ECHO_C" >&6 5549 else 5550 5551 cat > conftest.c <<EOF 5552 int main (void) { return 0; } 5553 EOF 5554 if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \ 5555 conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then 5556 libc_cv_cc_with_libgcc_eh=yes 5557 else 5558 libc_cv_cc_with_libgcc_eh=no 5559 fi 5560 rm -f conftest* 5561 fi 5562 { echo "$as_me:$LINENO: result: $libc_cv_cc_with_libgcc_eh" >&5 5563 echo "${ECHO_T}$libc_cv_cc_with_libgcc_eh" >&6; } 5564 5565 if test $libc_cv_cc_with_libgcc_eh = yes; then 5566 cat >>confdefs.h <<\_ACEOF 5567 #define HAVE_CC_WITH_LIBGCC_EH 1 5568 _ACEOF 5569 5570 fi 5571 5545 5572 echo "$as_me:$LINENO: checking for -z nodelete option" >&5 5546 5573 echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6 5547 5574 if test "${libc_cv_z_nodelete+set}" = set; then … … 8543 8570 s,@BISON@,$BISON,;t t 8544 8571 s,@VERSIONING@,$VERSIONING,;t t 8545 8572 s,@libc_cv_cc_with_libunwind@,$libc_cv_cc_with_libunwind,;t t 8573 s,@libc_cv_cc_with_libgcc_eh@,$libc_cv_cc_with_libgcc_eh,;t t 8546 8574 s,@libc_cv_Bgroup@,$libc_cv_Bgroup,;t t 8547 8575 s,@libc_cv_libgcc_s_suffix@,$libc_cv_libgcc_s_suffix,;t t 8548 8576 s,@libc_cv_as_needed@,$libc_cv_as_needed,;t t
Note:
See TracBrowser
for help on using the repository browser.