diff --git a/make/windows/build_vm_def.sh b/make/windows/build_vm_def.sh index 6f78c6a2f1dc507a237564a0e65196161c61effe..64a31c85e7833ba70daa2f19ed1b371555da2e65 100644 --- a/make/windows/build_vm_def.sh +++ b/make/windows/build_vm_def.sh @@ -58,11 +58,11 @@ LINK_VER="$1" fi if [ "x$LINK_VER" != "x800" -a "x$LINK_VER" != "x900" ]; then -$DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def +$DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def else # Can't use pipes when calling cl.exe or link.exe from IDE. Using transit file vm3.def $DUMPBIN /OUT:vm3.def /symbols *.obj -"$CAT" vm3.def | "$GREP" "??_7.*@@6B@" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def +"$CAT" vm3.def | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def "$RM" -f vm3.def fi diff --git a/make/windows/makefiles/compile.make b/make/windows/makefiles/compile.make index fcbd74663b45a9eced5def9e8b79e8b1764780cd..e9937363e88d7f8679cb2c423027f9389ead0129 100644 --- a/make/windows/makefiles/compile.make +++ b/make/windows/makefiles/compile.make @@ -92,6 +92,7 @@ CPP=ARCH_ERROR # 1399 is our fake number for the VS2005 compiler that really isn't 1400 # 1400 is for VS2005 # 1500 is for VS2008 +# 1600 is for VS2010 # Do not confuse this MSC_VER with the predefined macro _MSC_VER that the # compiler provides, when MSC_VER==1399, _MSC_VER will be 1400. # Normally they are the same, but a pre-release of the VS2005 compilers @@ -121,6 +122,9 @@ COMPILER_NAME=VS2005 !if "$(MSC_VER)" == "1500" COMPILER_NAME=VS2008 !endif +!if "$(MSC_VER)" == "1600" +COMPILER_NAME=VS2010 +!endif !endif # Add what version of the compiler we think this is to the compile line @@ -183,6 +187,17 @@ LINK_FLAGS = /manifest $(LINK_FLAGS) MT=mt.exe !endif +!if "$(COMPILER_NAME)" == "VS2010" +PRODUCT_OPT_OPTION = /O2 /Oy- +FASTDEBUG_OPT_OPTION = /O2 /Oy- +DEBUG_OPT_OPTION = /Od +GX_OPTION = /EHsc +LINK_FLAGS = /manifest $(LINK_FLAGS) +# Manifest Tool - used in VS2005 and later to adjust manifests stored +# as resources inside build artifacts. +MT=mt.exe +!endif + # Compile for space above time. !if "$(Variant)" == "kernel" PRODUCT_OPT_OPTION = /O1 /Oy- diff --git a/make/windows/makefiles/defs.make b/make/windows/makefiles/defs.make index ee6de0c9e03e31097ee71fa14ebaaf3e4d03544c..f9b2fde872e68693531d3a9f59f7666bbb01c6a6 100644 --- a/make/windows/makefiles/defs.make +++ b/make/windows/makefiles/defs.make @@ -55,6 +55,8 @@ ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),) MAKE_ARGS += Platform_arch_model=ia64 endif +# http://support.microsoft.com/kb/888731 : this can be either +# AMD64 for AMD, or EM64T for Intel chips. ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),) ARCH_DATA_MODEL=64 PLATFORM=windows-amd64 @@ -67,6 +69,19 @@ ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),) MAKE_ARGS += Platform_arch_model=x86_64 endif +# NB later OS versions than 2003 may report "Intel64" +ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) "EM64T\|Intel64"),) + ARCH_DATA_MODEL=64 + PLATFORM=windows-amd64 + VM_PLATFORM=windows_amd64 + HS_ARCH=x86 + MAKE_ARGS += LP64=1 + MAKE_ARGS += ARCH=x86 + MAKE_ARGS += BUILDARCH=amd64 + MAKE_ARGS += Platform_arch=x86 + MAKE_ARGS += Platform_arch_model=x86_64 +endif + JDK_INCLUDE_SUBDIR=win32 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined diff --git a/make/windows/makefiles/sanity.make b/make/windows/makefiles/sanity.make index dc7b07192fc612c62d0870a7729248a9196f94eb..3a742c976066648ed80273e24f440272bb9f2f10 100644 --- a/make/windows/makefiles/sanity.make +++ b/make/windows/makefiles/sanity.make @@ -27,9 +27,9 @@ all: checkCL checkLink checkCL: - @ if "$(MSC_VER)" NEQ "1310" if "$(MSC_VER)" NEQ "1399" if "$(MSC_VER)" NEQ "1400" if "$(MSC_VER)" NEQ "1500" \ + @ if "$(MSC_VER)" NEQ "1310" if "$(MSC_VER)" NEQ "1399" if "$(MSC_VER)" NEQ "1400" if "$(MSC_VER)" NEQ "1500" if "$(MSC_VER)" NEQ "1600" \ echo *** WARNING *** unrecognized cl.exe version $(MSC_VER) ($(RAW_MSC_VER)). Use FORCE_MSC_VER to override automatic detection. checkLink: - @ if "$(LINK_VER)" NEQ "710" if "$(LINK_VER)" NEQ "800" if "$(LINK_VER)" NEQ "900" \ + @ if "$(LINK_VER)" NEQ "710" if "$(LINK_VER)" NEQ "800" if "$(LINK_VER)" NEQ "900" if "$(LINK_VER)" NEQ "1000" \ echo *** WARNING *** unrecognized link.exe version $(LINK_VER) ($(RAW_LINK_VER)). Use FORCE_LINK_VER to override automatic detection. diff --git a/src/share/vm/gc_implementation/g1/heapRegion.cpp b/src/share/vm/gc_implementation/g1/heapRegion.cpp index bff10363daf7dd5b28bbaa942bd88c5e46819628..6a5a9d8d02f149d0320a128ebb97a47ee92bfd56 100644 --- a/src/share/vm/gc_implementation/g1/heapRegion.cpp +++ b/src/share/vm/gc_implementation/g1/heapRegion.cpp @@ -290,7 +290,7 @@ void HeapRegion::setup_heap_region_size(uintx min_heap_size) { // Recalculate the region size to make sure it's a power of // 2. This means that region_size is the largest power of 2 that's // <= what we've calculated so far. - region_size = 1 << region_size_log; + region_size = ((uintx)1 << region_size_log); // Now make sure that we don't go over or under our limits. if (region_size < MIN_REGION_SIZE) { diff --git a/src/share/vm/runtime/sharedRuntimeTrig.cpp b/src/share/vm/runtime/sharedRuntimeTrig.cpp index b6fe6613dfb433a0ec4215c3b3c8696fa7b4f296..a3f22a4f4af1b5dc7f48711c2ccf300a8ed66de3 100644 --- a/src/share/vm/runtime/sharedRuntimeTrig.cpp +++ b/src/share/vm/runtime/sharedRuntimeTrig.cpp @@ -41,6 +41,26 @@ # pragma optimize ( "", off ) #endif +/* The above workaround now causes more problems with the latest MS compiler. + * Visual Studio 2010's /GS option tries to guard against buffer overruns. + * /GS is on by default if you specify optimizations, which we do globally + * via /W3 /O2. However the above selective turning off of optimizations means + * that /GS issues a warning "4748". And since we treat warnings as errors (/WX) + * then the compilation fails. There are several possible solutions + * (1) Remove that pragma above as obsolete with VS2010 - requires testing. + * (2) Stop treating warnings as errors - would be a backward step + * (3) Disable /GS - may help performance but you lose the security checks + * (4) Disable the warning with "#pragma warning( disable : 4748 )" + * (5) Disable planting the code with __declspec(safebuffers) + * I've opted for (5) although we should investigate the local performance + * benefits of (1) and global performance benefit of (3). + */ +#if defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER >= 1600)) +#define SAFEBUF __declspec(safebuffers) +#else +#define SAFEBUF +#endif + #include // VM_LITTLE_ENDIAN is #defined appropriately in the Makefiles @@ -235,7 +255,7 @@ one = 1.0, two24B = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */ twon24 = 5.96046447753906250000e-08; /* 0x3E700000, 0x00000000 */ -static int __kernel_rem_pio2(double *x, double *y, int e0, int nx, int prec, const int *ipio2) { +static SAFEBUF int __kernel_rem_pio2(double *x, double *y, int e0, int nx, int prec, const int *ipio2) { int jz,jx,jv,jp,jk,carry,n,iq[20],i,j,k,m,q0,ih; double z,fw,f[20],fq[20],q[20]; @@ -451,7 +471,7 @@ pio2_2t = 2.02226624879595063154e-21, /* 0x3BA3198A, 0x2E037073 */ pio2_3 = 2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */ pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */ -static int __ieee754_rem_pio2(double x, double *y) { +static SAFEBUF int __ieee754_rem_pio2(double x, double *y) { double z,w,t,r,fn; double tx[3]; int e0,i,j,nx,n,ix,hx,i0;