source: clfs-sysroot/patches/glibc-2.6-libgcc_eh-1.patch @ 00520f6

Last change on this file since 00520f6 was 00520f6, checked in by Joe Ciccone <jciccone@…>, 15 years ago

Update patches.

  • Property mode set to 100644
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  
    5959have-libaudit = @have_libaudit@
    6060have-libcap = @have_libcap@
    6161have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
     62have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
    6263fno-unit-at-a-time = @fno_unit_at_a_time@
    6364bind-now = @bindnow@
    6465have-hash-style = @libc_cv_hashstyle@
  • configure.in

    diff -Naur glibc-2.6.orig/configure.in glibc-2.6/configure.in
    old new  
    13881388    AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
    13891389  fi
    13901390
     1391  AC_CACHE_CHECK(whether to link against libgcc_eh,
     1392                 libc_cv_cc_with_libgcc_eh, [
     1393    cat > conftest.c <<EOF
     1394int main (void) { return 0; }
     1395EOF
     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
    13911408  AC_CACHE_CHECK(for -z nodelete option,
    13921409                 libc_cv_z_nodelete, [dnl
    13931410  cat > conftest.c <<EOF
  • Makeconfig

    diff -Naur glibc-2.6.orig/Makeconfig glibc-2.6/Makeconfig
    old new  
    524524  libunwind = -lunwind
    525525endif
    526526ifneq ($(have-as-needed),yes)
     527ifneq ($(have-cc-with-libgcc_eh),yes)
     528 libgcc_eh := $(libunwind)
     529else
    527530 libgcc_eh := -lgcc_eh $(libunwind)
     531endif
    528532else
    529533 libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
    530534endif
    531535gnulib := -lgcc $(libgcc_eh)
    532 static-gnulib := -lgcc -lgcc_eh $(libunwind)
     536ifneq ($(have-cc-with-libgcc_eh),yes)
     537 static-gnulib := -lgcc $(libunwind)
     538else
     539 static-gnulib := -lgcc -lgcc_eh $(libunwind)
     540endif
    533541libc.so-gnulib := -lgcc
    534542endif
    535543ifeq ($(elf),yes)
  • configure

    diff -Naur glibc-2.6.orig/configure glibc-2.6/configure
    old new  
    313313# include <unistd.h>
    314314#endif"
    315315
    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'
     316ac_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'
    317317ac_subst_files=''
    318318
    319319# Initialize some variables set by options.
     
    55425542
    55435543  fi
    55445544
     5545  { echo "$as_me:$LINENO: checking whether to link against libgcc_eh" >&5
     5546echo $ECHO_N "checking whether to link against libgcc_eh... $ECHO_C" >&6; }
     5547if test "${libc_cv_cc_with_libgcc_eh+set}" = set; then
     5548  echo $ECHO_N "(cached) $ECHO_C" >&6
     5549else
     5550
     5551    cat > conftest.c <<EOF
     5552int main (void) { return 0; }
     5553EOF
     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*
     5561fi
     5562{ echo "$as_me:$LINENO: result: $libc_cv_cc_with_libgcc_eh" >&5
     5563echo "${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
    55455572  echo "$as_me:$LINENO: checking for -z nodelete option" >&5
    55465573echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6
    55475574if test "${libc_cv_z_nodelete+set}" = set; then
     
    85438570s,@BISON@,$BISON,;t t
    85448571s,@VERSIONING@,$VERSIONING,;t t
    85458572s,@libc_cv_cc_with_libunwind@,$libc_cv_cc_with_libunwind,;t t
     8573s,@libc_cv_cc_with_libgcc_eh@,$libc_cv_cc_with_libgcc_eh,;t t
    85468574s,@libc_cv_Bgroup@,$libc_cv_Bgroup,;t t
    85478575s,@libc_cv_libgcc_s_suffix@,$libc_cv_libgcc_s_suffix,;t t
    85488576s,@libc_cv_as_needed@,$libc_cv_as_needed,;t t
Note: See TracBrowser for help on using the repository browser.