diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/configure | 4 | ||||
| -rw-r--r-- | gcc/configure.ac | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0b511f5..f336b11 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-05-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * configure.ac (gcc_cv_as_ld_jalr_reloc): Redirect grep stdout, + stderr to /dev/null instead of grep -q. + * configure: Regenerate. + 2010-05-25 Steven Bosscher <steven@gcc.gnu.org> * Makefile.in (EXCEPT_H): Fix typo. diff --git a/gcc/configure b/gcc/configure index 9fce3a9..33ac30e 100755 --- a/gcc/configure +++ b/gcc/configure @@ -24206,8 +24206,8 @@ $as_echo_n "checking assembler and linker for explicit JALR relocation... " >&6; echo ' .end x' >> conftest.s if $gcc_cv_as -o conftest.o conftest.s >/dev/null 2>&5 \ && $gcc_cv_ld -shared -o conftest.so conftest.o >/dev/null 2>&5; then - if $gcc_cv_objdump -d conftest.so | grep -q jalr \ - && $gcc_cv_objdump -d conftest.so | grep -q "bal.*<x>"; then + if $gcc_cv_objdump -d conftest.so | grep jalr >/dev/null 2>&1 \ + && $gcc_cv_objdump -d conftest.so | grep "bal.*<x>" >/dev/null 2>&1; then gcc_cv_as_ld_jalr_reloc=yes fi fi diff --git a/gcc/configure.ac b/gcc/configure.ac index fdb0d30..0677033 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -3601,8 +3601,8 @@ x: echo ' .end x' >> conftest.s if $gcc_cv_as -o conftest.o conftest.s >/dev/null 2>&AS_MESSAGE_LOG_FD \ && $gcc_cv_ld -shared -o conftest.so conftest.o >/dev/null 2>&AS_MESSAGE_LOG_FD; then - if $gcc_cv_objdump -d conftest.so | grep -q jalr \ - && $gcc_cv_objdump -d conftest.so | grep -q "bal.*<x>"; then + if $gcc_cv_objdump -d conftest.so | grep jalr >/dev/null 2>&1 \ + && $gcc_cv_objdump -d conftest.so | grep "bal.*<x>" >/dev/null 2>&1; then gcc_cv_as_ld_jalr_reloc=yes fi fi |