8050052: Small cleanups in java.lang.invoke code
Reviewed-by: vlivanov, psandoz
Contributed-by: john.r.rose@oracle.com
## Copyright (c) 2011, 2014, 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# particular file as subject to the "Classpath" exception as provided# by Oracle in the LICENSE file that accompanied this code.## This code is distributed in the hope that it will be useful, but WITHOUT# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License# version 2 for more details (a copy is included in the LICENSE file that# accompanied this code).## You should have received a copy of the GNU General Public License version# 2 along with this work; if not, write to the Free Software Foundation,# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.## Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA# or visit www.oracle.com if you need additional information or have any# questions.#default: allinclude $(SPEC)include MakeBase.gmkinclude NativeCompilation.gmk# Build toolsinclude Tools.gmkGLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc# Put the libraries here. Different locations for different target apis.ifeq ($(OPENJDK_TARGET_OS_API), posix) INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)else INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/binendif# Absolute paths to lib files on windows for use in LDFLAGS. Should figure out a more# elegant solution to this.WIN_JAVA_LIB := $(JDK_OUTPUTDIR)/objs/libjava/java.lib# Use this variable to set DEBUG_SYMBOLS true on windows for all libraries, but# not on other platforms.ifeq ($(OPENJDK_TARGET_OS), windows) DEBUG_ALL_BINARIES := trueendif# Build everything with debugging on OpenJDKifdef OPENJDK DEBUG_ALL_BINARIES := trueendif################################################################################# Find the default set of src dirs for a native library.# Param 1 - module name# Param 2 - library nameFindSrcDirsForLib = $(call uniq, $(wildcard \ $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \ $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_API_DIR)/native/lib$(strip $2) \ $(JDK_TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2)))################################################################################# A lot of libraries are dependent on libjava. Define the name of that# library here to make dependency declarations to it possible in other files.BUILD_LIBJAVA := $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX)# Also define the header include flags needed to compile against it.LIBJAVA_HEADER_FLAGS := $(addprefix -I, $(call FindSrcDirsForLib, java.base, java))################################################################################# Define it here since there are multiple uses.ifeq ($(USE_EXTERNAL_LIBZ), true) LIBZ := -lzelse ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8endif