From a050ca848bd7025f5a81388aea358c28e0921f4a Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir@xen.org>
Date: Thu, 13 Sep 2012 20:13:36 +0100
Subject: build: Require GCC 4.1 or later.

Centralise the version check in Config.mk. Any more strict version
requirements can be added to specific subdirs/arches.

Signed-off-by: Keir Fraser <keir@xen.org>
---
 Config.mk             | 4 ++++
 tools/Rules.mk        | 5 -----
 xen/arch/arm/Rules.mk | 4 ----
 xen/arch/x86/Rules.mk | 4 ----
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Config.mk b/Config.mk
index b9c7a9df75..d99b9a1141 100644
--- a/Config.mk
+++ b/Config.mk
@@ -119,6 +119,10 @@ define cc-ver-check-closure
     endif
 endef
 
+# Require GCC v4.1+
+check-$(gcc) = $(call cc-ver-check,CC,0x040100,"Xen requires at least gcc-4.1")
+$(eval $(check-y))
+
 define buildmakevars2shellvars
     export PREFIX="$(PREFIX)";                                            \
     export XEN_SCRIPT_DIR="$(XEN_SCRIPT_DIR)";                            \
diff --git a/tools/Rules.mk b/tools/Rules.mk
index f4e84c1b77..8d55e038f0 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -78,11 +78,6 @@ CFLAGS += $(CFLAGS-y)
 
 CFLAGS += $(EXTRA_CFLAGS_XEN_TOOLS)
 
-# Require GCC v3.4+ (to avoid issues with alignment constraints in Xen headers)
-check-$(CONFIG_X86) = $(call cc-ver-check,CC,0x030400,\
-                        "Xen requires at least gcc-3.4")
-$(eval $(check-y))
-
 INSTALL_PYTHON_PROG = \
 	$(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG)
 
diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk
index d99c8c6d25..a45c654346 100644
--- a/xen/arch/arm/Rules.mk
+++ b/xen/arch/arm/Rules.mk
@@ -25,7 +25,3 @@ CFLAGS += -DGCC_HAS_VISIBILITY_ATTRIBUTE
 endif
 
 CFLAGS += -mcpu=cortex-a15 -mfpu=vfpv3 -mfloat-abi=softfp
-
-# Require GCC v3.4+ (to avoid issues with alignment constraints in Xen headers)
-check-$(gcc) = $(call cc-ver-check,CC,0x030400,"Xen requires at least gcc-3.4")
-$(eval $(check-y))
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 6ab185f666..963850fe2a 100644
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -50,7 +50,3 @@ CFLAGS += -fno-asynchronous-unwind-tables
 ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n)
 CFLAGS += -DGCC_HAS_VISIBILITY_ATTRIBUTE
 endif
-
-# Require GCC v3.4+ (to avoid issues with alignment constraints in Xen headers)
-check-$(gcc) = $(call cc-ver-check,CC,0x030400,"Xen requires at least gcc-3.4")
-$(eval $(check-y))
-- 
cgit v1.2.3