From 46e4700a33e5f3a87c20e52543a445641bba26d5 Mon Sep 17 00:00:00 2001
From: andrew <unknown>
Date: Thu, 3 Jun 2010 18:49:35 +0100
Subject: [PATCH] 6958257: Add support for alpha Summary: Allow the Zero port
 to be built on alpha architectures Reviewed-by: ohair

---
 make/common/Defs-linux.gmk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/make/common/Defs-linux.gmk b/make/common/Defs-linux.gmk
index 0ef4a2890..970cea9fc 100644
--- a/make/common/Defs-linux.gmk
+++ b/make/common/Defs-linux.gmk
@@ -194,7 +194,16 @@ ifeq ($(FASTDEBUG), true)
   CXXFLAGS_DBG	+= $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
 endif
 
-CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \
+CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"'
+
+# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here)
+ifneq ($(ARCH),alpha)
+  CPP_ARCH_FLAGS += -D$(ARCH)
+else
+  CPP_ARCH_FLAGS += -D_$(ARCH)_
+endif
+
+CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DLINUX $(VERSION_DEFINES) \
 		  -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
 
 ifeq ($(ARCH_DATA_MODEL), 64)
-- 
GitLab