*** old/make/lib/CoreLibraries.gmk	Wed Apr  1 09:49:55 2015
--- new/make/lib/CoreLibraries.gmk	Wed Apr  1 09:49:54 2015

*** 267,277 ****
--- 267,277 ----
    LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO
  endif
  LIBJLI_EXCLUDE_FILES += $(notdir $(LIBJLI_EXCLUDE_ERGO))
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
!   LIBJLI_EXCLUDE_FILES += java_md_solinux.c ergo.c ergo_i586.c
  
    BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c
    BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS := -x objective-c
  
    LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"

*** 315,330 ****
--- 315,325 ----
      EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
      EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
      LANG := C, \
      OPTIMIZATION := HIGH, \
      CFLAGS := $(LIBJLI_CFLAGS), \
!     DISABLED_WARNINGS_gcc := pointer-to-int-cast sign-compare format-nonliteral \
          parentheses, \
      DISABLED_WARNINGS_clang := implicit-function-declaration parentheses \
          int-conversion, \
      DISABLED_WARNINGS_solstudio := E_ASM_DISABLES_OPTIMIZATION E_NEWLINE_NOT_LAST, \
      DISABLED_WARNINGS_microsoft := 4244 4047 4267, \
!     DISABLED_WARNINGS_solstudio := E_ASM_DISABLES_OPTIMIZATION, \
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjli/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
      LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \

*** 369,379 ****
--- 364,373 ----
        EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
        EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
        LANG := C, \
        OPTIMIZATION := HIGH, \
        CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
        DISABLED_WARNINGS_microsoft := 4244 4047 4267, \
        ARFLAGS := $(ARFLAGS), \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
    TARGETS += $(BUILD_LIBJLI_STATIC)

*** 390,401 ****
--- 384,393 ----
        EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
        EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
        LANG := C, \
        OPTIMIZATION := HIGH, \
        CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
        DISABLED_WARNINGS_clang := implicit-function-declaration parentheses \
            int-conversion, \
        LDFLAGS := -nostdlib -r, \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static, \
        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
  
    $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static.a: $(BUILD_LIBJLI_STATIC)