From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Sun, 29 Nov 2015 19:46:47 +0000 (+0000)
Subject: Automatically include config.h for all per-arch translation units
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=aacf66123a64469cd2f6070da06796d5a80bb193;p=people%2Froyger%2Fxen-test-framework.git

Automatically include config.h for all per-arch translation units

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/arch/x86/setup.c b/arch/x86/setup.c
index 8aa3825..bc9553a 100644
--- a/arch/x86/setup.c
+++ b/arch/x86/setup.c
@@ -2,7 +2,7 @@
 #include <xtf/console.h>
 #include <xtf/hypercall.h>
 
-#include <arch/x86/config.h>
+#include <arch/x86/desc.h>
 #include <arch/x86/mm.h>
 
 uint8_t boot_stack[PAGE_SIZE] __aligned(PAGE_SIZE);
diff --git a/arch/x86/traps.c b/arch/x86/traps.c
index eb678bc..3879ad7 100644
--- a/arch/x86/traps.c
+++ b/arch/x86/traps.c
@@ -1,7 +1,5 @@
 #include <xtf/traps.h>
 
-#include <arch/x86/config.h>
-
 /*
  * Getting called means that a shutdown(crash) hypercall has not succeeded.
  * Attempt more extreme measures to try and force a crash, and fall into an
diff --git a/config/common.mk b/config/common.mk
index 72b842a..28ff15f 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -48,8 +48,8 @@ define PERENV_setup
 AFLAGS_$($(1)_arch) := $$(COMMON_AFLAGS) $$(COMMON_AFLAGS-$($(1)_arch))
 CFLAGS_$($(1)_arch) := $$(COMMON_CFLAGS) $$(COMMON_CFLAGS-$($(1)_arch))
 
-AFLAGS_$(1) := $$(AFLAGS_$($(1)_arch)) $$(COMMON_AFLAGS-$(1)) -DCONFIG_ENV_$(1)
-CFLAGS_$(1) := $$(CFLAGS_$($(1)_arch)) $$(COMMON_CFLAGS-$(1)) -DCONFIG_ENV_$(1)
+AFLAGS_$(1) := $$(AFLAGS_$($(1)_arch)) $$(COMMON_AFLAGS-$(1)) -DCONFIG_ENV_$(1) -include arch/x86/config.h
+CFLAGS_$(1) := $$(CFLAGS_$($(1)_arch)) $$(COMMON_CFLAGS-$(1)) -DCONFIG_ENV_$(1) -include arch/x86/config.h
 
 link-$(1) := $(ROOT)/arch/x86/link-$(1).lds
 
diff --git a/include/arch/x86/mm.h b/include/arch/x86/mm.h
index 6a76ab1..0706728 100644
--- a/include/arch/x86/mm.h
+++ b/include/arch/x86/mm.h
@@ -3,7 +3,6 @@
 
 #include <stdint.h>
 
-#include <arch/x86/config.h>
 #include <arch/x86/page.h>
 
 #include <xen/xen.h>