| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 1 | From b6ebe05dc389b9457e3707401411fd075230b10e Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
| 3 | Date: Tue, 21 Aug 2018 16:31:44 +0200 |
| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 4 | Subject: [PATCH] purgatory Makefile: adapt to klcc |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Inappropriate [klibc specific] |
| 7 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 8 | |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 9 | --- |
| 10 | purgatory/Makefile | 6 +++--- |
| 11 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 12 | |
| 13 | diff --git a/purgatory/Makefile b/purgatory/Makefile |
| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 14 | index 49ce80a..1542b3a 100644 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 15 | --- a/purgatory/Makefile |
| 16 | +++ b/purgatory/Makefile |
| 17 | @@ -47,7 +47,7 @@ purgatory/sha256.o: $(srcdir)/util_lib/sha256.c |
| 18 | $(PURGATORY): CC=$(TARGET_CC) |
| 19 | $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \ |
| 20 | $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ |
| 21 | - -Os -fno-builtin -ffreestanding \ |
| 22 | + -Os -fno-builtin -ffreestanding -nostdinc \ |
| 23 | -fno-zero-initialized-in-bss \ |
| 24 | -fno-PIC -fno-PIE -fno-stack-protector |
| 25 | |
| 26 | @@ -59,8 +59,8 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ |
| 27 | -Iinclude \ |
| 28 | -I$(shell $(CC) -print-file-name=include) |
| 29 | $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ |
| 30 | - -Wl,--no-undefined -nostartfiles -nostdlib \ |
| 31 | - -nodefaultlibs -e purgatory_start -r \ |
| 32 | + -Wl,--no-undefined -Wl,-no-pie -Wl,-nostartfiles -Wl,-nostdlib \ |
| 33 | + -Wl,-nodefaultlibs -Wl,--entry=purgatory_start -Wl,-r \ |
| 34 | -Wl,-Map=$(PURGATORY_MAP) |
| 35 | |
| 36 | $(PURGATORY): $(PURGATORY_OBJS) |