Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 2425:b1903d7528d3 jdk7-b97
Merge
| author | mikejwre |
|---|---|
| date | Wed, 09 Jun 2010 18:56:41 -0700 |
| parents | 7140b5759b63 (current diff) be0d055db574 (diff) |
| children | 6568c84116bb 57293ed264c4 ae887ea4c772 d1c875d94263 |
| files | |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Defs-linux.gmk Mon Jun 07 17:08:26 2010 -0700 +++ b/make/common/Defs-linux.gmk Wed Jun 09 18:56:41 2010 -0700 @@ -194,7 +194,16 @@ 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)
--- a/make/jdk_generic_profile.sh Mon Jun 07 17:08:26 2010 -0700 +++ b/make/jdk_generic_profile.sh Wed Jun 09 18:56:41 2010 -0700 @@ -174,7 +174,7 @@ # 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