diff options
| author | David S. Miller | 2019-11-16 18:47:31 -0800 |
|---|---|---|
| committer | David S. Miller | 2019-11-16 21:51:42 -0800 |
| commit | 19b7e21c55c81713c4011278143006af9f232504 (patch) | |
| tree | e1312ccebbc23ee6b6928d1d02d644a15d695b67 /scripts | |
| parent | 1e8795b1b20d2721620165434cdcf427ecd2ba85 (diff) | |
| parent | 1d4c79ed324ad780cfc3ad38364ba1fd585dd2a8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Lots of overlapping changes and parallel additions, stuff
like that.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/tools-support-relr.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/tools-support-relr.sh b/scripts/tools-support-relr.sh index 97a2c844a95e..45e8aa360b45 100755 --- a/scripts/tools-support-relr.sh +++ b/scripts/tools-support-relr.sh @@ -4,13 +4,13 @@ tmp_file=$(mktemp) trap "rm -f $tmp_file.o $tmp_file $tmp_file.bin" EXIT -cat << "END" | "$CC" -c -x c - -o $tmp_file.o >/dev/null 2>&1 +cat << "END" | $CC -c -x c - -o $tmp_file.o >/dev/null 2>&1 void *p = &p; END -"$LD" $tmp_file.o -shared -Bsymbolic --pack-dyn-relocs=relr -o $tmp_file +$LD $tmp_file.o -shared -Bsymbolic --pack-dyn-relocs=relr -o $tmp_file # Despite printing an error message, GNU nm still exits with exit code 0 if it # sees a relr section. So we need to check that nothing is printed to stderr. -test -z "$("$NM" $tmp_file 2>&1 >/dev/null)" +test -z "$($NM $tmp_file 2>&1 >/dev/null)" -"$OBJCOPY" -O binary $tmp_file $tmp_file.bin +$OBJCOPY -O binary $tmp_file $tmp_file.bin |