*** old/make/lib/CoreLibraries.gmk	Mon Jan 25 20:47:21 2016
--- new/make/lib/CoreLibraries.gmk	Mon Jan 25 20:47:21 2016

*** 135,150 ****
--- 135,144 ----
    ifneq ($(OPENJDK_TARGET_CPU), x86_64)
      LIBJAVA_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
    endif
  endif
  
  ifeq ($(OPENJDK_TARGET_OS), linux)
    ifeq ($(OPENJDK_TARGET_CPU), x86_64)
      BUILD_LIBJAVA_Bits.c_CFLAGS := $(C_O_FLAG_NORM)
    endif
  endif
  
  $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
      LIBRARY := java, \
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
      SRC := $(LIBJAVA_SRC_DIRS), \
      OPTIMIZATION := HIGH, \