< prev index next >

make/lib/CoreLibraries.gmk

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this --- 1,7 ---- # ! # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this
*** 53,64 **** LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) ifneq ($(OPENJDK_TARGET_OS), macosx) ! $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \ ! STATIC_LIBRARY := fdlibm, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ SRC := $(LIBFDLIBM_SRC), \ OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ CFLAGS_windows_debug := -DLOGGING, \ --- 53,65 ---- LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) ifneq ($(OPENJDK_TARGET_OS), macosx) ! $(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM, \ ! NAME := fdlibm, \ ! TYPE := STATIC_LIBRARY, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ SRC := $(LIBFDLIBM_SRC), \ OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ CFLAGS_windows_debug := -DLOGGING, \
*** 75,86 **** else # On macosx the old build does partial (incremental) linking of fdlibm instead of # a plain static library. ! $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC, \ ! LIBRARY := fdlibm, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ SRC := $(LIBFDLIBM_SRC), \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ LDFLAGS := -nostdlib $(ARFLAGS), \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ --- 76,87 ---- else # On macosx the old build does partial (incremental) linking of fdlibm instead of # a plain static library. ! $(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM_MAC, \ ! NAME := fdlibm, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \ SRC := $(LIBFDLIBM_SRC), \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \ LDFLAGS := -nostdlib $(ARFLAGS), \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \
*** 105,116 **** ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true) LIBVERIFY_OPTIMIZATION := LOW endif endif ! $(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \ ! LIBRARY := verify, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(TOPDIR)/src/java.base/share/native/libverify, \ OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \ CFLAGS := $(CFLAGS_JDKLIB), \ DISABLED_WARNINGS_gcc := implicit-fallthrough, \ --- 106,117 ---- ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true) LIBVERIFY_OPTIMIZATION := LOW endif endif ! $(eval $(call SetupNativeCompilation, BUILD_LIBVERIFY, \ ! NAME := verify, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(TOPDIR)/src/java.base/share/native/libverify, \ OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \ CFLAGS := $(CFLAGS_JDKLIB), \ DISABLED_WARNINGS_gcc := implicit-fallthrough, \
*** 153,164 **** ifneq ($(OPENJDK_TARGET_CPU), x86_64) LIBJAVA_REORDER := $(TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU) endif endif ! $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \ ! LIBRARY := java, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(LIBJAVA_SRC_DIRS), \ OPTIMIZATION := HIGH, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(LIBJAVA_CFLAGS), \ --- 154,165 ---- ifneq ($(OPENJDK_TARGET_CPU), x86_64) LIBJAVA_REORDER := $(TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU) endif endif ! $(eval $(call SetupNativeCompilation, BUILD_LIBJAVA, \ ! NAME := java, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(LIBJAVA_SRC_DIRS), \ OPTIMIZATION := HIGH, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(LIBJAVA_CFLAGS), \
*** 216,227 **** ifeq ($(LIBZIP_CAN_USE_MMAP), true) BUILD_LIBZIP_MMAP := -DUSE_MMAP endif ! $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \ ! LIBRARY := zip, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ OPTIMIZATION := LOW, \ SRC := $(TOPDIR)/src/java.base/share/native/libzip, \ EXCLUDES := $(LIBZIP_EXCLUDES), \ CFLAGS := $(CFLAGS_JDKLIB) \ --- 217,228 ---- ifeq ($(LIBZIP_CAN_USE_MMAP), true) BUILD_LIBZIP_MMAP := -DUSE_MMAP endif ! $(eval $(call SetupNativeCompilation, BUILD_LIBZIP, \ ! NAME := zip, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ OPTIMIZATION := LOW, \ SRC := $(TOPDIR)/src/java.base/share/native/libzip, \ EXCLUDES := $(LIBZIP_EXCLUDES), \ CFLAGS := $(CFLAGS_JDKLIB) \
*** 260,271 **** -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ -I$(TOPDIR)/src/java.base/share/native/libjimage \ -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ # ! $(eval $(call SetupNativeCompilation,BUILD_LIBJIMAGE, \ ! LIBRARY := jimage, \ TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ OPTIMIZATION := LOW, \ SRC := $(TOPDIR)/src/java.base/share/native/libjimage \ $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \ --- 261,272 ---- -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \ -I$(TOPDIR)/src/java.base/share/native/libjimage \ -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ # ! $(eval $(call SetupNativeCompilation, BUILD_LIBJIMAGE, \ ! NAME := jimage, \ TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ OPTIMIZATION := LOW, \ SRC := $(TOPDIR)/src/java.base/share/native/libjimage \ $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \
*** 356,367 **** zcrc32.c \ zutil.c \ ) endif ! $(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \ ! LIBRARY := jli, \ OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \ SRC := $(LIBJLI_SRC_DIRS), \ EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ OPTIMIZATION := HIGH, \ --- 357,368 ---- zcrc32.c \ zutil.c \ ) endif ! $(eval $(call SetupNativeCompilation, BUILD_LIBJLI, \ ! NAME := jli, \ OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \ SRC := $(LIBJLI_SRC_DIRS), \ EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ OPTIMIZATION := HIGH, \
*** 413,424 **** # On windows, the static library has the same suffix as the import library created by # with the shared library, so the static library is given a different name. No harm # in doing it for all platform to reduce complexity. ifeq ($(OPENJDK_TARGET_OS), windows) ! $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ ! STATIC_LIBRARY := jli_static, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ SRC := $(LIBJLI_SRC_DIRS), \ EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ OPTIMIZATION := HIGH, \ --- 414,426 ---- # On windows, the static library has the same suffix as the import library created by # with the shared library, so the static library is given a different name. No harm # in doing it for all platform to reduce complexity. ifeq ($(OPENJDK_TARGET_OS), windows) ! $(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \ ! NAME := jli_static, \ ! TYPE := STATIC_LIBRARY, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ SRC := $(LIBJLI_SRC_DIRS), \ EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ OPTIMIZATION := HIGH, \
*** 432,443 **** else ifeq ($(OPENJDK_TARGET_OS), macosx) # # On macosx they do partial (incremental) linking of libjli_static.a # code it here...rather than add support to NativeCompilation # as this is first time I see it ! $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ ! LIBRARY := jli_static, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ SRC := $(LIBJLI_SRC_DIRS), \ EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ OPTIMIZATION := HIGH, \ --- 434,445 ---- else ifeq ($(OPENJDK_TARGET_OS), macosx) # # On macosx they do partial (incremental) linking of libjli_static.a # code it here...rather than add support to NativeCompilation # as this is first time I see it ! $(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \ ! NAME := jli_static, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ SRC := $(LIBJLI_SRC_DIRS), \ EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ OPTIMIZATION := HIGH, \
*** 455,466 **** TARGETS += $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a endif else ifeq ($(OPENJDK_TARGET_OS), aix) # AIX also requires a static libjli because the compiler doesn't support '-rpath' ! $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \ ! STATIC_LIBRARY := jli_static, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ SRC := $(LIBJLI_SRC_DIRS), \ EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ OPTIMIZATION := HIGH, \ --- 457,469 ---- TARGETS += $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a endif else ifeq ($(OPENJDK_TARGET_OS), aix) # 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, \ OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \ SRC := $(LIBJLI_SRC_DIRS), \ EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \ EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \ OPTIMIZATION := HIGH, \
< prev index next >