summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/ChangeLog6
-rwxr-xr-xcontrib/compare-debug24
2 files changed, 30 insertions, 0 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 383e5765a68..c1e34999846 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-25 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR bootstrap/53472
+ * contrib/compare-debug (remove_comment): New function.
+ Remove any .comment sections if the first cmp failed.
+
2012-05-09 David Edelsohn <dje.gcc@gmail.com>
* gcc_update: Use $GCC_SVN to retrieve branch and revision.
diff --git a/contrib/compare-debug b/contrib/compare-debug
index 010d17f9c69..fb8986dedfd 100755
--- a/contrib/compare-debug
+++ b/contrib/compare-debug
@@ -73,11 +73,35 @@ Darwin)
;;
esac
+remove_comment ()
+{
+ file=$1
+ opts=
+ for s in `objdump --section-headers "$file" | awk '{ print $2 }'`; do
+ case "$s" in
+ .comment*)
+ opts="$opts --remove-section $s"
+ ;;
+ esac
+ done
+ [ -n "$opts" ] && objcopy $opts $file
+}
+
if cmp "$1.$suf1" "$2.$suf2"; then
status=0
else
status=1
+ # Remove any .comment sections.
+ if (objcopy -v) 2>&1 | grep ' --remove-section' > /dev/null \
+ && (objdump --help) 2>&1 | grep ' --\[*section-\]*headers' > /dev/null; then
+ remove_comment "$1.$suf1"
+ remove_comment "$2.$suf2"
+ if cmp "$1.$suf1" "$2.$suf2"; then
+ status=0
+ fi
+ fi
+
# Assembler-generated CFI will add an .eh_frame section for -g not
# present in -g0. Try to cope with it by checking that an .eh_frame
# section is present in either object file, and then stripping it