From 93283bd962eee8bccca060d150f6cd65c6338246 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Thu, 3 Jun 2010 18:49:35 +0100 Subject: [PATCH 1/2] 6958257: Add support for alpha Allow the Zero port to be built on alpha architectures Reviewed-by: ohair --- jdk/make/common/Defs-linux.gmk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jdk/make/common/Defs-linux.gmk b/jdk/make/common/Defs-linux.gmk index 0ef4a2890e3..970cea9fc15 100644 --- a/jdk/make/common/Defs-linux.gmk +++ b/jdk/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) From 44c72be43eebcdaf41d4eb5ad5409868d674f973 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Mon, 7 Jun 2010 12:22:21 -0700 Subject: [PATCH 2/2] 6959116: Fix regression in make/jdk_generic_profile.sh (PROCESSOR_IDENTIFIER) Reviewed-by: alanb --- jdk/make/jdk_generic_profile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/make/jdk_generic_profile.sh b/jdk/make/jdk_generic_profile.sh index 211430451b0..3f2e08446f0 100644 --- a/jdk/make/jdk_generic_profile.sh +++ b/jdk/make/jdk_generic_profile.sh @@ -174,7 +174,7 @@ else # Check CYGWIN (should have already been done) # Assumption here is that you are in a shell window via cygwin. - proc_arch=`echo "$(PROCESSOR_IDENTIFIER)" | expand | cut -d' ' -f1 | sed -e 's@x86@X86@g' -e 's@Intel64@X64@g' -e 's@em64t@X64@g' -e 's@EM64T@X64@g' -e 's@amd64@X64@g' -e 's@AMD64@X64@g' -e 's@ia64@IA64@g'` + proc_arch=`echo "${PROCESSOR_IDENTIFIER}" | expand | cut -d' ' -f1 | sed -e 's@x86@X86@g' -e 's@Intel64@X64@g' -e 's@em64t@X64@g' -e 's@EM64T@X64@g' -e 's@amd64@X64@g' -e 's@AMD64@X64@g' -e 's@ia64@IA64@g'` if [ "${proc_arch}" = "X64" ] ; then windows_arch=amd64 else