aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/objdiff
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2017-05-18 10:19:33 -0600
committerJonathan Corbet <corbet@lwn.net>2017-05-18 10:19:33 -0600
commita1a9af4e9d9ec65c22d3cfe449e0420d17dbedba (patch)
tree05bd08bb1987aa92b84b49b9ee4eee0ba3b2917f /scripts/objdiff
parentdoc: replace FTP URL to kernel.org with HTTPS one (diff)
parentLinux 4.12-rc1 (diff)
downloadlinux-dev-a1a9af4e9d9ec65c22d3cfe449e0420d17dbedba.tar.xz
linux-dev-a1a9af4e9d9ec65c22d3cfe449e0420d17dbedba.zip
Merge tag 'v4.12-rc1' into docs-next
Linux 4.12-rc1
Diffstat (limited to 'scripts/objdiff')
-rwxr-xr-xscripts/objdiff5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/objdiff b/scripts/objdiff
index 62e51dae2138..4fb5d6796893 100755
--- a/scripts/objdiff
+++ b/scripts/objdiff
@@ -57,13 +57,15 @@ get_output_dir() {
do_objdump() {
dir=$(get_output_dir $1)
base=${1##*/}
+ stripped=$dir/${base%.o}.stripped
dis=$dir/${base%.o}.dis
[ ! -d "$dir" ] && mkdir -p $dir
# remove addresses for a cleaner diff
# http://dummdida.tumblr.com/post/60924060451/binary-diff-between-libc-from-scientificlinux-and
- $OBJDUMP -D $1 | sed "s/^[[:space:]]\+[0-9a-f]\+//" > $dis
+ $STRIP -g $1 -R __bug_table -R .note -R .comment -o $stripped
+ $OBJDUMP -D $stripped | sed -e "s/^[[:space:]]\+[0-9a-f]\+//" -e "s:^$stripped:$1:" > $dis
}
dorecord() {
@@ -73,6 +75,7 @@ dorecord() {
CMT="`git rev-parse --short HEAD`"
+ STRIP="${CROSS_COMPILE}strip"
OBJDUMP="${CROSS_COMPILE}objdump"
for d in $FILES; do