Prior to this commit, scripts/objdiff expected to be run at the top directory and only the relative path of objects. This commit provides more flexibility in terms of object path: [1] scripts/objdiff can be run in any directory For example, $ scripts/objdiff record init/main.o and $ cd init; ../scripts/objdiff record main.o produce the same result. [2] Support absolute path for objects $ scripts/objdiff record /home/foo/bar/linux/init/main.o work as well.
Showing the changes to scripts/objdiff (1 of 1 file). Show all
Unified · Split
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | # |
| 26 | 26 | # Note: 'make mrproper' will also remove .tmp_objdiff |
| 27 | 27 | |
| 28 | −SRCTREE=$(git rev-parse --show-toplevel 2>/dev/null) | |
| 28 | +SRCTREE=$(cd $(git rev-parse --show-toplevel 2>/dev/null); pwd) | |
| 29 | 29 | |
| 30 | 30 | if [ -z "$SRCTREE" ]; then |
| 31 | 31 | echo >&2 "ERROR: Not a git repository." |
| @@ -42,6 +42,18 @@ usage() { · 10 unmodified lines | ||
| 42 | 42 | exit 1 |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | +get_output_dir() { | |
| 46 | + dir=${1%/*} | |
| 47 | + | |
| 48 | + if [ "$dir" = "$1" ]; then | |
| 49 | + dir=. | |
| 50 | + fi | |
| 51 | + | |
| 52 | + dir=$(cd $dir; pwd) | |
| 53 | + | |
| 54 | + echo $TMPD/$CMT${dir#$SRCTREE} | |
| 55 | +} | |
| 56 | + | |
| 45 | 57 | dorecord() { |
| 46 | 58 | [ $# -eq 0 ] && usage |
| 47 | 59 | |
| @@ -50,18 +62,16 @@ dorecord() { · 2 unmodified lines | ||
| 50 | 62 | CMT="`git rev-parse --short HEAD`" |
| 51 | 63 | |
| 52 | 64 | OBJDUMP="${CROSS_COMPILE}objdump" |
| 53 | − OBJDIFFD="$TMPD/$CMT" | |
| 54 | 65 | |
| 55 | 66 | for f in $FILES; do |
| 56 | − dn="${f%/*}" | |
| 67 | + dir=$(get_output_dir $f) | |
| 57 | 68 | bn="${f##*/}" |
| 58 | 69 | |
| 59 | − [ ! -d "$OBJDIFFD/$dn" ] && mkdir -p "$OBJDIFFD/$dn" | |
| 70 | + [ ! -d "$dir" ] && mkdir -p $dir | |
| 60 | 71 | |
| 61 | 72 | # remove addresses for a more clear diff |
| 62 | 73 | # http://dummdida.tumblr.com/post/60924060451/binary-diff-between-libc-from-scientificlinux-and |
| 63 | − $OBJDUMP -D "$f" | sed "s/^[[:space:]]\+[0-9a-f]\+//" \ | |
| 64 | − >"$OBJDIFFD/$dn/$bn" | |
| 74 | + $OBJDUMP -D $f | sed "s/^[[:space:]]\+[0-9a-f]\+//" > $dir/$bn | |
| 65 | 75 | done |
| 66 | 76 | } |
| 67 | 77 | |