diff options
| author | Alan Modra <amodra@gmail.com> | 2022-09-28 22:56:41 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2022-09-28 23:01:56 +0930 |
| commit | e2bae06cf91bd6d505705432eebc32cb246a690b (patch) | |
| tree | de374c57a3d4854654200ec673eb1daa11a2bb31 | |
| parent | 93362ef59ee13aa8ec7c09897c00e15f3ce38b7b (diff) | |
| download | fsf-binutils-gdb-e2bae06cf91bd6d505705432eebc32cb246a690b.zip fsf-binutils-gdb-e2bae06cf91bd6d505705432eebc32cb246a690b.tar.gz fsf-binutils-gdb-e2bae06cf91bd6d505705432eebc32cb246a690b.tar.bz2 | |
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.
| -rw-r--r-- | binutils/embedspu.sh | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-elfvers/vers.exp | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/binutils/embedspu.sh b/binutils/embedspu.sh index 361206f..d727739 100644 --- 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 9af6bb9..3e2ba2a 100644 --- 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 { |