source: patches/glibc-2.7-libgcc_eh-1.patch@ 7067dbb

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

Create a clfs-1.1 branch in preperation for a RC.
  • Property mode set to 100644
File size: 4.4 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.

	     Rediffed for 2.7 by Jim Gifford

diff -Naur glibc-2.7.orig/Makeconfig glibc-2.7/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)

  • config.make.in 

    diff -Naur glibc-2.7.orig/config.make.in glibc-2.7/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.7.orig/configure glibc-2.7/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
    … …  
    60456046
    60466047  fi
    60476048
     6049  { echo "$as_me:$LINENO: checking whether to link against libgcc_eh" >&5
     6050echo $ECHO_N "checking whether to link against libgcc_eh... $ECHO_C" >&6; }
     6051if test "${libc_cv_cc_with_libgcc_eh+set}" = set; then
     6052  echo $ECHO_N "(cached) $ECHO_C" >&6
     6053else
     6054
     6055    cat > conftest.c <<EOF
     6056int main (void) { return 0; }
     6057EOF
     6058    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
     6059       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
     6060      libc_cv_cc_with_libgcc_eh=yes
     6061    else
     6062      libc_cv_cc_with_libgcc_eh=no
     6063    fi
     6064    rm -f conftest*
     6065fi
     6066{ echo "$as_me:$LINENO: result: $libc_cv_cc_with_libgcc_eh" >&5
     6067echo "${ECHO_T}$libc_cv_cc_with_libgcc_eh" >&6; }
     6068
     6069  if test $libc_cv_cc_with_libgcc_eh = yes; then
     6070    cat >>confdefs.h <<\_ACEOF
     6071#define HAVE_CC_WITH_LIBGCC_EH 1
     6072_ACEOF
     6073
     6074  fi
     6075
    60486076  { echo "$as_me:$LINENO: checking for -z nodelete option" >&5
    60496077echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; }
    60506078if test "${libc_cv_z_nodelete+set}" = set; then
    … …  
    92439271BISON!$BISON$ac_delim
    92449272VERSIONING!$VERSIONING$ac_delim
    92459273libc_cv_cc_with_libunwind!$libc_cv_cc_with_libunwind$ac_delim
     9274libc_cv_cc_with_libgcc_eh!$libc_cv_cc_with_libgcc_eh$ac_delim
    92469275libc_cv_Bgroup!$libc_cv_Bgroup$ac_delim
    92479276libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim
    92489277libc_cv_as_needed!$libc_cv_as_needed$ac_delim
    … …  
    92949323LTLIBOBJS!$LTLIBOBJS$ac_delim
    92959324_ACEOF
    92969325
    9297   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
     9326  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then
    92989327    break
    92999328  elif $ac_last_try; then
    93009329    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

  • configure.in 

    diff -Naur glibc-2.7.orig/configure.in glibc-2.7/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
Note: See TracBrowser for help on using the repository browser.