Re: egrep in binutils

Multi-line patterns for grep are not supported on some old versions
of grep.

binutils/
	* embedspu.sh: Replace multi-line grep with sed.
ld/
	* testsuite/ld-elfvers/vers.exp: Replace multi-line grep with sed.

diff --git a/binutils/embedspu.sh b/binutils/embedspu.sh
index 361206f7d88ba75800c97b8b4c0a9c79ef2bf8ce..d72773946c28c699cd06cdb900b65e0c682a5e5b 100644 (file)
--- a/binutils/embedspu.sh
+++ b/binutils/embedspu.sh
@@ -108,11 +108,7 @@ main ()
   READELF="$prog"
 
   # Sanity check the input file
-  match="Class:.*ELF32
-Type:.*EXEC
-Machine:.*SPU
-Machine:.*17"
-  if test `${READELF} -h ${INFILE} | grep "${match}" | wc -l` != 3
+  if test `${READELF} -h ${INFILE} | sed -n -e '/Class:.*ELF32/p' -e '/Type:.*EXEC/p' -e '/Machine:.*SPU/p' -e '/Machine:.*17/p' | sed -n '$='` != 3
   then
     echo "${INFILE}: Does not appear to be an SPU executable"
     exit 1

diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
index 9af6bb9fd92a8f1c229180c903b87c886c333658..3e2ba2aac074265cdfd5dae88113f7cdd8d1b9cd 100644 (file)
--- a/ld/testsuite/ld-elfvers/vers.exp
+++ b/ld/testsuite/ld-elfvers/vers.exp
@@ -109,9 +109,7 @@ proc test_ar { test lib object expect } {
        return
     }
 
-    set cmd "$nm --print-armap $tmpdir/$lib | grep \" in \" | grep \"VERS
-bar
-foo\" | grep -v ^\\\\. | sort > $tmpdir/nm.out"
+    set cmd "$nm --print-armap $tmpdir/$lib | sed -n -e /^\\\\./d -e \"/^VERS.* in /p\" -e \"/bar.* in /p\" -e \"/foo.* in /p\" | sort > $tmpdir/nm.out"
     verbose -log $cmd
     catch "exec $cmd" exec_output
     if [string match "" $exec_output] then {