81 lines
2.6 KiB
Diff
81 lines
2.6 KiB
Diff
|
From eea0f62a1f6712f10afe47635b80a061505d2d2f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Romain Naour <romain.naour@openwide.fr>
|
||
|
|
Date: Sat, 17 Jan 2015 18:33:37 +0100
|
||
|
|
Subject: [PATCH 1/2] Allow CFLAGS/CPPFLAGS to be completed from the
|
||
|
|
environment
|
||
|
|
|
||
|
|
Buildroot passes its own CPPFLAGS and CFLAGS in the environment, so
|
||
|
|
the CFLAGS += and CPPFLAGS += statements in gnu-efi Makefile have no
|
||
|
|
effect. Change these to override <VARIABLE> += so that they extend the
|
||
|
|
flags passed by Buildroot.
|
||
|
|
|
||
|
|
[Romain:
|
||
|
|
- rebase on top of 3.0.1 release]
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||
|
|
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
||
|
|
---
|
||
|
|
Make.defaults | 16 ++++++++--------
|
||
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Make.defaults b/Make.defaults
|
||
|
|
index 169273d..b0ddea0 100644
|
||
|
|
--- a/Make.defaults
|
||
|
|
+++ b/Make.defaults
|
||
|
|
@@ -80,14 +80,14 @@ endif
|
||
|
|
#
|
||
|
|
|
||
|
|
# Arch-specific compilation flags
|
||
|
|
-CPPFLAGS += -DCONFIG_$(ARCH)
|
||
|
|
+override CPPFLAGS += -DCONFIG_$(ARCH)
|
||
|
|
|
||
|
|
ifeq ($(ARCH),ia64)
|
||
|
|
- CFLAGS += -mfixed-range=f32-f127
|
||
|
|
+ override CFLAGS += -mfixed-range=f32-f127
|
||
|
|
endif
|
||
|
|
|
||
|
|
ifeq ($(ARCH),ia32)
|
||
|
|
- CFLAGS += -mno-mmx -mno-sse
|
||
|
|
+ override CFLAGS += -mno-mmx -mno-sse
|
||
|
|
ifeq ($(HOSTARCH),x86_64)
|
||
|
|
ARCH3264 = -m32
|
||
|
|
endif
|
||
|
|
@@ -103,10 +103,10 @@ ifeq ($(ARCH),x86_64)
|
||
|
|
&& [ $(GCCMINOR) -ge "7" ] ) ) \
|
||
|
|
&& echo 1)
|
||
|
|
ifeq ($(GCCNEWENOUGH),1)
|
||
|
|
- CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
|
||
|
|
+ override CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
|
||
|
|
endif
|
||
|
|
|
||
|
|
- CFLAGS += -mno-red-zone -mno-mmx -mno-sse
|
||
|
|
+ override CFLAGS += -mno-red-zone -mno-mmx -mno-sse
|
||
|
|
ifeq ($(HOSTARCH),ia32)
|
||
|
|
ARCH3264 = -m64
|
||
|
|
endif
|
||
|
|
@@ -127,7 +127,7 @@ export LIBGCC=$(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
|
||
|
|
endif
|
||
|
|
|
||
|
|
ifeq ($(ARCH),arm)
|
||
|
|
-CFLAGS += -marm
|
||
|
|
+override CFLAGS += -marm
|
||
|
|
endif
|
||
|
|
|
||
|
|
# Generic compilation flags
|
||
|
|
@@ -135,10 +135,10 @@ INCDIR += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \
|
||
|
|
-I$(TOPDIR)/inc/protocol
|
||
|
|
|
||
|
|
ifeq (FreeBSD, $(findstring FreeBSD, $(OS)))
|
||
|
|
-CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
|
||
|
|
+override CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
|
||
|
|
-ffreestanding -fno-stack-protector
|
||
|
|
else
|
||
|
|
-CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
|
||
|
|
+override CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
|
||
|
|
-fno-merge-constants -ffreestanding -fno-stack-protector \
|
||
|
|
-fno-stack-check
|
||
|
|
endif
|
||
|
|
--
|
||
|
|
1.9.3
|
||
|
|
|