diff options
| author | amylaar <amylaar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-04 13:50:40 +0000 |
|---|---|---|
| committer | amylaar <amylaar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-04 13:50:40 +0000 |
| commit | a9e7d751e7e513e610645ca0ae52db4e937a8393 (patch) | |
| tree | d9f4e0d63eb924ec10e8fb1d2860a964c186e1fa | |
| parent | a8a6baf6f27b00a35582d666fd2bcf375e4b590f (diff) | |
| download | ppe42-gcc-a9e7d751e7e513e610645ca0ae52db4e937a8393.tar.gz ppe42-gcc-a9e7d751e7e513e610645ca0ae52db4e937a8393.zip | |
2006-07-04 Andrew Stubbs <andrew.stubbs@st.com>
J"orn Rennecke <joern.rennecke@st.com>
* configure.ac (.eh_frame data check): Use diff -b.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115177 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rwxr-xr-x | gcc/configure | 7 | ||||
| -rw-r--r-- | gcc/configure.ac | 7 |
3 files changed, 15 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2905deb3a2c..f81893dd7bc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2006-07-04 Andrew Stubbs <andrew.stubbs@st.com> + J"orn Rennecke <joern.rennecke@st.com> + + * configure.ac (.eh_frame data check): Use diff -b. + 2006-07-04 Eric Botcazou <ebotcazou@libertysurf.fr> PR bootstrap/18058 diff --git a/gcc/configure b/gcc/configure index b7564bcd6db..4ec18630eb7 100755 --- a/gcc/configure +++ b/gcc/configure @@ -13959,11 +13959,14 @@ cat > conftest.big <<EOF EOF # If the assembler didn't choke, and we can objdump, # and we got the correct data, then succeed. + # The text in the here-document typically retains its unix-style line + # endings, while the output of objdump will use host line endings. + # Therefore, use diff -b for the comparisons. if test x$gcc_cv_objdump != x \ && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \ | tail -3 > conftest.got \ - && { cmp conftest.lit conftest.got > /dev/null 2>&1 \ - || cmp conftest.big conftest.got > /dev/null 2>&1; } + && { diff -b conftest.lit conftest.got > /dev/null 2>&1 \ + || diff -b conftest.big conftest.got > /dev/null 2>&1; } then gcc_cv_as_eh_frame=yes elif { ac_try='$gcc_cv_as -o conftest.o --traditional-format /dev/null' diff --git a/gcc/configure.ac b/gcc/configure.ac index a68769b4b1d..7b3a5d10e18 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2209,11 +2209,14 @@ cat > conftest.big <<EOF EOF # If the assembler didn't choke, and we can objdump, # and we got the correct data, then succeed. + # The text in the here-document typically retains its unix-style line + # endings, while the output of objdump will use host line endings. + # Therefore, use diff -b for the comparisons. if test x$gcc_cv_objdump != x \ && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \ | tail -3 > conftest.got \ - && { cmp conftest.lit conftest.got > /dev/null 2>&1 \ - || cmp conftest.big conftest.got > /dev/null 2>&1; } + && { diff -b conftest.lit conftest.got > /dev/null 2>&1 \ + || diff -b conftest.big conftest.got > /dev/null 2>&1; } then gcc_cv_as_eh_frame=yes elif AC_TRY_COMMAND($gcc_cv_as -o conftest.o --traditional-format /dev/null); then |
