[coreboot-gerrit] Change in coreboot[master]: Use xcompile proposed CFLAGS for Ada

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/21363


Change subject: Use xcompile proposed CFLAGS for Ada
......................................................................

Use xcompile proposed CFLAGS for Ada

We don't output special ADAFLAGS in xcompile but its CFLAGS are
compatible with and necessary for Ada too. So use the latter and
make sure we use them for libgnat too.

Fixes i386 builds with x86_64 toolchain.

Change-Id: I0d13f182acfaa9bd1b608edd8a508c4ceedef3b3
Signed-off-by: Nico Huber <nico.h at gmx.de>
---
M src/lib/gnat/Makefile.inc
M toolchain.inc
2 files changed, 2 insertions(+), 1 deletion(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/21363/1

diff --git a/src/lib/gnat/Makefile.inc b/src/lib/gnat/Makefile.inc
index 9c68624..5c4c510 100644
--- a/src/lib/gnat/Makefile.inc
+++ b/src/lib/gnat/Makefile.inc
@@ -24,6 +24,7 @@
 	-gnatg \
 	-gnatpg \
 	-I$$(src)/lib/gnat/ \
+	$$(CFLAGS_$(1)) \
 
 libgnat-$(1)-y += a-unccon.ads
 libgnat-$(1)-y += ada.ads
diff --git a/toolchain.inc b/toolchain.inc
index d9b11f0..936eb14 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -129,7 +129,7 @@
 STRIP_$(1) := $(STRIP_$(2))
 READELF_$(1) := $(READELF_$(2))
 CFLAGS_$(1) = $$(CFLAGS_common) $$(CFLAGS_$(2))
-ADAFLAGS_$(1) = --RTS=$$(obj)/libgnat-$(2)/ $$(ADAFLAGS_common) $$(ADAFLAGS_$(2))
+ADAFLAGS_$(1) = --RTS=$$(obj)/libgnat-$(2)/ $$(ADAFLAGS_common) $$(CFLAGS_$(2))
 CPPFLAGS_$(1) = $$(CPPFLAGS_common) $$(CPPFLAGS_$(2)) -D__ARCH_$(2)__
 COMPILER_RT_$(1) := $$(COMPILER_RT_$(2))
 COMPILER_RT_FLAGS_$(1) := $$(COMPILER_RT_FLAGS_$(2))

-- 
To view, visit https://review.coreboot.org/21363
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d13f182acfaa9bd1b608edd8a508c4ceedef3b3
Gerrit-Change-Number: 21363
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h at gmx.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20170903/038393f3/attachment.html>