diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-05-22 16:32:40 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-05-22 16:32:40 +1000 |
| commit | d68c51e0b377838dd31b37707813bb62089f399c (patch) | |
| tree | 4557d5ced33ea6da60bc84ee288af9924192f046 /scripts/objdiff | |
| parent | security: Grammar s/allocates/allocated/ (diff) | |
| parent | Linux 4.12-rc2 (diff) | |
| download | linux-d68c51e0b377838dd31b37707813bb62089f399c.tar.gz linux-d68c51e0b377838dd31b37707813bb62089f399c.zip | |
Sync to mainline for security submaintainers to work against
Diffstat (limited to 'scripts/objdiff')
| -rwxr-xr-x | scripts/objdiff | 5 |
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 |