archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 12:04:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

8043160: JDK 9 Build failure in accessbridge

Browse source 
Reviewed-by: prr, tbell
This commit is contained in:
Erik Joelsson 2014-06-03 10:52:53 +02:00
parent 33c9aaf7d8
commit 0adcad200f
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
jdk/make/CompileJavaClasses.gmk
View file

@ -373,7 +373,7 @@ ifndef OPENJDK
JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \
SRC := $(JDK_OUTPUTDIR)/gensrc_ab/32bit, \ SRC := $(JDK_OUTPUTDIR)/gensrc_ab/32bit, \
BIN := $(JDK_OUTPUTDIR)/classes_ab/32bit, \ BIN := $(JDK_OUTPUTDIR)/classes_ab/32bit, \
HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers)) HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers_ab/32))
$(BUILD_ACCESSBRIDGE_32): $(BUILD_JDK) $(BUILD_ACCESSBRIDGE_32): $(BUILD_JDK)
@ -382,7 +382,7 @@ ifndef OPENJDK
JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \
SRC := $(JDK_OUTPUTDIR)/gensrc_ab/legacy, \ SRC := $(JDK_OUTPUTDIR)/gensrc_ab/legacy, \
BIN := $(JDK_OUTPUTDIR)/classes_ab/legacy, \ BIN := $(JDK_OUTPUTDIR)/classes_ab/legacy, \
HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers)) HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers_ab/legacy))
$(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK) $(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK)
@ -393,7 +393,7 @@ ifndef OPENJDK
JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \
SRC := $(JDK_OUTPUTDIR)/gensrc_ab/64bit, \ SRC := $(JDK_OUTPUTDIR)/gensrc_ab/64bit, \
BIN := $(JDK_OUTPUTDIR)/classes_ab/64bit, \ BIN := $(JDK_OUTPUTDIR)/classes_ab/64bit, \
HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers)) HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers_ab/64))
$(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK) $(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK)

14
jdk/make/lib/PlatformLibraries.gmk
View file

@ -143,7 +143,8 @@ ifndef OPENJDK
define SetupAccessBridge define SetupAccessBridge
# Parameter 1 Suffix # Parameter 1 Suffix
# Parameter 2 Machine # Parameter 2 Machine
# Parameter 3 ACCESSBRIDGE_ARCH_ suffix # Parameter 3 ACCESSBRIDGE_ARCH_ suffix and name of directory where gensrc headers
# are found.
$(call SetupNativeCompilation,BUILD_JAWTACCESSBRIDGE$1, \ $(call SetupNativeCompilation,BUILD_JAWTACCESSBRIDGE$1, \
LIBRARY = JAWTAccessBridge$1, \ LIBRARY = JAWTAccessBridge$1, \
@ -153,7 +154,8 @@ ifndef OPENJDK
LANG := C++, \ LANG := C++, \
OPTIMIZATION := LOW, \ OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-DACCESSBRIDGE_ARCH_$3, \ -DACCESSBRIDGE_ARCH_$3 \
-I$(JDK_OUTPUTDIR)/gensrc_headers_ab/$3, \
LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \ LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \ winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
@ -179,7 +181,8 @@ ifndef OPENJDK
LANG := C++, \ LANG := C++, \
OPTIMIZATION := LOW, \ OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-DACCESSBRIDGE_ARCH_$3, \ -DACCESSBRIDGE_ARCH_$3 \
-I$(JDK_OUTPUTDIR)/gensrc_headers_ab/$3, \
LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \ LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
winspool.lib comdlg32.lib advapi32.lib shell32.lib \ winspool.lib comdlg32.lib advapi32.lib shell32.lib \
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
@ -204,7 +207,8 @@ ifndef OPENJDK
LANG := C++, \ LANG := C++, \
OPTIMIZATION := LOW, \ OPTIMIZATION := LOW, \
CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \ CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
-DACCESSBRIDGE_ARCH_$3, \ -DACCESSBRIDGE_ARCH_$3 \
-I$(JDK_OUTPUTDIR)/gensrc_headers_ab/$3, \
LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \ LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
winspool.lib comdlg32.lib advapi32.lib shell32.lib \ winspool.lib comdlg32.lib advapi32.lib shell32.lib \
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
@ -225,7 +229,7 @@ ifndef OPENJDK
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
$(eval $(call SetupAccessBridge,-32,I386,32)) $(eval $(call SetupAccessBridge,-32,I386,32))
$(eval $(call SetupAccessBridge,,I386,LEGACY)) $(eval $(call SetupAccessBridge,,I386,legacy))
else else
$(eval $(call SetupAccessBridge,-64,X64,64)) $(eval $(call SetupAccessBridge,-64,X64,64))
endif endif