84 Commits

Author SHA1 Message Date
Ioi Lam
63e8e67451 8020622: create.bat on Windows failed to create project file for Visual Studio 2012
Treat VS2012 the same as VS2010.

Reviewed-by: dcubed, kamg, minqi
2013-08-26 21:59:50 -07:00
Ioi Lam
f61c7dc88b 8023406: make/windows/build_vm_def.sh takes too long even when BUILD_WIN_SA != 1
Avoid dumping C++ vtable when BUILD_WIN_SA != 1

Reviewed-by: dcubed, sla, tbell
2013-08-22 10:20:50 -07:00
Rickard Bäckman
8db7a08b50 Merge 2013-08-15 15:26:16 +02:00
Daniel D. Daugherty
ae5b50414a 8016601: Unable to build hsx24 on Windows using project creator and Visual Studio
ProjectCreator tool is modified to support two new options: '-relativeAltSrcInclude' and '-altRelativeInclude' which prevents IDE linker errors. Also fixed some cmd line build linker warnings. Misc cleanups.

Reviewed-by: rdurbin, coleenp
2013-08-08 09:21:30 -07:00
Niclas Adlertz
fc44cdf0ec 8022475: Remove unneeded ad-files
Remove .ad files that are not used

Reviewed-by: kvn
2013-08-07 18:04:42 +02:00
Tim Bell
a47de580e7 8015759: hotspot changes needed to compile with Visual Studio 2012
Reviewed-by: anthony, dholmes, dcubed
2013-07-15 23:23:15 -04:00
Staffan Larsen
718f3252f6 8005849: JEP 167: Event-Based JVM Tracing
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Bengt Rutisson <bengt.rutisson@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Co-authored-by: Erik Gahlin <erik.gahlin@oracle.com>
Co-authored-by: Erik Helin <erik.helin@oracle.com>
Co-authored-by: Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>
Co-authored-by: Keith McGuigan <keith.mcguigan@oracle.com>
Co-authored-by: Mattias Tobiasson <mattias.tobiasson@oracle.com>
Co-authored-by: Markus Gronlund <markus.gronlund@oracle.com>
Co-authored-by: Mikael Auno <mikael.auno@oracle.com>
Co-authored-by: Nils Eliasson <nils.eliasson@oracle.com>
Co-authored-by: Nils Loodin <nils.loodin@oracle.com>
Co-authored-by: Rickard Backman <rickard.backman@oracle.com>
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Reviewed-by: acorn, coleenp, sla
2013-06-10 11:30:51 +02:00
Christian Thalinger
2c7c39072c Merge 2013-05-13 12:43:10 -07:00
Christian Thalinger
7c367a6025 8008772: remove gamma launcher
Reviewed-by: kvn, neliasso, ctornqvi
2013-05-06 19:49:23 -07:00
Staffan Larsen
1f2075c0e4 8013785: Respect EXTRA_CFLAGS on windows
Reviewed-by: mgronlun, rbackman, kvn
2013-05-03 12:26:15 +02:00
David Chase
55c4ce1ca1 7104565: trim jprt build targets
Remove JPRT debug builds, remove -DDEBUG -DFASTDEBUG and use ASSERT instead in sources

Reviewed-by: dholmes, kvn, coleenp
2013-04-12 15:53:30 -07:00
Zhengyu Gu
7c46953faf 8010651: create.bat still builds the kernel
Remove old kernel build targets and VS C++ projects created by create.bat on Windows

Reviewed-by: coleenp, sla
2013-03-26 14:11:21 -04:00
Mikael Gerdin
1d468be4b1 8006753: fix failed for JDK-8002415 White box testing API for HotSpot
Modify WhiteBoxAPI to use interface classes from test/testlibrary instead, add ClassFileInstaller to resolve the boot class path issue

Reviewed-by: ctornqvi, dsamersoff, coleenp, kvn
2013-02-19 18:45:49 +01:00
Zhengyu Gu
fc0efc91c8 8000692: Remove old KERNEL code
Removed depreciated kernel VM source code from hotspot VM

Reviewed-by: dholmes, acorn
2013-01-25 10:04:08 -05:00
David Holmes
40d5fa156c 8002034: Allow Full Debug Symbols when cross-compiling
8001756: Hotspot makefiles report missing OBJCOPY command in the wrong circumstances

Reviewed-by: dcubed, dsamersoff, erikj, collins
2012-11-05 19:33:44 -05:00
Gary Collins
ad3844358d Merge 2012-10-12 10:49:39 -07:00
Joseph Provino
c5eaaaa070 7189254: Change makefiles for more flexibility to override defaults
Change makefiles so that targets and parameters can be overridden by alternate makefiles.

Reviewed-by: dholmes, coleenp
2012-10-10 14:35:58 -04:00
Mikael Vidstedt
769dd50182 7197424: update copyright year to match last edit in jdk8 hotspot repository
Update copyright year to 2012 for relevant files

Reviewed-by: dholmes, coleenp
2012-10-09 10:09:34 -07:00
Vladimir Kozlov
fbd1f6e3be Merge 2012-09-28 10:16:29 -07:00
Yumin Qi
22544e7a7c 6879063: SA should use hsdis for disassembly
We should in SA to use hsdis for it like the JVM does to replace the current java based disassembler.

Reviewed-by: twisti, jrose, sla
2012-09-24 12:44:00 -07:00
Volker Simonis
6c6a957121 7181175: Enable builds on Windows with MinGW/MSYS
This fix is the minimum number of Makefile changes to enable building HotSpot with MinGW/MSYS

Reviewed-by: jcoomes, dcubed, tbell, ohair
2012-08-03 18:34:28 -07:00
Zhengyu Gu
a39b17624a 6995781: Native Memory Tracking (Phase 1)
7151532: DCmd for hotspot native memory tracking

Implementation of native memory tracking phase 1, which tracks VM native memory usage, and related DCmd

Reviewed-by: acorn, coleenp, fparain
2012-06-28 17:03:16 -04:00
Daniel D. Daugherty
2003ef208a Merge 2012-05-24 12:57:01 -07:00
Daniel D. Daugherty
5ea3d5b1ea 7170010: conditional "ZIP_DEBUGINFO_FILES ?= 0" setting is not reliable on Windows
Always disable ZIP_DEBUGINFO_FILES on Windows.

Reviewed-by: acorn
2012-05-18 09:15:15 -07:00
Daniel D. Daugherty
04d132c069 7169409: enabling ZIP_DEBUGINFO_FILES causes unexpected test failures on Windows X86
Disable ZIP_DEBUGINFO_FILES by default on Windows.

Reviewed-by: acorn
2012-05-16 12:47:27 -07:00
Daniel D. Daugherty
a160adcf6c 7169102: 7165060 merge lost changes to make/windows/makefiles/defs.make
Reviewed-by: sspitsyn, acorn
2012-05-15 15:16:14 -07:00
Daniel D. Daugherty
5b91fbd2b5 7164344: enabling ZIP_DEBUGINFO_FILES causes unexpected test failures on Solaris and Windows
Disable FDS by default on Solaris; disable ZIP_DEBUGINFO_FILES by default on Windows.

Reviewed-by: acorn, sspitsyn
2012-04-25 15:06:51 -07:00
Daniel D. Daugherty
4ab089ddba Merge 2012-04-24 15:20:40 -07:00
Daniel D. Daugherty
6f5472dfe9 7158067: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect product builds
Build option FULL_DEBUG_SYMBOLS=0 only affects product builds.

Reviewed-by: ohair, jmelvin, sspitsyn
2012-04-03 09:48:34 -07:00
Nils Eliasson
ac3b6a6442 7163863: Updated projectcreator
Enable source browsing for all platform dependent code

Reviewed-by: brutisso, coleenp
2012-03-29 16:43:21 +02:00
Daniel D. Daugherty
86dac44dac 7102323: RFE: enable Full Debug Symbols Phase 1 on Solaris
Add support for ENABLE_FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES build flags. Add support for .diz files.

Reviewed-by: dholmes, ohair, sspitsyn
2012-03-23 11:50:33 -07:00
Nils Loodin
2c07f4154e 7148488: Whitebox tests for the Diagnostic Framework Parser
Reviewed-by: brutisso, sla, mgerdin
2012-03-15 13:37:13 +01:00
Erik Joelsson
cfc6c74d02 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
Reviewed-by: dholmes, ohair
2012-03-19 10:09:24 +01:00
Bengt Rutisson
a77a5ac2a0 Merge 2012-03-05 22:34:18 +01:00
Mikael Gerdin
27c0786c3b 7148152: Add whitebox testing API to HotSpot
Add an internal testing API to HotSpot to enable more targeted testing of vm functionality

Reviewed-by: phh, dholmes
2012-02-23 14:58:35 +01:00
Erik Joelsson
97612e5913 7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
Reviewed-by: dholmes, ohrstrom, ohair, jcoomes
2012-02-22 09:24:35 +01:00
Erik Joelsson
a1b4a3f698 7141242: build-infra merge: Rename CPP->CXX and LINK->LD
Cleaned up make variables for compilers and linker to consistently use CXX for C++ compiler, CC for C compiler and LD for linker.

Reviewed-by: dholmes, ohrstrom
2012-02-06 09:14:22 +01:00
Paul Hohensee
8efd785f67 Merge 2012-01-11 17:58:26 -05:00
Markus Gronlund
007126d010 7115199: Add event tracing hooks and Java Flight Recorder infrastructure
Added a nop tracing infrastructure, JFR makefile changes and other infrastructure used only by JFR.

Reviewed-by: acorn, sspitsyn
2012-01-11 17:34:02 -05:00
Vladimir Kozlov
dc542c9909 7121648: Use 3-operands SIMD instructions on x86 with AVX
Use 3-operands SIMD instructions in C2 generated code for machines with AVX.

Reviewed-by: never
2011-12-20 00:55:02 -08:00
Rickard Backman
069f218a98 7112308: Fix Visual Studio build for precompiled header
Add the new path to precompiled.hpp in the project make file

Reviewed-by: coleenp, dholmes, brutisso
2011-11-21 08:02:40 +01:00
Rickard Backman
2c5cec930a 7106766: Move the precompiled header from the src/share/vm directory
Moved precompiled.hpp to src/share/vm/precompiled

Reviewed-by: coleenp, dholmes
2011-11-01 13:44:40 +01:00
Volker Simonis
812f619214 7096016: SA build still produces "arg list too long" errors
Reviewed-by: kvn, never
2011-09-29 13:47:57 -07:00
Kurt Miller
95c56a472b 7089790: integrate bsd-port changes
Co-authored-by: Greg Lewis <glewis@eyesbeyond.com>
Co-authored-by: Jung-uk Kim <jkim@freebsd.org>
Co-authored-by: Christos Zoulas <christos@zoulas.com>
Co-authored-by: Landon Fuller <landonf@plausible.coop>
Co-authored-by: The FreeBSD Foundation <board@freebsdfoundation.org>
Co-authored-by: Michael Franz <mvfranz@gmail.com>
Co-authored-by: Roger Hoover <rhoover@apple.com>
Co-authored-by: Alexander Strange <astrange@apple.com>
Reviewed-by: kvn, twisti, jrose
2011-09-25 16:03:29 -07:00
Vladimir Kozlov
2cfb876ce7 Merge 2011-08-19 08:55:53 -07:00
Vladimir Kozlov
5ad0c2a370 7075559: JPRT windows_x64 build failure
Use SA_CLASSDIR variable instead of dirsctory saclasses.

Reviewed-by: kamg, dcubed
2011-08-06 08:28:08 -07:00
Zhengyu Gu
462140d52d 7016797: Hotspot: securely/restrictive load dlls and new API for loading system dlls
Created Windows Dll wrapped to handle jdk6 and jdk7 platform requirements, also provided more restictive Dll search orders for Windows system Dlls.

Reviewed-by: acorn, dcubed, ohair, alanb
2011-04-15 09:34:43 -04:00
Coleen Phillimore
3c4d3002f2 Merge 2011-04-12 14:18:53 -07:00
Erik Trimble
c9e484d473 7010070: Update all 2010 Oracle-changed OpenJDK files to have the proper copyright dates - second pass
Update the copyright to be 2010 on all changed files in OpenJDK

Reviewed-by: ohair
2011-04-05 14:12:31 -07:00
Andrew John Hughes
cf3120dddc 7010849: 5/5 Extraneous javac source/target options when building sa-jdi
Make code changes necessary to get rid of the '-source 1.4 -target 1.4' options.

Reviewed-by: dholmes, dcubed
2011-04-01 15:15:37 -07:00