configure.ac: Redirect grep stdout, stderr to /dev/null instead of grep -q.

libjava:
	* configure.ac: Redirect grep stdout, stderr to /dev/null instead
	of grep -q.
	Use -- instead of grep -e.
	* configure: Regenerate.

	gcc:
	* configure.ac (gcc_cv_as_ld_jalr_reloc): Redirect grep stdout,
	stderr to /dev/null instead of grep -q.
	* configure: Regenerate.

	contrib:
	* dg-extract-results.sh: Redirect grep output to /dev/null instead
	of grep -q.

From-SVN: r159840
This commit is contained in:
Rainer Orth 2010-05-25 18:50:01 +00:00 committed by Rainer Orth
parent 245763e30a
commit bc492e47c8
8 changed files with 28 additions and 10 deletions

View File

@ -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.

View File

@ -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

View File

@ -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.

4
gcc/configure vendored
View File

@ -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

View File

@ -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

View File

@ -1,3 +1,10 @@
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

4
libjava/configure vendored
View File

@ -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

View File

@ -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