UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-next/build' into for-next/core 

Tweak linker flags so that GDB can understand vmlinux when using RELR
relocations.

* for-next/build:
  Makefile: fix GDB warning with CONFIG_RELR
This commit is contained in:
Will Deacon 2021-06-24 13:31:41 +01:00
parent e7cf636cba 27f2a4db76
commit 216fe62d6f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1031,7 +1031,7 @@ LDFLAGS_vmlinux += $(call ld-option, -X,)
endif endif
ifeq ($(CONFIG_RELR),y) ifeq ($(CONFIG_RELR),y)
LDFLAGS_vmlinux += --pack-dyn-relocs=relr LDFLAGS_vmlinux += --pack-dyn-relocs=relr --use-android-relr-tags
endif endif
# We never want expected sections to be placed heuristically by the # We never want expected sections to be placed heuristically by the

3
scripts/tools-support-relr.sh
View File

@ -7,7 +7,8 @@ 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; void *p = &p;
END END
$LD $tmp_file.o -shared -Bsymbolic --pack-dyn-relocs=relr -o $tmp_file $LD $tmp_file.o -shared -Bsymbolic --pack-dyn-relocs=relr \
--use-android-relr-tags -o $tmp_file
# Despite printing an error message, GNU nm still exits with exit code 0 if it # 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. # sees a relr section. So we need to check that nothing is printed to stderr.