diff options
| author | Jessica Clarke <jrtc27@jrtc27.com> | 2021-07-11 03:28:22 +0100 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2021-07-11 20:03:06 +0530 |
| commit | 09ad811ec4661b99a67b87f28c93177367ae911e (patch) | |
| tree | b0ddd4520450dc8d112561acf9a1b7eb596315c5 | |
| parent | a3d328ae33a3e64d219b50269b4c013d363e9b82 (diff) | |
firmware: Only default FW_PIC to y if supported
Bare-metal GNU ld does not support PIE, so if using it this will result
in a failure to build. Instead, default to FW_PIC=n if not supported.
Note that an explicit FW_PIC=y is not overridden, to ensure the build
fails rather than silently producing a position-dependent binary.
Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | firmware/objects.mk | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -106,6 +106,9 @@ ifndef PLATFORM_RISCV_XLEN endif endif +# Check whether the linker supports creating PIEs +OPENSBI_LD_PIE := $(shell $(CC) -fPIE -nostdlib -Wl,-pie -x c /dev/null -o /dev/null >/dev/null 2>&1 && echo y || echo n) + # Setup list of objects.mk files ifdef PLATFORM platform-object-mks=$(shell if [ -d $(platform_src_dir)/ ]; then find $(platform_src_dir) -iname "objects.mk" | sort -r; fi) diff --git a/firmware/objects.mk b/firmware/objects.mk index 83f98ad..a1704c4 100644 --- a/firmware/objects.mk +++ b/firmware/objects.mk @@ -14,7 +14,7 @@ firmware-asflags-y += firmware-ldflags-y += ifndef FW_PIC -FW_PIC := y +FW_PIC := $(OPENSBI_LD_PIE) endif ifeq ($(FW_PIC),y) |