commit 53a90b79b4e0a0540f46f8662bdc1b1c1649ad3d
author ptbrunet <none@none> Tue Sep 08 11:53:13 2015 -0500
committer ptbrunet <none@none> Tue Sep 08 11:53:13 2015 -0500
tree af1ec6dd0d125aa8e18bf661634d4b3bf6886545
parent ff0a9de02cde0132d0d6c29855f12aeed2a7ae5d

8134453: JAWS crashes in WindowsAccessBridge.DLL on 32 bit 8u60 running on 32 bit Win 7
Summary: Uppercase "legacy" so #ifdef will work
Reviewed-by: erikj, tbell
Contributed-by: peter.brunet@oracle.com

make/CompileJavaClasses.gmk

diff --git a/make/CompileJavaClasses.gmk b/make/CompileJavaClasses.gmk
index a3fe9dd..505b821 100644
--- a/make/CompileJavaClasses.gmk
+++ b/make/CompileJavaClasses.gmk
@@ -393,7 +393,7 @@
           JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \
           SRC := $(JDK_OUTPUTDIR)/gensrc_ab/legacy, \
           BIN := $(JDK_OUTPUTDIR)/classes_ab/legacy, \
-          HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers_ab/legacy))
+          HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers_ab/LEGACY))
 
       $(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK)
 

make/lib/PlatformLibraries.gmk

diff --git a/make/lib/PlatformLibraries.gmk b/make/lib/PlatformLibraries.gmk
index 6ee5501..49f584b 100644
--- a/make/lib/PlatformLibraries.gmk
+++ b/make/lib/PlatformLibraries.gmk
@@ -219,7 +219,7 @@
 
     ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
       $(eval $(call SetupAccessBridge,-32,I386,32))
-      $(eval $(call SetupAccessBridge,,I386,legacy))
+      $(eval $(call SetupAccessBridge,,I386,LEGACY))
     else
       $(eval $(call SetupAccessBridge,-64,X64,64))
     endif