|
@@ -1,17 +1,16 @@
|
|
|
-From fa3844ce6ce95f2db142b6c77f077b3e704d4f6f Mon Sep 17 00:00:00 2001
|
|
|
+From 9b6866b106eb3ad11115bd591a23e65a68dd847d Mon Sep 17 00:00:00 2001
|
|
|
From: Andrea Adami <andrea.adami@gmail.com>
|
|
|
-Date: Tue, 17 Apr 2018 19:12:14 +0200
|
|
|
-Subject: [PATCH] purgatory Makefile: adapt to klcc
|
|
|
+Date: Tue, 21 Aug 2018 16:31:44 +0200
|
|
|
+Subject: [PATCH 11/11] purgatory Makefile: adapt to klcc
|
|
|
|
|
|
Upstream-Status: Inappropriate [klibc specific]
|
|
|
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
|
|
|
-
|
|
|
---
|
|
|
- purgatory/Makefile | 9 +++++----
|
|
|
- 1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
+ purgatory/Makefile | 6 +++---
|
|
|
+ 1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
|
diff --git a/purgatory/Makefile b/purgatory/Makefile
|
|
|
-index 49ce80a..da36075 100644
|
|
|
+index 49ce80a..72eefaa 100644
|
|
|
--- a/purgatory/Makefile
|
|
|
+++ b/purgatory/Makefile
|
|
|
@@ -47,7 +47,7 @@ purgatory/sha256.o: $(srcdir)/util_lib/sha256.c
|
|
@@ -23,21 +22,17 @@ index 49ce80a..da36075 100644
|
|
|
-fno-zero-initialized-in-bss \
|
|
|
-fno-PIC -fno-PIE -fno-stack-protector
|
|
|
|
|
|
-@@ -59,13 +59,14 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
|
|
|
+@@ -59,8 +59,8 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
|
|
|
-Iinclude \
|
|
|
-I$(shell $(CC) -print-file-name=include)
|
|
|
$(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
|
|
|
- -Wl,--no-undefined -nostartfiles -nostdlib \
|
|
|
-+ --no-undefined -nostartfiles -nostdlib \
|
|
|
- -nodefaultlibs -e purgatory_start -r \
|
|
|
-- -Wl,-Map=$(PURGATORY_MAP)
|
|
|
-+ -Map=$(PURGATORY_MAP)
|
|
|
+- -nodefaultlibs -e purgatory_start -r \
|
|
|
++ -Wl,--no-undefined -Wl,-nostartfiles -Wl,-nostdlib \
|
|
|
++ -Wl,-nodefaultlibs -Wl,--entry=purgatory_start -Wl,-r \
|
|
|
+ -Wl,-Map=$(PURGATORY_MAP)
|
|
|
|
|
|
$(PURGATORY): $(PURGATORY_OBJS)
|
|
|
- $(MKDIR) -p $(@D)
|
|
|
-- $(CC) $(CFLAGS) $(LDFLAGS) -o $@.sym $^
|
|
|
-+# $(CC) $(CFLAGS) -o $@.sym $^
|
|
|
-+ $(LD) $(LDFLAGS) -o $@.sym $^
|
|
|
- # $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
|
|
|
- $(STRIP) --strip-debug -o $@ $@.sym
|
|
|
-
|
|
|
+--
|
|
|
+2.7.4
|
|
|
+
|