# HG changeset patch # User ihse # Date 1521074609 -3600 # Node ID e05b4241302b0d288f6c0c4f7f3e40f0fda6f8a4 # Parent b74ed86a116a3215bb08d60607e3387c1ccb2d96# Parent 995a5556edfa5e3567a9ef270a45c3577f9825b1 Merge diff -r b74ed86a116a -r e05b4241302b make/common/JdkNativeCompilation.gmk --- a/make/common/JdkNativeCompilation.gmk Wed Mar 14 23:26:27 2018 +0100 +++ b/make/common/JdkNativeCompilation.gmk Thu Mar 15 01:43:29 2018 +0100 @@ -38,50 +38,9 @@ # Parameter 1 is the name of the rule. This name is used as variable prefix, # and the targets generated are listed in a variable by that name. # -# Remaining parameters are named arguments. These include: -# NAME The base name for the resulting binary, excluding decorations (like *.exe) -# TYPE Type of binary (EXECUTABLE, LIBRARY or STATIC_LIBRARY). Default is LIBRARY. -# SUFFIX Override the default suffix for the output file -# TOOLCHAIN Name of toolchain setup to use. Defaults to TOOLCHAIN_DEFAULT. -# SRC one or more directory roots to scan for C/C++ files. -# CFLAGS the compiler flags to be used, used both for C and C++. -# CXXFLAGS the compiler flags to be used for c++, if set overrides CFLAGS. -# LDFLAGS the linker flags to be used, used both for C and C++. -# LIBS the libraries to link to -# ARFLAGS the archiver flags to be used -# OBJECT_DIR the directory where we store the object files -# OUTPUT_DIR the directory where the resulting binary is put -# INCLUDES only pick source from these directories -# EXCLUDES do not pick source from these directories -# INCLUDE_FILES only compile exactly these files! -# EXCLUDE_FILES with these names -# EXCLUDE_PATTERN exclude files matching any of these substrings -# EXTRA_FILES List of extra files not in any of the SRC dirs -# EXTRA_OBJECT_FILES List of extra object files to include when linking -# VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run -# RC_FLAGS flags for RC. -# EMBED_MANIFEST if true, embed manifest on Windows. -# MAPFILE mapfile -# REORDER reorder file -# USE_MAPFILE_FOR_SYMBOLS if true and this is a STATIC_BUILD, just copy the -# mapfile for the output symbols file -# CC the compiler to use, default is $(CC) -# LD the linker to use, default is $(LD) -# OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST, HIGHEST_JVM, SIZE -# DISABLED_WARNINGS_ Disable the given warnings for the specified toolchain -# DISABLED_WARNINGS_C_ Disable the given warnings for the specified toolchain -# when compiling C code -# DISABLED_WARNINGS_CXX_ Disable the given warnings for the specified -# toolchain when compiling C++ code -# STRIP_SYMBOLS Set to false to override global strip policy and always leave -# symbols in the binary, if the toolchain allows for it -# DEBUG_SYMBOLS Set to false to disable generation of debug symbols -# COPY_DEBUG_SYMBOLS Set to false to override global setting of debug symbol copying -# ZIP_EXTERNAL_DEBUG_SYMBOLS Set to false to override global setting of debug symbol -# zipping -# STRIPFLAGS Optionally change the flags given to the strip command -# PRECOMPILED_HEADER Header file to use as precompiled header -# PRECOMPILED_HEADER_EXCLUDE List of source files that should not use PCH +# Remaining parameters are named arguments. These are all passed on to +# SetupNativeCompilation, except for +# EXTRA_RC_FLAGS -- additional RC_FLAGS to append. SetupJdkLibrary = $(NamedParamsMacroTemplate) define SetupJdkLibraryBody ifeq ($$($1_OUTPUT_DIR), ) @@ -120,50 +79,9 @@ # Parameter 1 is the name of the rule. This name is used as variable prefix, # and the targets generated are listed in a variable by that name. # -# Remaining parameters are named arguments. These include: -# NAME The base name for the resulting binary, excluding decorations (like *.exe) -# TYPE Type of binary (EXECUTABLE, LIBRARY or STATIC_LIBRARY). Default is LIBRARY. -# SUFFIX Override the default suffix for the output file -# TOOLCHAIN Name of toolchain setup to use. Defaults to TOOLCHAIN_DEFAULT. -# SRC one or more directory roots to scan for C/C++ files. -# CFLAGS the compiler flags to be used, used both for C and C++. -# CXXFLAGS the compiler flags to be used for c++, if set overrides CFLAGS. -# LDFLAGS the linker flags to be used, used both for C and C++. -# LIBS the libraries to link to -# ARFLAGS the archiver flags to be used -# OBJECT_DIR the directory where we store the object files -# OUTPUT_DIR the directory where the resulting binary is put -# INCLUDES only pick source from these directories -# EXCLUDES do not pick source from these directories -# INCLUDE_FILES only compile exactly these files! -# EXCLUDE_FILES with these names -# EXCLUDE_PATTERN exclude files matching any of these substrings -# EXTRA_FILES List of extra files not in any of the SRC dirs -# EXTRA_OBJECT_FILES List of extra object files to include when linking -# VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run -# RC_FLAGS flags for RC. -# EMBED_MANIFEST if true, embed manifest on Windows. -# MAPFILE mapfile -# REORDER reorder file -# USE_MAPFILE_FOR_SYMBOLS if true and this is a STATIC_BUILD, just copy the -# mapfile for the output symbols file -# CC the compiler to use, default is $(CC) -# LD the linker to use, default is $(LD) -# OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST, HIGHEST_JVM, SIZE -# DISABLED_WARNINGS_ Disable the given warnings for the specified toolchain -# DISABLED_WARNINGS_C_ Disable the given warnings for the specified toolchain -# when compiling C code -# DISABLED_WARNINGS_CXX_ Disable the given warnings for the specified -# toolchain when compiling C++ code -# STRIP_SYMBOLS Set to false to override global strip policy and always leave -# symbols in the binary, if the toolchain allows for it -# DEBUG_SYMBOLS Set to false to disable generation of debug symbols -# COPY_DEBUG_SYMBOLS Set to false to override global setting of debug symbol copying -# ZIP_EXTERNAL_DEBUG_SYMBOLS Set to false to override global setting of debug symbol -# zipping -# STRIPFLAGS Optionally change the flags given to the strip command -# PRECOMPILED_HEADER Header file to use as precompiled header -# PRECOMPILED_HEADER_EXCLUDE List of source files that should not use PCH +# Remaining parameters are named arguments. These are all passed on to +# SetupNativeCompilation, except for +# EXTRA_RC_FLAGS -- additional RC_FLAGS to append. SetupJdkExecutable = $(NamedParamsMacroTemplate) define SetupJdkExecutableBody $1_TYPE := EXECUTABLE diff -r b74ed86a116a -r e05b4241302b make/common/NativeCompilation.gmk diff -r b74ed86a116a -r e05b4241302b make/launcher/Launcher-java.base.gmk diff -r b74ed86a116a -r e05b4241302b make/launcher/Launcher-jdk.pack.gmk diff -r b74ed86a116a -r e05b4241302b make/launcher/LauncherCommon.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Awt2dLibraries.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/CoreLibraries.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-java.prefs.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-java.security.jgss.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-java.smartcardio.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-jdk.accessibility.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-jdk.crypto.cryptoki.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-jdk.crypto.ec.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-jdk.crypto.ucrypto.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-jdk.hotspot.agent.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-jdk.jdwp.agent.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-jdk.net.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-jdk.pack.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-jdk.sctp.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/Lib-jdk.security.auth.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/LibCommon.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/NetworkingLibraries.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/NioLibraries.gmk diff -r b74ed86a116a -r e05b4241302b make/lib/SoundLibraries.gmk