source: patches/glibc-2.8-libgcc_eh-1.patch@ 0e116c6

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 0e116c6 was 175f4d65, checked in by Joe Ciccone <jciccone@…>, 16 years ago

Commit missing patches.
  • Property mode set to 100644
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  
    13951395    AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
    13961396  fi
    13971397
     1398  AC_CACHE_CHECK(whether to link against libgcc_eh,
     1399                 libc_cv_cc_with_libgcc_eh, [
     1400    cat > conftest.c <<EOF
     1401int main (void) { return 0; }
     1402EOF
     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
    13981415  AC_CACHE_CHECK(for -z nodelete option,
    13991416                 libc_cv_z_nodelete, [dnl
    14001417  cat > conftest.c <<EOF

  • Makeconfig 

    diff -Naur glibc-2.8.orig/Makeconfig glibc-2.8/Makeconfig
    old new  
    525525  libunwind = -lunwind
    526526endif
    527527ifneq ($(have-as-needed),yes)
     528ifneq ($(have-cc-with-libgcc_eh),yes)
     529 libgcc_eh := $(libunwind)
     530else
    528531 libgcc_eh := -lgcc_eh $(libunwind)
     532endif
    529533else
    530534 libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
    531535endif
    532536gnulib := -lgcc $(libgcc_eh)
    533 static-gnulib := -lgcc -lgcc_eh $(libunwind)
     537ifneq ($(have-cc-with-libgcc_eh),yes)
     538 static-gnulib := -lgcc $(libunwind)
     539else
     540 static-gnulib := -lgcc -lgcc_eh $(libunwind)
     541endif
    534542libc.so-gnulib := -lgcc
    535543endif
    536544ifeq ($(elf),yes)

  • config.make.in 

    diff -Naur glibc-2.8.orig/config.make.in glibc-2.8/config.make.in
    old new  
    6060have-libaudit = @have_libaudit@
    6161have-libcap = @have_libcap@
    6262have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
     63have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
    6364fno-unit-at-a-time = @fno_unit_at_a_time@
    6465bind-now = @bindnow@
    6566have-hash-style = @libc_cv_hashstyle@

  • configure 

    diff -Naur glibc-2.8.orig/configure glibc-2.8/configure
    old new  
    716716BISON
    717717VERSIONING
    718718libc_cv_cc_with_libunwind
     719libc_cv_cc_with_libgcc_eh
    719720libc_cv_Bgroup
    720721libc_cv_libgcc_s_suffix
    721722libc_cv_as_needed
    … …  
    60526053
    60536054  fi
    60546055
     6056  { echo "$as_me:$LINENO: checking whether to link against libgcc_eh" >&5
     6057echo $ECHO_N "checking whether to link against libgcc_eh... $ECHO_C" >&6; }
     6058if test "${libc_cv_cc_with_libgcc_eh+set}" = set; then
     6059  echo $ECHO_N "(cached) $ECHO_C" >&6
     6060else
     6061
     6062    cat > conftest.c <<EOF
     6063int main (void) { return 0; }
     6064EOF
     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*
     6072fi
     6073{ echo "$as_me:$LINENO: result: $libc_cv_cc_with_libgcc_eh" >&5
     6074echo "${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
    60556083  { echo "$as_me:$LINENO: checking for -z nodelete option" >&5
    60566084echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; }
    60576085if test "${libc_cv_z_nodelete+set}" = set; then
    … …  
    92509278BISON!$BISON$ac_delim
    92519279VERSIONING!$VERSIONING$ac_delim
    92529280libc_cv_cc_with_libunwind!$libc_cv_cc_with_libunwind$ac_delim
     9281libc_cv_cc_with_libgcc_eh!$libc_cv_cc_with_libgcc_eh$ac_delim
    92539282libc_cv_Bgroup!$libc_cv_Bgroup$ac_delim
    92549283libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim
    92559284libc_cv_as_needed!$libc_cv_as_needed$ac_delim
    … …  
    93019330LTLIBOBJS!$LTLIBOBJS$ac_delim
    93029331_ACEOF
    93039332
    9304   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
     9333  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then
    93059334    break
    93069335  elif $ac_last_try; then
    93079336    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Note: See TracBrowser for help on using the repository browser.