*** old/make/lib/CoreLibraries.gmk	Fri Feb  5 13:29:56 2016
--- new/make/lib/CoreLibraries.gmk	Fri Feb  5 13:29:56 2016

*** 1,7 ****
--- 1,7 ----
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
! # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this

*** 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, \