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
Showing the changes to scripts (1 of 1 file). Show all
Unified · Split
| @@ -4,13 +4,13 @@ · 3 unmodified lines | |||
| 4 | tmp_file=$(mktemp) | 4 | tmp_file=$(mktemp) |
| 5 | trap "rm -f $tmp_file.o $tmp_file $tmp_file.bin" EXIT | 5 | trap "rm -f $tmp_file.o $tmp_file $tmp_file.bin" EXIT |
| 6 | 6 | ||
| 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 |
| 8 | void *p = &p; | 8 | void *p = &p; |
| 9 | END | 9 | 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 |
| 11 | 11 | ||
| 12 | # Despite printing an error message, GNU nm still exits with exit code 0 if it | 12 | # Despite printing an error message, GNU nm still exits with exit code 0 if it |
| 13 | # sees a relr section. So we need to check that nothing is printed to stderr. | 13 | # 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)" |
| 15 | 15 | ||
| 16 | "$OBJCOPY" -O binary $tmp_file $tmp_file.bin | 16 | $OBJCOPY -O binary $tmp_file $tmp_file.bin |