1.1 --- a/common/autoconf/configure.ac Wed Mar 21 09:19:00 2018 -0700
1.2 +++ b/common/autoconf/configure.ac Thu Apr 05 07:59:52 2018 -0700
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -43,6 +43,7 @@
1.11 # ... then the rest
1.12 m4_include([boot-jdk.m4])
1.13 m4_include([build-performance.m4])
1.14 +m4_include([flags.m4])
1.15 m4_include([help.m4])
1.16 m4_include([jdk-options.m4])
1.17 m4_include([libraries.m4])
1.18 @@ -72,7 +73,11 @@
1.19 #
1.20 ###############################################################################
1.21
1.22 -# Basic initialization that must happen first of all
1.23 +# If we are requested to print additional help, do that and then exit.
1.24 +# This must be the very first call.
1.25 +HELP_PRINT_ADDITIONAL_HELP_AND_EXIT
1.26 +
1.27 +# Basic initialization that must happen first of all in the normal process.
1.28 BASIC_INIT
1.29 BASIC_SETUP_FUNDAMENTAL_TOOLS
1.30
1.31 @@ -149,26 +154,41 @@
1.32
1.33 ###############################################################################
1.34 #
1.35 -# Setup the toolchain (compilers etc), i.e. the tools that need to be
1.36 -# cross-compilation aware.
1.37 +# Setup the toolchain (compilers etc), i.e. tools used to compile and process
1.38 +# native code.
1.39 #
1.40 ###############################################################################
1.41
1.42 -TOOLCHAIN_SETUP_SYSROOT_AND_OUT_OPTIONS
1.43 -# Locate the actual tools
1.44 -TOOLCHAIN_SETUP_PATHS
1.45 +# First determine the toolchain type (compiler family)
1.46 +TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE
1.47
1.48 -# FIXME: Currently we must test this after paths but before flags. Fix!
1.49 +# Then detect the actual binaries needed
1.50 +TOOLCHAIN_PRE_DETECTION
1.51 +TOOLCHAIN_DETECT_TOOLCHAIN_CORE
1.52 +TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA
1.53 +TOOLCHAIN_POST_DETECTION
1.54
1.55 -# And we can test some aspects on the target using configure macros.
1.56 +# Finally do some processing after the detection phase
1.57 +TOOLCHAIN_SETUP_BUILD_COMPILERS
1.58 +TOOLCHAIN_SETUP_LEGACY
1.59 +TOOLCHAIN_MISC_CHECKS
1.60 +
1.61 +# Setup the JTReg Regression Test Harness.
1.62 +TOOLCHAIN_SETUP_JTREG
1.63 +
1.64 +FLAGS_SETUP_INIT_FLAGS
1.65 +
1.66 +# FIXME: Currently we must test this after toolchain but before flags. Fix!
1.67 +
1.68 +# Now we can test some aspects on the target using configure macros.
1.69 PLATFORM_SETUP_OPENJDK_TARGET_BITS
1.70 PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS
1.71
1.72 # Configure flags for the tools
1.73 -TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_LIBS
1.74 -TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION
1.75 -TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK
1.76 -TOOLCHAIN_SETUP_COMPILER_FLAGS_MISC
1.77 +FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS
1.78 +FLAGS_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION
1.79 +FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK
1.80 +FLAGS_SETUP_COMPILER_FLAGS_MISC
1.81
1.82 # Setup debug symbols (need objcopy from the toolchain for that)
1.83 JDKOPT_SETUP_DEBUG_SYMBOLS
1.84 @@ -189,7 +209,7 @@
1.85 LIB_SETUP_ALSA
1.86 LIB_SETUP_MISC_LIBS
1.87 LIB_SETUP_STATIC_LINK_LIBSTDCPP
1.88 -
1.89 +LIB_SETUP_ON_WINDOWS
1.90
1.91 ###############################################################################
1.92 #
