122 LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
 123     -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
 124     -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
 125      -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
 126 
 127 ifneq (, $(JDK_UPDATE_VERSION))
 128   LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
 129 endif
 130 
 131 ifeq ($(OPENJDK_TARGET_OS), macosx)
 132   BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
 133   BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
 134 endif
 135 
 136 ifeq ($(OPENJDK_TARGET_OS), solaris)
 137   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
 138     LIBJAVA_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
 139   endif
 140 endif
 141 
 142 ifeq ($(OPENJDK_TARGET_OS), linux)
 143   ifeq ($(OPENJDK_TARGET_CPU), x86_64)
 144     BUILD_LIBJAVA_Bits.c_CFLAGS := $(C_O_FLAG_NORM)
 145   endif
 146 endif
 147 
 148 $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
 149     LIBRARY := java, \
 150     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
 151     SRC := $(LIBJAVA_SRC_DIRS), \
 152     OPTIMIZATION := HIGH, \
 153     CFLAGS := $(CFLAGS_JDKLIB) \
 154         $(LIBJAVA_CFLAGS), \
 155     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
 156     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \
 157     LDFLAGS := $(LDFLAGS_JDKLIB) \
 158         $(call SET_SHARED_LIBRARY_ORIGIN), \
 159     LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \
 160     LDFLAGS_windows := -export:winFileHandleOpen -export:handleLseek \
 161         -export:getLastErrorString \
 162         -export:getErrorString -delayload:shell32.dll, \
 163     LIBS_unix := -ljvm -lverify, \
 164     LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
 165     LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \
 166     LIBS_aix := $(LIBDL) $(BUILD_LIBFDLIBM) -lm,\
 167     LIBS_macosx := -lfdlibm \

 122 LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
 123     -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
 124     -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
 125      -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
 126 
 127 ifneq (, $(JDK_UPDATE_VERSION))
 128   LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
 129 endif
 130 
 131 ifeq ($(OPENJDK_TARGET_OS), macosx)
 132   BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
 133   BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
 134 endif
 135 
 136 ifeq ($(OPENJDK_TARGET_OS), solaris)
 137   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
 138     LIBJAVA_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
 139   endif
 140 endif
 141 






 142 $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
 143     LIBRARY := java, \
 144     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
 145     SRC := $(LIBJAVA_SRC_DIRS), \
 146     OPTIMIZATION := HIGH, \
 147     CFLAGS := $(CFLAGS_JDKLIB) \
 148         $(LIBJAVA_CFLAGS), \
 149     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
 150     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \
 151     LDFLAGS := $(LDFLAGS_JDKLIB) \
 152         $(call SET_SHARED_LIBRARY_ORIGIN), \
 153     LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \
 154     LDFLAGS_windows := -export:winFileHandleOpen -export:handleLseek \
 155         -export:getLastErrorString \
 156         -export:getErrorString -delayload:shell32.dll, \
 157     LIBS_unix := -ljvm -lverify, \
 158     LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
 159     LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \
 160     LIBS_aix := $(LIBDL) $(BUILD_LIBFDLIBM) -lm,\
 161     LIBS_macosx := -lfdlibm \