Wed, 09 Jun 2010 18:56:22 -0700
Merge
1.1 --- a/make/common/Defs-linux.gmk Mon Jun 07 16:15:35 2010 -0700 1.2 +++ b/make/common/Defs-linux.gmk Wed Jun 09 18:56:22 2010 -0700 1.3 @@ -176,7 +176,16 @@ 1.4 CXXFLAGS_DBG += $(CC_LOWER_OPT) 1.5 endif 1.6 1.7 -CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \ 1.8 +CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"' 1.9 + 1.10 +# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here) 1.11 +ifneq ($(ARCH),alpha) 1.12 + CPP_ARCH_FLAGS += -D$(ARCH) 1.13 +else 1.14 + CPP_ARCH_FLAGS += -D_$(ARCH)_ 1.15 +endif 1.16 + 1.17 +CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DLINUX $(VERSION_DEFINES) \ 1.18 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT 1.19 1.20 ifeq ($(ARCH_DATA_MODEL), 64)