1.1 --- a/make/common/Defs-linux.gmk	Mon Jun 07 17:08:26 2010 -0700
     1.2 +++ b/make/common/Defs-linux.gmk	Wed Jun 09 18:56:41 2010 -0700
     1.3 @@ -194,7 +194,16 @@
     1.4    CXXFLAGS_DBG	+= $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
     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)

     2.1 --- a/make/jdk_generic_profile.sh	Mon Jun 07 17:08:26 2010 -0700
     2.2 +++ b/make/jdk_generic_profile.sh	Wed Jun 09 18:56:41 2010 -0700
     2.3 @@ -174,7 +174,7 @@
     2.4     
     2.5    # Check CYGWIN (should have already been done)
     2.6    #   Assumption here is that you are in a shell window via cygwin.
     2.7 -  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'`
     2.8 +  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'`
     2.9    if [ "${proc_arch}" = "X64" ] ; then
    2.10      windows_arch=amd64
    2.11    else