Skip to content

Commit eb70e26

Browse files
committed
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Will Deacon: "One trivial fix for -rc8/final that ensures that the script used to detect RELR relocation support in the toolchain works correctly when $CC contains quotes. Although it fails safely (by failing to detect the support when it exists), it would be nice to have this fixed in 5.4 given that it was only introduced in the last merge window. Summary: - Handle CC variables containing quotes in tools-support-relr.sh script" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: scripts/tools-support-relr.sh: un-quote variables
2 parents 34b38f5 + 65e1f38 commit eb70e26

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

scripts/tools-support-relr.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
tmp_file=$(mktemp)
55
trap "rm -f $tmp_file.o $tmp_file $tmp_file.bin" EXIT
66

7-
cat << "END" | "$CC" -c -x c - -o $tmp_file.o >/dev/null 2>&1
7+
cat << "END" | $CC -c -x c - -o $tmp_file.o >/dev/null 2>&1
88
void *p = &p;
99
END
10-
"$LD" $tmp_file.o -shared -Bsymbolic --pack-dyn-relocs=relr -o $tmp_file
10+
$LD $tmp_file.o -shared -Bsymbolic --pack-dyn-relocs=relr -o $tmp_file
1111

1212
# Despite printing an error message, GNU nm still exits with exit code 0 if it
1313
# sees a relr section. So we need to check that nothing is printed to stderr.
14-
test -z "$("$NM" $tmp_file 2>&1 >/dev/null)"
14+
test -z "$($NM $tmp_file 2>&1 >/dev/null)"
1515

16-
"$OBJCOPY" -O binary $tmp_file $tmp_file.bin
16+
$OBJCOPY -O binary $tmp_file $tmp_file.bin

0 commit comments

Comments
 (0)