diff options
| author | Andrew Stubbs <andrew.stubbs@st.com> | 2006-07-04 13:50:40 +0000 |
|---|---|---|
| committer | Joern Rennecke <amylaar@gcc.gnu.org> | 2006-07-04 14:50:40 +0100 |
| commit | dbc02e7f4c2ff123b6ff1b9ccea612f6ecef4bcc (patch) | |
| tree | d9f4e0d63eb924ec10e8fb1d2860a964c186e1fa | |
| parent | 12197210b4a551893af85d4b898f74176f3ff36d (diff) | |
| download | gcc-dbc02e7f4c2ff123b6ff1b9ccea612f6ecef4bcc.zip gcc-dbc02e7f4c2ff123b6ff1b9ccea612f6ecef4bcc.tar.gz gcc-dbc02e7f4c2ff123b6ff1b9ccea612f6ecef4bcc.tar.bz2 | |
configure.ac (.eh_frame data check): Use diff -b.
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.
Co-Authored-By: J"orn Rennecke <joern.rennecke@st.com>
From-SVN: r115177
| -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 2905deb..f81893d 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 b7564bc..4ec1863 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 a68769b..7b3a5d1 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 |