make/lib/CoreLibraries.gmk
branchihse-cflags-rewrite-branch
changeset 56726 3a9b7a1f9197
parent 56312 a52bcf4118eb
parent 50471 f0aeede1b855
child 56900 d5d542d50e3c
equal deleted inserted replaced
56313:d287dfac1304 56726:3a9b7a1f9197
    93 
    93 
    94 endif
    94 endif
    95 
    95 
    96 ##########################################################################################
    96 ##########################################################################################
    97 
    97 
    98 ifeq ($(OPENJDK_TARGET_OS), solaris)
       
    99   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
       
   100     BUILD_LIBVERIFY_REORDER := $(TOPDIR)/make/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU)
       
   101   endif
       
   102 endif
       
   103 
       
   104 LIBVERIFY_OPTIMIZATION := HIGH
    98 LIBVERIFY_OPTIMIZATION := HIGH
   105 ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
    99 ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
   106   ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
   100   ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
   107     LIBVERIFY_OPTIMIZATION := LOW
   101     LIBVERIFY_OPTIMIZATION := LOW
   108   endif
   102   endif
   109 endif
   103 endif
   110 
   104 
   111 $(eval $(call SetupJdkLibrary, BUILD_LIBVERIFY, \
   105 $(eval $(call SetupJdkLibrary, BUILD_LIBVERIFY, \
   112     NAME := verify, \
   106     NAME := verify, \
   113     SRC := $(TOPDIR)/src/java.base/share/native/libverify, \
       
   114     OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
   107     OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
   115     CFLAGS := $(CFLAGS_JDKLIB), \
   108     CFLAGS := $(CFLAGS_JDKLIB), \
   116     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
   109     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
   117     DISABLED_WARNINGS_microsoft := 4244 4267, \
   110     DISABLED_WARNINGS_microsoft := 4244 4267, \
   118     MAPFILE := $(TOPDIR)/make/mapfiles/libverify/mapfile-vers, \
       
   119     LDFLAGS := $(LDFLAGS_JDKLIB) \
   111     LDFLAGS := $(LDFLAGS_JDKLIB) \
   120         $(call SET_SHARED_LIBRARY_ORIGIN), \
   112         $(call SET_SHARED_LIBRARY_ORIGIN), \
   121     LIBS_unix := -ljvm, \
   113     LIBS_unix := -ljvm, \
   122     LIBS_windows := jvm.lib, \
   114     LIBS_windows := jvm.lib, \
   123     REORDER := $(BUILD_LIBVERIFY_REORDER), \
       
   124 ))
   115 ))
   125 
   116 
   126 TARGETS += $(BUILD_LIBVERIFY)
   117 TARGETS += $(BUILD_LIBVERIFY)
   127 
   118 
   128 ##########################################################################################
   119 ##########################################################################################
   129 
   120 
   130 # Allow a custom makefile to add extra src dirs
   121 LIBJAVA_CFLAGS := -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
   131 LIBJAVA_SRC_DIRS += $(call FindSrcDirsForLib, java.base, java)
       
   132 
       
   133 LIBJAVA_CFLAGS := $(addprefix -I, $(LIBJAVA_SRC_DIRS)) \
       
   134     -I$(TOPDIR)/src/java.base/share/native/libfdlibm \
       
   135     -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
       
   136     -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
       
   137 
       
   138 # Make it possible to override this variable
       
   139 LIBJAVA_MAPFILE ?= $(TOPDIR)/make/mapfiles/libjava/mapfile-vers
       
   140 
   122 
   141 ifeq ($(OPENJDK_TARGET_OS), macosx)
   123 ifeq ($(OPENJDK_TARGET_OS), macosx)
   142   BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
   124   BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
   143   BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
   125   BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
   144 endif
   126 endif
   145 
   127 
   146 ifeq ($(OPENJDK_TARGET_OS), solaris)
       
   147   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
       
   148     LIBJAVA_REORDER := $(TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
       
   149   endif
       
   150 endif
       
   151 
       
   152 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
   128 $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
   153     NAME := java, \
   129     NAME := java, \
   154     SRC := $(LIBJAVA_SRC_DIRS), \
       
   155     OPTIMIZATION := HIGH, \
   130     OPTIMIZATION := HIGH, \
   156     CFLAGS := $(CFLAGS_JDKLIB) \
   131     CFLAGS := $(CFLAGS_JDKLIB) \
   157         $(LIBJAVA_CFLAGS), \
   132         $(LIBJAVA_CFLAGS), \
   158     System.c_CFLAGS := $(VERSION_CFLAGS), \
   133     System.c_CFLAGS := $(VERSION_CFLAGS), \
   159     jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
   134     jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
       
   135     EXTRA_HEADER_DIRS := libfdlibm, \
   160     WARNINGS_AS_ERRORS_xlc := false, \
   136     WARNINGS_AS_ERRORS_xlc := false, \
   161     DISABLED_WARNINGS_gcc := unused-result, \
   137     DISABLED_WARNINGS_gcc := unused-result, \
   162     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
   138     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
   163     MAPFILE := $(LIBJAVA_MAPFILE), \
       
   164     LDFLAGS := $(LDFLAGS_JDKLIB) \
   139     LDFLAGS := $(LDFLAGS_JDKLIB) \
   165         $(call SET_SHARED_LIBRARY_ORIGIN), \
   140         $(call SET_SHARED_LIBRARY_ORIGIN), \
   166     LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \
   141     LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \
   167     LDFLAGS_windows := -export:winFileHandleOpen -export:handleLseek \
   142     LDFLAGS_windows := -delayload:shell32.dll, \
   168         -export:getLastErrorString \
       
   169         -export:getErrorString -delayload:shell32.dll, \
       
   170     LIBS_unix := -ljvm -lverify, \
   143     LIBS_unix := -ljvm -lverify, \
   171     LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
   144     LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
   172     LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM), \
   145     LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM), \
   173     LIBS_aix := $(LIBDL) $(BUILD_LIBFDLIBM) $(LIBM),\
   146     LIBS_aix := $(LIBDL) $(BUILD_LIBFDLIBM) $(LIBM),\
   174     LIBS_macosx := -lfdlibm \
   147     LIBS_macosx := -lfdlibm \
   176         -framework Foundation \
   149         -framework Foundation \
   177         -framework Security -framework SystemConfiguration, \
   150         -framework Security -framework SystemConfiguration, \
   178     LIBS_windows := jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
   151     LIBS_windows := jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
   179         shell32.lib delayimp.lib \
   152         shell32.lib delayimp.lib \
   180         advapi32.lib version.lib, \
   153         advapi32.lib version.lib, \
   181     REORDER := $(LIBJAVA_REORDER), \
       
   182 ))
   154 ))
   183 
   155 
   184 TARGETS += $(BUILD_LIBJAVA)
   156 TARGETS += $(BUILD_LIBJAVA)
   185 
   157 
   186 $(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
   158 $(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
   192 BUILD_LIBZIP_EXCLUDES :=
   164 BUILD_LIBZIP_EXCLUDES :=
   193 ifeq ($(USE_EXTERNAL_LIBZ), true)
   165 ifeq ($(USE_EXTERNAL_LIBZ), true)
   194   LIBZIP_EXCLUDES += zlib
   166   LIBZIP_EXCLUDES += zlib
   195 endif
   167 endif
   196 
   168 
   197 BUILD_LIBZIP_REORDER :=
       
   198 ifeq ($(OPENJDK_TARGET_OS), solaris)
       
   199   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
       
   200     BUILD_LIBZIP_REORDER := $(TOPDIR)/make/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
       
   201   endif
       
   202 endif
       
   203 
       
   204 ifeq ($(LIBZIP_CAN_USE_MMAP), true)
   169 ifeq ($(LIBZIP_CAN_USE_MMAP), true)
   205   BUILD_LIBZIP_MMAP := -DUSE_MMAP
   170   BUILD_LIBZIP_MMAP := -DUSE_MMAP
   206 endif
   171 endif
   207 
   172 
   208 $(eval $(call SetupJdkLibrary, BUILD_LIBZIP, \
   173 $(eval $(call SetupJdkLibrary, BUILD_LIBZIP, \
   209     NAME := zip, \
   174     NAME := zip, \
   210     OPTIMIZATION := LOW, \
   175     OPTIMIZATION := LOW, \
   211     SRC := $(TOPDIR)/src/java.base/share/native/libzip, \
       
   212     EXCLUDES := $(LIBZIP_EXCLUDES), \
   176     EXCLUDES := $(LIBZIP_EXCLUDES), \
   213     CFLAGS := $(CFLAGS_JDKLIB) \
   177     CFLAGS := $(CFLAGS_JDKLIB) \
   214         $(LIBZ_CFLAGS) \
   178         $(LIBZ_CFLAGS), \
   215         -I$(TOPDIR)/src/java.base/share/native/libjava \
       
   216         -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
       
   217         -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
       
   218     CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
   179     CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
   219     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
       
   220     MAPFILE := $(TOPDIR)/make/mapfiles/libzip/mapfile-vers, \
       
   221     REORDER := $(BUILD_LIBZIP_REORDER), \
       
   222     LDFLAGS := $(LDFLAGS_JDKLIB) \
   180     LDFLAGS := $(LDFLAGS_JDKLIB) \
   223         $(call SET_SHARED_LIBRARY_ORIGIN), \
   181         $(call SET_SHARED_LIBRARY_ORIGIN), \
   224     LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
       
   225         -export:ZIP_ReadEntry -export:ZIP_GetNextEntry \
       
   226         -export:ZIP_InflateFully -export:ZIP_CRC32 -export:ZIP_FreeEntry, \
       
   227     LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \
   182     LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \
   228     LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \
   183     LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \
   229 ))
   184 ))
   230 
   185 
   231 $(BUILD_LIBZIP): $(BUILD_LIBJAVA)
   186 $(BUILD_LIBZIP): $(BUILD_LIBJAVA)
   232 
   187 
   233 TARGETS += $(BUILD_LIBZIP)
   188 TARGETS += $(BUILD_LIBZIP)
   234 
   189 
   235 ##########################################################################################
   190 ##########################################################################################
   236 
       
   237 JIMAGELIB_CPPFLAGS := \
       
   238     -I$(TOPDIR)/src/java.base/share/native/libjava \
       
   239     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
       
   240     -I$(TOPDIR)/src/java.base/share/native/libjimage \
       
   241     -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
       
   242     #
       
   243 
   191 
   244 $(eval $(call SetupJdkLibrary, BUILD_LIBJIMAGE, \
   192 $(eval $(call SetupJdkLibrary, BUILD_LIBJIMAGE, \
   245     NAME := jimage, \
   193     NAME := jimage, \
   246     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
   194     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
   247     OPTIMIZATION := LOW, \
   195     OPTIMIZATION := LOW, \
   248     SRC := $(TOPDIR)/src/java.base/share/native/libjimage \
   196     CFLAGS := $(CFLAGS_JDKLIB), \
   249         $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \
   197     CXXFLAGS := $(CXXFLAGS_JDKLIB), \
   250     EXCLUDES := $(LIBJIMAGE_EXCLUDES), \
       
   251     CFLAGS := $(CFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \
       
   252     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \
       
   253     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
   198     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
   254     CFLAGS_unix := -UDEBUG, \
   199     CFLAGS_unix := -UDEBUG, \
   255     MAPFILE := $(TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \
       
   256     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
   200     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
   257         $(call SET_SHARED_LIBRARY_ORIGIN), \
   201         $(call SET_SHARED_LIBRARY_ORIGIN), \
   258     LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \
       
   259         -export:JIMAGE_PackageToModule \
       
   260         -export:JIMAGE_FindResource -export:JIMAGE_GetResource \
       
   261         -export:JIMAGE_ResourceIterator -export:JIMAGE_ResourcePath, \
       
   262     LIBS_unix := -ljvm -ldl $(LIBCXX), \
   202     LIBS_unix := -ljvm -ldl $(LIBCXX), \
   263     LIBS_macosx := -lc++, \
   203     LIBS_macosx := -lc++, \
   264     LIBS_windows := jvm.lib, \
   204     LIBS_windows := jvm.lib, \
   265 ))
   205 ))
   266 
   206 
   267 $(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA)
   207 $(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA)
   268 
   208 
   269 TARGETS += $(BUILD_LIBJIMAGE)
   209 TARGETS += $(BUILD_LIBJIMAGE)
   270 
   210 
   271 ##########################################################################################
   211 ##########################################################################################
   272 
       
   273 LIBJLI_SRC_DIRS := $(call FindSrcDirsForLib, java.base, jli)
       
   274 
       
   275 LIBJLI_CFLAGS := $(CFLAGS_JDKLIB)
       
   276 
   212 
   277 ifeq ($(call check-jvm-variant, zero), true)
   213 ifeq ($(call check-jvm-variant, zero), true)
   278   ERGO_FAMILY := zero
   214   ERGO_FAMILY := zero
   279 else
   215 else
   280   ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
   216   ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
   300   LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
   236   LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
   301 endif
   237 endif
   302 
   238 
   303 ifeq ($(OPENJDK_TARGET_OS), windows)
   239 ifeq ($(OPENJDK_TARGET_OS), windows)
   304   # Staticically link with c runtime on windows.
   240   # Staticically link with c runtime on windows.
   305   LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS))
   241   LIBJLI_CFLAGS_JDKLIB := $(filter-out -MD, $(CFLAGS_JDKLIB))
   306   LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)
   242   LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)
   307   # Supply the name of the C runtime lib.
   243   # Supply the name of the C runtime lib.
   308   LIBJLI_CFLAGS += -DMSVCR_DLL_NAME='"$(notdir $(MSVCR_DLL))"'
   244   LIBJLI_CFLAGS += -DMSVCR_DLL_NAME='"$(notdir $(MSVCR_DLL))"'
   309   ifneq ($(MSVCP_DLL), )
   245   ifneq ($(MSVCP_DLL), )
   310     LIBJLI_CFLAGS += -DMSVCP_DLL_NAME='"$(notdir $(MSVCP_DLL))"'
   246     LIBJLI_CFLAGS += -DMSVCP_DLL_NAME='"$(notdir $(MSVCP_DLL))"'
   311   endif
   247   endif
   312 else
   248 else
       
   249   LIBJLI_CFLAGS_JDKLIB := $(CFLAGS_JDKLIB)
   313   LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli
   250   LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli
   314 endif
   251 endif
   315 
       
   316 LIBJLI_CFLAGS += $(addprefix -I, $(LIBJLI_SRC_DIRS))
       
   317 
   252 
   318 LIBJLI_CFLAGS += $(LIBZ_CFLAGS)
   253 LIBJLI_CFLAGS += $(LIBZ_CFLAGS)
   319 
   254 
   320 ifneq ($(USE_EXTERNAL_LIBZ), true)
   255 ifneq ($(USE_EXTERNAL_LIBZ), true)
   321   LIBJLI_EXTRA_FILES += \
   256   LIBJLI_EXTRA_FILES += \
   330 endif
   265 endif
   331 
   266 
   332 $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
   267 $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
   333     NAME := jli, \
   268     NAME := jli, \
   334     OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
   269     OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
   335     SRC := $(LIBJLI_SRC_DIRS), \
       
   336     EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
   270     EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
   337     EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
   271     EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
   338     OPTIMIZATION := HIGH, \
   272     OPTIMIZATION := HIGH, \
   339     CFLAGS := $(LIBJLI_CFLAGS), \
   273     CFLAGS := $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
   340     DISABLED_WARNINGS_gcc := maybe-uninitialized, \
   274     DISABLED_WARNINGS_gcc := maybe-uninitialized, \
   341     MAPFILE := $(TOPDIR)/make/mapfiles/libjli/mapfile-vers, \
       
   342     LDFLAGS := $(LDFLAGS_JDKLIB) \
   275     LDFLAGS := $(LDFLAGS_JDKLIB) \
   343         $(call SET_SHARED_LIBRARY_ORIGIN), \
   276         $(call SET_SHARED_LIBRARY_ORIGIN), \
   344     LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
   277     LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
   345     LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
   278     LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
   346     LDFLAGS_windows := \
       
   347         -export:JLI_Launch \
       
   348         -export:JLI_ManifestIterate \
       
   349         -export:JLI_SetTraceLauncher \
       
   350         -export:JLI_ReportErrorMessage \
       
   351         -export:JLI_ReportErrorMessageSys \
       
   352         -export:JLI_ReportMessage \
       
   353         -export:JLI_ReportExceptionDescription \
       
   354         -export:JLI_MemAlloc \
       
   355         -export:JLI_CmdToArgs \
       
   356         -export:JLI_GetStdArgc \
       
   357         -export:JLI_GetStdArgs \
       
   358         -export:JLI_List_new \
       
   359         -export:JLI_List_add \
       
   360         -export:JLI_StringDup \
       
   361         -export:JLI_MemFree \
       
   362         -export:JLI_InitArgProcessing \
       
   363         -export:JLI_PreprocessArg \
       
   364         -export:JLI_AddArgsFromEnvVar \
       
   365         -export:JLI_GetAppArgIndex, \
       
   366     LIBS_unix := $(LIBZ_LIBS), \
   279     LIBS_unix := $(LIBZ_LIBS), \
   367     LIBS_linux := $(LIBDL) -lpthread, \
   280     LIBS_linux := $(LIBDL) -lpthread, \
   368     LIBS_solaris := $(LIBDL), \
   281     LIBS_solaris := $(LIBDL), \
   369     LIBS_aix := $(LIBDL),\
   282     LIBS_aix := $(LIBDL),\
   370     LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
   283     LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
   371     LIBS_windows := advapi32.lib comctl32.lib user32.lib, \
   284     LIBS_windows := advapi32.lib comctl32.lib user32.lib, \
   372 ))
   285 ))
   373 
   286 
   374 TARGETS += $(BUILD_LIBJLI)
   287 TARGETS += $(BUILD_LIBJLI)
       
   288 
       
   289 LIBJLI_SRC_DIRS := $(call FindSrcDirsForComponent, java.base, libjli)
   375 
   290 
   376 # On windows, the static library has the same suffix as the import library created by
   291 # On windows, the static library has the same suffix as the import library created by
   377 # with the shared library, so the static library is given a different name. No harm
   292 # with the shared library, so the static library is given a different name. No harm
   378 # in doing it for all platform to reduce complexity.
   293 # in doing it for all platform to reduce complexity.
   379 ifeq ($(OPENJDK_TARGET_OS), windows)
   294 ifeq ($(OPENJDK_TARGET_OS), windows)
   383       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \
   298       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \
   384       SRC := $(LIBJLI_SRC_DIRS), \
   299       SRC := $(LIBJLI_SRC_DIRS), \
   385       EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
   300       EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
   386       EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
   301       EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
   387       OPTIMIZATION := HIGH, \
   302       OPTIMIZATION := HIGH, \
   388       CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
   303       CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \
       
   304           $(addprefix -I, $(LIBJLI_SRC_DIRS)), \
   389       ARFLAGS := $(ARFLAGS), \
   305       ARFLAGS := $(ARFLAGS), \
   390       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
   306       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
   391   ))
   307   ))
   392 
   308 
   393   TARGETS += $(BUILD_LIBJLI_STATIC)
   309   TARGETS += $(BUILD_LIBJLI_STATIC)
   402       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \
   318       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \
   403       SRC := $(LIBJLI_SRC_DIRS), \
   319       SRC := $(LIBJLI_SRC_DIRS), \
   404       EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
   320       EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
   405       EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
   321       EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
   406       OPTIMIZATION := HIGH, \
   322       OPTIMIZATION := HIGH, \
   407       CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
   323       CFLAGS := $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \
       
   324           $(addprefix -I, $(LIBJLI_SRC_DIRS)), \
   408       LDFLAGS := -nostdlib $(ARFLAGS), \
   325       LDFLAGS := -nostdlib $(ARFLAGS), \
   409       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
   326       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
   410   ))
   327   ))
   411 
   328 
   412   ifeq ($(STATIC_BUILD), true)
   329   ifeq ($(STATIC_BUILD), true)
   426       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \
   343       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \
   427       SRC := $(LIBJLI_SRC_DIRS), \
   344       SRC := $(LIBJLI_SRC_DIRS), \
   428       EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
   345       EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
   429       EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
   346       EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
   430       OPTIMIZATION := HIGH, \
   347       OPTIMIZATION := HIGH, \
   431       CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
   348       CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
   432       ARFLAGS := $(ARFLAGS), \
   349       ARFLAGS := $(ARFLAGS), \
   433       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static))
   350       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static))
   434 
   351 
   435   TARGETS += $(BUILD_LIBJLI_STATIC)
   352   TARGETS += $(BUILD_LIBJLI_STATIC)
   436 
   353