From dd9754dd62bff35b13c69f847ef3fb561209c9cf Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sun, 3 Sep 2017 15:23:55 +0200 Subject: [PATCH] toolchain: 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. TEST=Gave libgfxinit a shot on lenovo/t420. Change-Id: I0d13f182acfaa9bd1b608edd8a508c4ceedef3b3 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/21363 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/lib/gnat/Makefile.inc | 1 + toolchain.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/gnat/Makefile.inc b/src/lib/gnat/Makefile.inc index 9c68624947..5c4c510f7e 100644 --- a/src/lib/gnat/Makefile.inc +++ b/src/lib/gnat/Makefile.inc @@ -24,6 +24,7 @@ ADAFLAGS_libgnat-$(1) := \ -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 d9b11f0c63..936eb14c7f 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -129,7 +129,7 @@ OBJDUMP_$(1) := $(OBJDUMP_$(2)) 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))