source: clfs-sysroot/patches/glibc-2.5-libgcc_eh-2.patch @ a186108

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

Update the libgcc_eh patch to -2.

  • Property mode set to 100644
File size: 7.5 KB
  • Makeconfig

    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.5.orig/Makeconfig glibc-2.5/Makeconfig
    old new  
    526526  libunwind = -lunwind
    527527endif
    528528ifneq ($(have-as-needed),yes)
     529ifneq ($(have-cc-with-libgcc_eh),yes)
     530 libgcc_eh := $(libunwind)
     531else
    529532 libgcc_eh := -lgcc_eh $(libunwind)
     533endif
    530534else
    531535 libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
    532536endif
    533537gnulib := -lgcc $(libgcc_eh)
    534 static-gnulib := -lgcc -lgcc_eh $(libunwind)
     538ifneq ($(have-cc-with-libgcc_eh),yes)
     539 static-gnulib := -lgcc $(libunwind)
     540else
     541 static-gnulib := -lgcc -lgcc_eh $(libunwind)
     542endif
    535543libc.so-gnulib := -lgcc
    536544endif
    537545ifeq ($(elf),yes)
  • config.make.in

    diff -Naur glibc-2.5.orig/config.make.in glibc-2.5/config.make.in
    old new  
    6363have-libaudit = @have_libaudit@
    6464have-libcap = @have_libcap@
    6565have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
     66have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
    6667fno-unit-at-a-time = @fno_unit_at_a_time@
    6768bind-now = @bindnow@
    6869have-hash-style = @libc_cv_hashstyle@
  • configure

    diff -Naur glibc-2.5.orig/configure glibc-2.5/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_asm_protected_directive libc_cv_cc_with_libunwind libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro 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_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_asm_protected_directive libc_cv_cc_with_libunwind libc_cv_cc_with_libgcc_eh libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro 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_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.
     
    55525552
    55535553  fi
    55545554
     5555  { echo "$as_me:$LINENO: checking whether to link against libgcc_eh" >&5
     5556echo $ECHO_N "checking whether to link against libgcc_eh... $ECHO_C" >&6; }
     5557if test "${libc_cv_cc_with_libgcc_eh+set}" = set; then
     5558  echo $ECHO_N "(cached) $ECHO_C" >&6
     5559else
     5560
     5561    cat > conftest.c <<EOF
     5562int main (void) { return 0; }
     5563EOF
     5564    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
     5565       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
     5566      libc_cv_cc_with_libgcc_eh=yes
     5567    else
     5568      libc_cv_cc_with_libgcc_eh=no
     5569    fi
     5570    rm -f conftest*
     5571fi
     5572{ echo "$as_me:$LINENO: result: $libc_cv_cc_with_libgcc_eh" >&5
     5573echo "${ECHO_T}$libc_cv_cc_with_libgcc_eh" >&6; }
     5574
     5575  if test $libc_cv_cc_with_libgcc_eh = yes; then
     5576    cat >>confdefs.h <<\_ACEOF
     5577#define HAVE_CC_WITH_LIBGCC_EH 1
     5578_ACEOF
     5579
     5580  fi
     5581
    55555582  echo "$as_me:$LINENO: checking for -z nodelete option" >&5
    55565583echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6
    55575584if test "${libc_cv_z_nodelete+set}" = set; then
     
    85128539s,@VERSIONING@,$VERSIONING,;t t
    85138540s,@libc_cv_asm_protected_directive@,$libc_cv_asm_protected_directive,;t t
    85148541s,@libc_cv_cc_with_libunwind@,$libc_cv_cc_with_libunwind,;t t
     8542s,@libc_cv_cc_with_libgcc_eh@,$libc_cv_cc_with_libgcc_eh,;t t
    85158543s,@libc_cv_z_nodelete@,$libc_cv_z_nodelete,;t t
    85168544s,@libc_cv_z_nodlopen@,$libc_cv_z_nodlopen,;t t
    85178545s,@libc_cv_z_initfirst@,$libc_cv_z_initfirst,;t t
  • configure.in

    diff -Naur glibc-2.5.orig/configure.in glibc-2.5/configure.in
    old new  
    13911391    AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
    13921392  fi
    13931393
     1394  AC_CACHE_CHECK(whether to link against libgcc_eh,
     1395                 libc_cv_cc_with_libgcc_eh, [
     1396    cat > conftest.c <<EOF
     1397int main (void) { return 0; }
     1398EOF
     1399    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
     1400       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
     1401      libc_cv_cc_with_libgcc_eh=yes
     1402    else
     1403      libc_cv_cc_with_libgcc_eh=no
     1404    fi
     1405    rm -f conftest*])
     1406  AC_SUBST(libc_cv_cc_with_libgcc_eh)
     1407  if test $libc_cv_cc_with_libgcc_eh = yes; then
     1408    AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH)
     1409  fi
     1410
    13941411  AC_CACHE_CHECK(for -z nodelete option,
    13951412                 libc_cv_z_nodelete, [dnl
    13961413  cat > conftest.c <<EOF
Note: See TracBrowser for help on using the repository browser.