diff options
| author | Alan Modra <amodra@gmail.com> | 2022-09-28 13:37:31 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2022-09-28 13:37:31 +0930 |
| commit | 67d1991b785bdfef1d70cddfa0202b99b43ccce9 (patch) | |
| tree | 126c4d66207af2518fa7c9ceeade0ce7625278be /binutils/embedspu.sh | |
| parent | f8a8e1b263752d558c79f33ca0730ca23fb4450b (diff) | |
| download | binutils-gdb-67d1991b785bdfef1d70cddfa0202b99b43ccce9.tar.gz | |
egrep in binutils
Apparently some distros have a nagging egrep that helpfully tells you
egrep is deprecated and to use "grep -E". The nag message causes a ld
testsuite failure. What's more the advice isn't that good. The "-E"
flag may not be available with older versions of grep.
This patch fixes bare invocation of egrep within binutils, replacing
it with the autoconf $EGREP or with grep.
config/
* lib-ld.m4 (AC_LIB_PROG_LD_GNU): Require AC_PROG_EGREP and
invoke $EGREP.
(AC_LIB_PROG_LD): Likewise.
binutils/
* configure: Regenerate.
* embedspu.sh: Replace egrep with grep.
gold/
* testsuite/Makefile.am (flagstest_compress_debug_sections.check):
Replace egrep with grep.
* testsuite/Makefile.in: Regenerate.
* testsuite/bnd_ifunc_1.sh: Replace egrep with $EGREP.
* testsuite/bnd_ifunc_2.sh: Likewise.
* testsuite/bnd_plt_1.sh: Likewise.
* testsuite/discard_locals_test.sh: Likewise.
* testsuite/gnu_property_test.sh: Likewise.
* testsuite/no_version_test.sh: Likewise.
* testsuite/pr18689.sh: Likewise.
* testsuite/pr26936.sh: Likewise.
* testsuite/retain.sh: Likewise.
* testsuite/split_i386.sh: Likewise.
* testsuite/split_s390.sh: Likewise.
* testsuite/split_x32.sh: Likewise.
* testsuite/split_x86_64.sh: Likewise.
* testsuite/ver_test_pr16504.sh: Likewise.
intl/
* configure: Regenerate.
ld/
* testsuite/ld-elfvers/vers.exp (test_ar): Replace egrep with grep.
Diffstat (limited to 'binutils/embedspu.sh')
| -rw-r--r-- | binutils/embedspu.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/binutils/embedspu.sh b/binutils/embedspu.sh index 42fcd063371..361206f7d88 100644 --- a/binutils/embedspu.sh +++ b/binutils/embedspu.sh @@ -108,9 +108,11 @@ main () READELF="$prog" # Sanity check the input file - if ! ${READELF} -h ${INFILE} | grep 'Class:.*ELF32' >/dev/null 2>/dev/null \ - || ! ${READELF} -h ${INFILE} | grep 'Type:.*EXEC' >/dev/null 2>/dev/null \ - || ! ${READELF} -h ${INFILE} | egrep 'Machine:.*(SPU|17)' >/dev/null 2>/dev/null + match="Class:.*ELF32 +Type:.*EXEC +Machine:.*SPU +Machine:.*17" + if test `${READELF} -h ${INFILE} | grep "${match}" | wc -l` != 3 then echo "${INFILE}: Does not appear to be an SPU executable" exit 1 |