diff options
| -rw-r--r-- | contrib/ChangeLog | 5 | ||||
| -rwxr-xr-x | contrib/dg-extract-results.sh | 4 | ||||
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/configure | 4 | ||||
| -rw-r--r-- | gcc/configure.ac | 4 | ||||
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rwxr-xr-x | libjava/configure | 4 | ||||
| -rw-r--r-- | libjava/configure.ac | 4 |
8 files changed, 28 insertions, 10 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 3a5f8f56597..60afb708be4 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2010-05-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * dg-extract-results.sh: Redirect grep output to /dev/null instead + of grep -q. + 2010-04-22 Basile Starynkevitch <basile@starynkevitch.net> * gcc_update: Sets the locale to C. diff --git a/contrib/dg-extract-results.sh b/contrib/dg-extract-results.sh index 0ad85cb7aa2..be7d47b1ec5 100755 --- a/contrib/dg-extract-results.sh +++ b/contrib/dg-extract-results.sh @@ -224,7 +224,7 @@ else VARIANTS="" for VAR in $VARS do - grep -q "Running target $VAR" $SUM_FILES && VARIANTS="$VARIANTS $VAR" + grep "Running target $VAR" $SUM_FILES > /dev/null && VARIANTS="$VARIANTS $VAR" done fi @@ -418,6 +418,6 @@ cat ${TMP}/var-* | $AWK -f $TOTAL_AWK # This is ugly, but if there's version output from the compiler under test # at the end of the file, we want it. The other thing that might be there # is the final summary counts. -tail -2 $FIRST_SUM | grep -q '^#' || tail -2 $FIRST_SUM +tail -2 $FIRST_SUM | grep '^#' > /dev/null || tail -2 $FIRST_SUM exit 0 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0b511f5562a..f336b113784 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 9fce3a901e2..33ac30edc7f 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 fdb0d3025a2..06770333a99 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 diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2968be1728c..0d4e9067648 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,12 @@ 2010-05-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + * configure.ac: Redirect grep stdout, stderr to /dev/null instead + of grep -q. + Use -- instead of grep -e. + * configure: Regenerate. + +2010-05-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + PR libgcj/44216 * configure.ac (libgcj_cv_exidx): Enable AC_LANG_WERROR. Save and restore werror flag. diff --git a/libjava/configure b/libjava/configure index 8f549050da2..06ba4e98b41 100755 --- a/libjava/configure +++ b/libjava/configure @@ -24520,8 +24520,8 @@ fi # Check if linker supports static linking on a per library basis LD_START_STATIC_SPEC= LD_FINISH_STATIC_SPEC= -if $LD --help 2>&1 | grep -q -e -call_shared ; then - if $LD --help 2>&1 | grep -q -e -non_shared ; then +if $LD --help 2>&1 | grep -- -call_shared >/dev/null 2>&1; then + if $LD --help 2>&1 | grep -- -non_shared >/dev/null 2>&1; then LD_START_STATIC_SPEC='%{static-libgcj:-non_shared}' LD_FINISH_STATIC_SPEC='%{static-libgcj:-call_shared}' fi diff --git a/libjava/configure.ac b/libjava/configure.ac index 5376a0157ea..a359afed7bd 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1778,8 +1778,8 @@ AM_CONDITIONAL(ANONVERSCRIPT, test "$libjava_cv_anon_version_script" = yes) # Check if linker supports static linking on a per library basis LD_START_STATIC_SPEC= LD_FINISH_STATIC_SPEC= -if $LD --help 2>&1 | grep -q -e -call_shared ; then - if $LD --help 2>&1 | grep -q -e -non_shared ; then +if $LD --help 2>&1 | grep -- -call_shared >/dev/null 2>&1; then + if $LD --help 2>&1 | grep -- -non_shared >/dev/null 2>&1; then LD_START_STATIC_SPEC='%{static-libgcj:-non_shared}' LD_FINISH_STATIC_SPEC='%{static-libgcj:-call_shared}' fi |