From the bug report:

As a follow-up to JDK-8210944, find the best way to handle the needs of libwindowsaccessbridge to access the MSVCRT functions. Options include reverting JDK-8210944, and copying the MSVCRT*.DLL when needed, and/or possible other solutions.

I chose to revert JDK-8210944. I originally did JDK-8210944 to be able to finish a larger patch that moved all "CFLAGS := $(CFLAGS_JDKLIB)" constructs into SetupJdkLibrary, and then the filter-out logic completely screwed that up. But this patch has been lingering and bit-rotting while I've spent my time elsewhere, and it will not make it into JDK 12. I'll have to reconsider how I do that patch (possibly forcing that patch to include not only moving CFLAGS_JDKLIB into SetupJdkLibrary, but splitting up CFLAGS_JDKLIB in parts as well.

However, without this revert, we'll see a regression in JDK 12 on the loading of accessability libraries on Windows.

Bug: https://bugs.openjdk.java.net/browse/JDK-8213187
Patch inline:
diff --git a/make/lib/Lib-jdk.accessibility.gmk b/make/lib/Lib-jdk.accessibility.gmk
--- a/make/lib/Lib-jdk.accessibility.gmk
+++ b/make/lib/Lib-jdk.accessibility.gmk
@@ -41,7 +41,7 @@
         EXTRA_SRC := common, \
         OPTIMIZATION := LOW, \
         DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
-        CFLAGS := $(CFLAGS_JDKLIB) \
+        CFLAGS :=  $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
             -DACCESSBRIDGE_ARCH_$2, \
         EXTRA_HEADER_DIRS := \
             include/bridge \

/Magnus

Reply via email to