From 1261663e18a1bd6514751b9687cd0ec651fc5f2e Mon Sep 17 00:00:00 2001 From: aoliva Date: Fri, 4 Sep 2009 18:59:15 +0000 Subject: [PATCH] * compare-debug: Grep for blank before dash to avoid grep -e. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151436 138bc75d-0d04-0410-961f-82ee72b054a4 --- contrib/ChangeLog | 4 ++++ contrib/compare-debug | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 77d71700464..3174cfff58e 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2009-09-04 Alexandre Oliva + + * compare-debug: Grep for blank before dash to avoid grep -e. + 2009-09-01 Alexandre Oliva * compare-debug: Look for .gkd files and compare them. diff --git a/contrib/compare-debug b/contrib/compare-debug index c2e1335366c..6f2b4abfb5c 100755 --- a/contrib/compare-debug +++ b/contrib/compare-debug @@ -78,7 +78,7 @@ else cmp2= for t in objdump readelf eu-readelf; do - if ($t --help) 2>&1 | grep -e '--\[*section-\]*headers' > /dev/null; then + if ($t --help) 2>&1 | grep ' --\[*section-\]*headers' > /dev/null; then cmd=$t $cmd --section-headers "$1.$suf1" | grep '\.eh_frame' > /dev/null @@ -109,13 +109,13 @@ else echo stripping off .eh_frame, then retrying >&2 - if (objcopy -v) 2>&1 | grep -e "--remove-section" > /dev/null; then + if (objcopy -v) 2>&1 | grep ' --remove-section' > /dev/null; then objcopy --remove-section .eh_frame --remove-section .rel.eh_frame --remove-section .rela.eh_frame "$1.$suf1" "$1.$suf3" mv "$1.$suf3" "$1.$suf1" objcopy --remove-section .eh_frame --remove-section .rel.eh_frame --remove-section .rela.eh_frame "$2.$suf2" "$2.$suf4" mv "$2.$suf4" "$2.$suf2" - elif (strip --help) 2>&1 | grep -e --remove-section > /dev/null; then + elif (strip --help) 2>&1 | grep ' --remove-section' > /dev/null; then cp "$1.$suf1" "$1.$suf3" strip --remove-section .eh_frame --remove-section .rel.eh_frame --remove-section .rela.eh_frame "$1.$suf3" mv "$1.$suf3" "$1.$suf1" -- 2.11.0