mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-23 12:54:17 +02:00
8328824: Clean up java.base native compilation
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie
parent
af15c68f3c
commit
26b2ec4847
7 changed files with 201 additions and 136 deletions
|
|
@ -23,25 +23,27 @@
|
|||
# questions.
|
||||
#
|
||||
|
||||
##########################################################################################
|
||||
################################################################################
|
||||
## Build libverify
|
||||
################################################################################
|
||||
|
||||
LIBVERIFY_OPTIMIZATION := HIGH
|
||||
ifeq ($(call isTargetOs, linux), true)
|
||||
ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
|
||||
LIBVERIFY_OPTIMIZATION := LOW
|
||||
endif
|
||||
ifeq ($(call isTargetOs, linux)+$(COMPILE_WITH_DEBUG_SYMBOLS), true+true)
|
||||
LIBVERIFY_OPTIMIZATION := LOW
|
||||
endif
|
||||
|
||||
$(eval $(call SetupJdkLibrary, BUILD_LIBVERIFY, \
|
||||
NAME := verify, \
|
||||
OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
|
||||
LIBS_unix := -ljvm, \
|
||||
LIBS_windows := jvm.lib, \
|
||||
JDK_LIBS_unix := -ljvm, \
|
||||
JDK_LIBS_windows := jvm.lib, \
|
||||
))
|
||||
|
||||
TARGETS += $(BUILD_LIBVERIFY)
|
||||
|
||||
##########################################################################################
|
||||
################################################################################
|
||||
## Build libjava
|
||||
################################################################################
|
||||
|
||||
ifeq ($(call isTargetOs, macosx), true)
|
||||
BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
|
||||
|
|
@ -53,26 +55,28 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
|
|||
OPTIMIZATION := HIGH, \
|
||||
jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
|
||||
ProcessImpl_md.c_CFLAGS := $(VERSION_CFLAGS), \
|
||||
java_props_md.c_CFLAGS := -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"', \
|
||||
java_props_md.c_CFLAGS := \
|
||||
-DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"', \
|
||||
DISABLED_WARNINGS_gcc_ProcessImpl_md.c := unused-result, \
|
||||
LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \
|
||||
LIBS_unix := -ljvm, \
|
||||
JDK_LIBS_unix := -ljvm, \
|
||||
JDK_LIBS_windows := jvm.lib, \
|
||||
LIBS_linux := $(LIBDL), \
|
||||
LIBS_aix := $(LIBDL) $(LIBM),\
|
||||
LIBS_macosx := -framework CoreFoundation \
|
||||
LIBS_macosx := \
|
||||
-framework CoreFoundation \
|
||||
-framework Foundation \
|
||||
-framework SystemConfiguration, \
|
||||
LIBS_windows := jvm.lib \
|
||||
shell32.lib ole32.lib \
|
||||
advapi32.lib version.lib, \
|
||||
LIBS_windows := advapi32.lib ole32.lib shell32.lib version.lib, \
|
||||
))
|
||||
|
||||
TARGETS += $(BUILD_LIBJAVA)
|
||||
|
||||
$(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
|
||||
|
||||
|
||||
##########################################################################################
|
||||
################################################################################
|
||||
## Build libzip
|
||||
################################################################################
|
||||
|
||||
BUILD_LIBZIP_EXCLUDES :=
|
||||
ifeq ($(USE_EXTERNAL_LIBZ), true)
|
||||
|
|
@ -92,15 +96,18 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBZIP, \
|
|||
DISABLED_WARNINGS_gcc_zip_util.c := unused-function, \
|
||||
DISABLED_WARNINGS_clang := deprecated-non-prototype, \
|
||||
DISABLED_WARNINGS_clang_gzwrite.c := format-nonliteral, \
|
||||
LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \
|
||||
LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \
|
||||
JDK_LIBS_unix := -ljava -ljvm, \
|
||||
JDK_LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
|
||||
LIBS_unix := $(LIBZ_LIBS), \
|
||||
))
|
||||
|
||||
$(BUILD_LIBZIP): $(BUILD_LIBJAVA)
|
||||
|
||||
TARGETS += $(BUILD_LIBZIP)
|
||||
|
||||
##########################################################################################
|
||||
################################################################################
|
||||
## Build libjimage
|
||||
################################################################################
|
||||
|
||||
$(eval $(call SetupJdkLibrary, BUILD_LIBJIMAGE, \
|
||||
NAME := jimage, \
|
||||
|
|
@ -108,15 +115,18 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJIMAGE, \
|
|||
OPTIMIZATION := LOW, \
|
||||
CFLAGS_unix := -UDEBUG, \
|
||||
LDFLAGS := $(LDFLAGS_CXX_JDK), \
|
||||
LIBS_unix := -ljvm -ldl, \
|
||||
LIBS_windows := jvm.lib, \
|
||||
JDK_LIBS_unix := -ljvm, \
|
||||
JDK_LIBS_windows := jvm.lib, \
|
||||
LIBS_unix := $(LIBDL), \
|
||||
))
|
||||
|
||||
$(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA)
|
||||
|
||||
TARGETS += $(BUILD_LIBJIMAGE)
|
||||
|
||||
##########################################################################################
|
||||
################################################################################
|
||||
## Build libjli
|
||||
################################################################################
|
||||
|
||||
ifeq ($(call isTargetOs, macosx), true)
|
||||
LIBJLI_EXCLUDE_FILES += java_md.c
|
||||
|
|
@ -135,11 +145,10 @@ ifeq ($(call isTargetOs, windows), true)
|
|||
endif
|
||||
endif
|
||||
|
||||
LIBJLI_CFLAGS += $(LIBZ_CFLAGS)
|
||||
|
||||
ifneq ($(USE_EXTERNAL_LIBZ), true)
|
||||
# Extra files from the zlib.
|
||||
LIBJLI_EXTRA_FILE_LIST := inflate.c inftrees.c inffast.c zadler32.c zcrc32.c zutil.c
|
||||
LIBJLI_EXTRA_FILE_LIST := inflate.c inftrees.c inffast.c zadler32.c \
|
||||
zcrc32.c zutil.c
|
||||
|
||||
LIBJLI_EXTRA_FILES += \
|
||||
$(addprefix $(TOPDIR)/src/java.base/share/native/libzip/zlib/, \
|
||||
|
|
@ -150,22 +159,25 @@ ifneq ($(USE_EXTERNAL_LIBZ), true)
|
|||
# static libraries, we use the --whole-archive linker option.
|
||||
# The duplicate objects in different static libraries cause linking
|
||||
# errors due to duplicate symbols.
|
||||
LIBJLI_STATIC_EXCLUDE_OBJS := $(subst .c,$(OBJ_SUFFIX),$(LIBJLI_EXTRA_FILE_LIST))
|
||||
LIBJLI_STATIC_EXCLUDE_OBJS := \
|
||||
$(subst .c,$(OBJ_SUFFIX),$(LIBJLI_EXTRA_FILE_LIST))
|
||||
endif
|
||||
|
||||
$(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
|
||||
NAME := jli, \
|
||||
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
|
||||
EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
|
||||
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
|
||||
OPTIMIZATION := HIGH, \
|
||||
CFLAGS := $(LIBJLI_CFLAGS), \
|
||||
CFLAGS := $(LIBJLI_CFLAGS) $(LIBZ_CFLAGS), \
|
||||
DISABLED_WARNINGS_gcc := unused-function, \
|
||||
DISABLED_WARNINGS_clang := format-nonliteral deprecated-non-prototype, \
|
||||
LIBS_unix := $(LIBZ_LIBS), \
|
||||
LIBS_linux := $(LIBDL) -lpthread, \
|
||||
LIBS_aix := $(LIBDL),\
|
||||
LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
|
||||
LIBS_macosx := \
|
||||
-framework ApplicationServices \
|
||||
-framework Cocoa \
|
||||
-framework Security, \
|
||||
LIBS_windows := advapi32.lib comctl32.lib user32.lib, \
|
||||
STATIC_LIB_EXCLUDE_OBJS := $(LIBJLI_STATIC_EXCLUDE_OBJS), \
|
||||
))
|
||||
|
|
@ -175,7 +187,8 @@ TARGETS += $(BUILD_LIBJLI)
|
|||
LIBJLI_SRC_DIRS := $(call FindSrcDirsForComponent, java.base, libjli)
|
||||
|
||||
ifeq ($(call isTargetOs, aix), true)
|
||||
# AIX also requires a static libjli because the compiler doesn't support '-rpath'
|
||||
# AIX also requires a static libjli because the compiler doesn't support
|
||||
# '-rpath'
|
||||
$(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \
|
||||
NAME := jli_static, \
|
||||
TYPE := STATIC_LIBRARY, \
|
||||
|
|
@ -185,11 +198,11 @@ ifeq ($(call isTargetOs, aix), true)
|
|||
EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
|
||||
OPTIMIZATION := HIGH, \
|
||||
CFLAGS := $(STATIC_LIBRARY_FLAGS) $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \
|
||||
$(addprefix -I, $(LIBJLI_SRC_DIRS)), \
|
||||
DISABLED_WARNINGS_clang_aix := format-nonliteral deprecated-non-prototype, \
|
||||
$(LIBZ_CFLAGS) (addprefix -I, $(LIBJLI_SRC_DIRS)), \
|
||||
DISABLED_WARNINGS_clang_aix := format-nonliteral \
|
||||
deprecated-non-prototype, \
|
||||
ARFLAGS := $(ARFLAGS), \
|
||||
OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static))
|
||||
|
||||
TARGETS += $(BUILD_LIBJLI_STATIC)
|
||||
|
||||
endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue