From e4ce84a2c107a17353f6060e48af4d95c89500a1 Mon Sep 17 00:00:00 2001 From: ptbrunet Date: Tue, 8 Sep 2015 11:53:13 -0500 Subject: [PATCH] 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 | 2 +- make/lib/PlatformLibraries.gmk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make/CompileJavaClasses.gmk b/make/CompileJavaClasses.gmk index ad46dec69..a829dbef4 100644 --- a/make/CompileJavaClasses.gmk +++ b/make/CompileJavaClasses.gmk @@ -388,7 +388,7 @@ $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin: 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) diff --git a/make/lib/PlatformLibraries.gmk b/make/lib/PlatformLibraries.gmk index 6ee5501b7..49f584b44 100644 --- a/make/lib/PlatformLibraries.gmk +++ b/make/lib/PlatformLibraries.gmk @@ -219,7 +219,7 @@ endif 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 -- GitLab