Commit 216fe62d authored by Will Deacon's avatar Will Deacon
Browse files

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
parents e7cf636c 27f2a4db

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1031,7 +1031,7 @@ LDFLAGS_vmlinux += $(call ld-option, -X,) 
endif



ifeq ($(CONFIG_RELR),y)

LDFLAGS_vmlinux	+= --pack-dyn-relocs=relr

LDFLAGS_vmlinux	+= --pack-dyn-relocs=relr --use-android-relr-tags

endif



# We never want expected sections to be placed heuristically by the

scripts/tools-support-relr.sh

+2 −1
Original line number Diff line number Diff line
@@ -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

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 \

  --use-android-relr-tags -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.