diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 3572d1794de651c3b5847344c6da3546f79cb089..682da80e2975e00fa7fb0f9cc8e74decd78b3e90 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2009-09-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * acinclude.m4 (LIBGOMP_CHECK_LINKER_FEATURES): Avoid 'head', + use sed script portable to Solaris /bin/sed for extracting ld + version. + * configure: Regenerate. + 2009-09-17 Alexander Monakov <amonakov@ispras.ru> * testsuite/libgomp.graphite/bounds.c: New test. diff --git a/libgomp/acinclude.m4 b/libgomp/acinclude.m4 index ac450ca9b8f603082ebe47dc08224d637c02c7ad..5e0f96c70f5bc19fb69f7fbab83d30c6755fdb57 100644 --- a/libgomp/acinclude.m4 +++ b/libgomp/acinclude.m4 @@ -152,8 +152,8 @@ AC_DEFUN([LIBGOMP_CHECK_LINKER_FEATURES], [ libgomp_ld_is_gold=yes fi changequote(,) - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` changequote([,]) libgomp_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) [$]3=0; print ([$]1*100+[$]2)*100+[$]3 }'` diff --git a/libgomp/configure b/libgomp/configure index 6e92fe909c966f5a457c64e85cd7675b2863e95d..d138f68798327a3c32f4826b0e675f6fb8f359a8 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -15692,8 +15692,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld libgomp_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` libgomp_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 41ac34fc50e432c6e5985ca1342e37f3539b91da..04239e502ab20b379518af48a855a66d0e76eefa 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2009-09-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR libstdc++/38923 + * acinclude.m4 (GLIBCXX_CHECK_LINKER_FEATURES): Avoid 'head', + use sed script portable to Solaris /bin/sed for extracting ld + version. + * configure: Regenerate. + 2009-09-28 Benjamin Kosnik <bkoz@redhat.com> * libsupc++/eh_terminate.cc: Fixes for -fno-exceptions. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 45e0229e4be74270e559f3cfb99b24f799ce7470..04487e6f85b543a979e760c8974b3d1d12f67492 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -209,8 +209,8 @@ AC_DEFUN([GLIBCXX_CHECK_LINKER_FEATURES], [ if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` changequote([,]) glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) [$]3=0; print ([$]1*100+[$]2)*100+[$]3 }'` diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 1430a8b030777a0298d1909a04c3dda9f28f91d0..1eb77d19193d259c34e3bc1e98f047efe4b26340 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -19507,8 +19507,8 @@ $as_echo_n "checking for ld version... " >&6; } if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` @@ -26409,8 +26409,8 @@ $as_echo_n "checking for ld version... " >&6; } if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` @@ -32224,8 +32224,8 @@ $as_echo_n "checking for ld version... " >&6; } if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` @@ -43869,8 +43869,8 @@ $as_echo_n "checking for ld version... " >&6; } if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` @@ -44083,8 +44083,8 @@ $as_echo_n "checking for ld version... " >&6; } if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` @@ -44558,8 +44558,8 @@ $as_echo_n "checking for ld version... " >&6; } if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` @@ -50727,8 +50727,8 @@ $as_echo_n "checking for ld version... " >&6; } if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` @@ -56527,8 +56527,8 @@ $as_echo_n "checking for ld version... " >&6; } if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` @@ -56694,8 +56694,8 @@ $as_echo_n "checking for ld version... " >&6; } if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` @@ -56843,8 +56843,8 @@ $as_echo_n "checking for ld version... " >&6; } if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` @@ -57010,8 +57010,8 @@ $as_echo_n "checking for ld version... " >&6; } if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` @@ -57182,8 +57182,8 @@ $as_echo_n "checking for ld version... " >&6; } if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then glibcxx_ld_is_gold=yes fi - ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'` + ldver=`$LD --version 2>/dev/null | + sed -e 's/GNU g*o*ld v*e*r*s*i*o*n* *\(([^)]*)* *\) \([0-9.][0-9.]*\).*/\2/; q'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`