[7u] diff fixes for export_debug_jdk in jdk/hotspot/make/Makefile
Hi
The export_debug_jdk target from jdk7u/hotspot/make/Makefile never exports the
Z:\JDK\hsx\jdk7u\hotspot\build\windows\export-windows-i586\debug directories
into
Z:\JDK\hsx\jdk7u\hotspot\build\windows\jdk-windows-i586
but it updates
Z:\JDK\\hsx\jdk7u\hotspot\build\windows\jdk-windows-i586\debug which is
useless...
Francis
Here the fixes:
diff --git a/make/Makefile b/make/Makefile
--- a/make/Makefile
+++ b/make/Makefile
@@ -242,12 +242,11 @@
generic_export
export_fastdebug_jdk::
$(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
- VM_SUBDIR=$(@:export_%_jdk=%) \
- ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
+ VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
generic_export
export_debug_jdk::
-$(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=${VM_DEBUG} \
- ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
+$(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
+ VM_SUBDIR=${VM_DEBUG} ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
generic_export
Re: [8] WXP fixes to avoid warning when compiling SA files
Staffan By the way, I am working on the jdk7u... Could you also take in charge the backport to the jdk7u? Francis Le 09/12/2013 13:25, Staffan Larsen a écrit : This change looks good to me. I have created https://bugs.openjdk.java.net/browse/JDK-8029798 for this change, and I can sponsor it. There are currently no open repos for low-priority hotspot changes so I will have to wait before pushing the change. /Staffan On 7 dec 2013, at 18:25, Francis ANDRE wrote: Hi Compiling SA files leads to warning because of old or invalid options as below set INCLUDE=C:\Program Files\Microsoft Visual Studio 10.0\VC\INCLUDE;C:\Program Files\Microsoft SDKs\Windows\v7.0A\include;C:\Program Files\Microsoft Visual Studio 10.0\VC\INCLUDE;C:\Program Files\Microsoft SDKs\Windows\v7.0A\include C:\progra~1\micros~2.0\vc\bin\cl.exe @C:\cygwin\tmp\nmE2.tmp clÿ: Ligne de commande warning D9035ÿ: l'option 'GZ' est d‚conseill‚e et sera supprim‚e dans une version ult‚rieure clÿ: Ligne de commande warning D9036ÿ: utilisez 'RTC1' … la place de 'GZ' clÿ: Ligne de commande warning D9035ÿ: l'option 'o' est d‚conseill‚e et sera supprim‚e dans une version ult‚rieure clÿ: Ligne de commande warning D9002ÿ: option '-YX' inconnue ignor‚e clÿ: Ligne de commande warning D9030ÿ: '/Gm' incompatible avec le multitraitementÿ; commutateur /MP ignor‚ sadis.c Here the diff diff --git a/make/windows/makefiles/sa.make b/make/windows/makefiles/sa.make --- a/make/windows/makefiles/sa.make +++ b/make/windows/makefiles/sa.make @@ -94,7 +94,7 @@ SA_LD_FLAGS = bufferoverflowU.lib !endif !else -SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -Od -D "WIN32" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -GZ -c +SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -Od -D "WIN32" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -FD -RT C1 -c !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" SA_CFLAGS = $(SA_CFLAGS) -ZI !endif
RR(S) 8030941: Darwin mapfile-vers doesn't work for other BSD
Hi Everybody, I'd debug out last blocker for clear build of hotspot on FreeBSD. Darwin's mapfile-vers couldn't be used for FreeBSD (and probably other BSDs) so changed makefiles to use generic one if we are not on Darwin. http://cr.openjdk.java.net/~dsamersoff/JDK-8030941/webrev.01/ PS: As mapfile-vers is essentially the same for all platforms except Darwin it might make sense to create a separate directory and put it to a single place. -- Dmitry Samersoff Oracle Java development team, Saint Petersburg, Russia * I would love to change the world, but they won't give me the sources.
Re: RFR: jdk9: 8029997: [infra] remove Solaris ISA directories and the links
On 20/12/2013 23:03, Kumar Srinivasan wrote: Hello, Please review the removal of ISA (Instruction Specific Architecture) directories namely sparcv9, amd64 and the symlinks in these directories, this was provided to aid transition to jdk8, where solaris 32-bit was removed, and the 32-bit binaries were replaced with 64-bit versions. http://cr.openjdk.java.net/~ksrini/8029997/webrev.0/ This looks good to me too (I assumed there would be several tests that needed adjustment, it seems not). -Alan.
