* 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

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 77d7170046465c96f0529cd23d17f481e641ccb4..3174cfff58e4d69d45d35daab32e63909516698e 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-04  Alexandre Oliva  <aoliva@redhat.com>
+
+       * compare-debug: Grep for blank before dash to avoid grep -e.
+
 2009-09-01  Alexandre Oliva  <aoliva@redhat.com>
 
        * compare-debug: Look for .gkd files and compare them.

diff --git a/contrib/compare-debug b/contrib/compare-debug
index c2e1335366ce17d0abf339a027333fe3e8a6712c..6f2b4abfb5c907b650ffc860ba4ac6a886d01eb6 100755 (executable)
--- 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"