Skip to content

Commit

Permalink
scripts: objdiff: improve path flexibility for record command
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Masahiro Yamada <[email protected]>
Acked-by: Jason Cooper <[email protected]>
Signed-off-by: Michal Marek <[email protected]>
  • Loading branch information
masahir0y authored and michal42 committed Jun 10, 2014
1 parent 1ecc8e4 commit 18165ef
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions scripts/objdiff
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#
# Note: 'make mrproper' will also remove .tmp_objdiff

SRCTREE=$(git rev-parse --show-toplevel 2>/dev/null)
SRCTREE=$(cd $(git rev-parse --show-toplevel 2>/dev/null); pwd)

if [ -z "$SRCTREE" ]; then
echo >&2 "ERROR: Not a git repository."
Expand All @@ -42,6 +42,18 @@ usage() {
exit 1
}

get_output_dir() {
dir=${1%/*}

if [ "$dir" = "$1" ]; then
dir=.
fi

dir=$(cd $dir; pwd)

echo $TMPD/$CMT${dir#$SRCTREE}
}

dorecord() {
[ $# -eq 0 ] && usage

Expand All @@ -50,18 +62,16 @@ dorecord() {
CMT="`git rev-parse --short HEAD`"

OBJDUMP="${CROSS_COMPILE}objdump"
OBJDIFFD="$TMPD/$CMT"

for f in $FILES; do
dn="${f%/*}"
dir=$(get_output_dir $f)
bn="${f##*/}"

[ ! -d "$OBJDIFFD/$dn" ] && mkdir -p "$OBJDIFFD/$dn"
[ ! -d "$dir" ] && mkdir -p $dir

# remove addresses for a more clear diff
# http://dummdida.tumblr.com/post/60924060451/binary-diff-between-libc-from-scientificlinux-and
$OBJDUMP -D "$f" | sed "s/^[[:space:]]\+[0-9a-f]\+//" \
>"$OBJDIFFD/$dn/$bn"
$OBJDUMP -D $f | sed "s/^[[:space:]]\+[0-9a-f]\+//" > $dir/$bn
done
}

Expand Down

0 comments on commit 18165ef

Please sign in to comment.