214         -D "JDK_FNAME=java.dll" \
 215         -D "JDK_INTERNAL_NAME=java" \
 216         -D "JDK_FTYPE=0x2L", \
 217     REORDER := $(LIBJAVA_REORDER), \
 218     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava, \
 219     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
 220 
 221 BUILD_LIBRARIES += $(BUILD_LIBJAVA)
 222 
 223 $(BUILD_LIBJAVA): $(LIBJLI_BINARY)
 224 
 225 $(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
 226 
 227 $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
 228 
 229 ##########################################################################################
 230 
 231 BUILD_LIBZIP_EXCLUDES :=
 232 ifeq ($(USE_EXTERNAL_LIBZ), true)
 233   LIBZ := -lz
 234   LIBZIP_EXCLUDES += zlib-1.2.5
 235 else
 236   ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
 237 endif
 238 
 239 BUILD_LIBZIP_REORDER :=
 240 ifeq ($(OPENJDK_TARGET_OS), solaris)
 241   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
 242     BUILD_LIBZIP_REORDER := $(JDK_TOPDIR)/make/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
 243   endif
 244 endif
 245 
 246 ifeq ($(LIBZIP_CAN_USE_MMAP), true)
 247   BUILD_LIBZIP_MMAP := -DUSE_MMAP
 248 endif
 249 
 250 $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
 251     LIBRARY := zip, \
 252     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
 253     LANG := C, \
 254     OPTIMIZATION := LOW, \
 255     SRC := $(JDK_TOPDIR)/src/share/native/java/util/zip, \
 256     EXCLUDES := $(LIBZIP_EXCLUDES), \

 393 
 394   ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
 395 
 396   # if the architecture specific ergo file exists then
 397   # use it, else use the generic definitions from ergo.c
 398   ifneq ($(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(ERGO_ARCH_FILE)), )
 399     BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE)
 400   else # !ERGO_ARCH_FILE
 401     LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO
 402   endif # ERGO_ARCH_FILE
 403 endif #WINDOWS
 404 
 405 # Append defines depending on target platform
 406 LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS)
 407 
 408 ifeq ($(OPENJDK_TARGET_OS), macosx)
 409   LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
 410 endif
 411 
 412 ifneq ($(USE_EXTERNAL_LIBZ), true)
 413   BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
 414   LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
 415   BUILD_LIBJLI_FILES += \
 416       inflate.c \
 417       inftrees.c \
 418       inffast.c \
 419       zadler32.c \
 420       zcrc32.c \
 421       zutil.c
 422 endif
 423 
 424 ifeq ($(OPENJDK_TARGET_OS), windows)
 425   LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)
 426 else
 427   LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli
 428 endif
 429 
 430 $(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \
 431     LIBRARY := jli, \
 432     OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
 433     SRC := $(BUILD_LIBJLI_SRC_DIRS), \

 214         -D "JDK_FNAME=java.dll" \
 215         -D "JDK_INTERNAL_NAME=java" \
 216         -D "JDK_FTYPE=0x2L", \
 217     REORDER := $(LIBJAVA_REORDER), \
 218     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava, \
 219     DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
 220 
 221 BUILD_LIBRARIES += $(BUILD_LIBJAVA)
 222 
 223 $(BUILD_LIBJAVA): $(LIBJLI_BINARY)
 224 
 225 $(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
 226 
 227 $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
 228 
 229 ##########################################################################################
 230 
 231 BUILD_LIBZIP_EXCLUDES :=
 232 ifeq ($(USE_EXTERNAL_LIBZ), true)
 233   LIBZ := -lz
 234   LIBZIP_EXCLUDES += zlib-1.2.8
 235 else
 236   ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
 237 endif
 238 
 239 BUILD_LIBZIP_REORDER :=
 240 ifeq ($(OPENJDK_TARGET_OS), solaris)
 241   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
 242     BUILD_LIBZIP_REORDER := $(JDK_TOPDIR)/make/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
 243   endif
 244 endif
 245 
 246 ifeq ($(LIBZIP_CAN_USE_MMAP), true)
 247   BUILD_LIBZIP_MMAP := -DUSE_MMAP
 248 endif
 249 
 250 $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
 251     LIBRARY := zip, \
 252     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
 253     LANG := C, \
 254     OPTIMIZATION := LOW, \
 255     SRC := $(JDK_TOPDIR)/src/share/native/java/util/zip, \
 256     EXCLUDES := $(LIBZIP_EXCLUDES), \

 393 
 394   ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
 395 
 396   # if the architecture specific ergo file exists then
 397   # use it, else use the generic definitions from ergo.c
 398   ifneq ($(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(ERGO_ARCH_FILE)), )
 399     BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE)
 400   else # !ERGO_ARCH_FILE
 401     LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO
 402   endif # ERGO_ARCH_FILE
 403 endif #WINDOWS
 404 
 405 # Append defines depending on target platform
 406 LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS)
 407 
 408 ifeq ($(OPENJDK_TARGET_OS), macosx)
 409   LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
 410 endif
 411 
 412 ifneq ($(USE_EXTERNAL_LIBZ), true)
 413   BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
 414   LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
 415   BUILD_LIBJLI_FILES += \
 416       inflate.c \
 417       inftrees.c \
 418       inffast.c \
 419       zadler32.c \
 420       zcrc32.c \
 421       zutil.c
 422 endif
 423 
 424 ifeq ($(OPENJDK_TARGET_OS), windows)
 425   LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)
 426 else
 427   LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli
 428 endif
 429 
 430 $(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \
 431     LIBRARY := jli, \
 432     OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
 433     SRC := $(BUILD_LIBJLI_SRC_DIRS), \