make/autoconf/flags-cflags.m4
author ihse
Mon, 26 Feb 2018 14:23:19 +0100
branchihse-cflags-rewrite-branch
changeset 56177 2fbe3b84ee3d
parent 56176 b3e3a12dcb33
child 56178 7e63ac6274dd
permissions -rw-r--r--
Even more restructuring.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     1
#
48767
0c6ce8fdb50a 8080990: libdt_socket/socket_md.c(202) : warning C4996: 'gethostbyname': Use getaddrinfo() or GetAddrInfoW()
gadams
parents: 48751
diff changeset
     2
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     4
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    10
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    15
# accompanied this code).
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    16
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    20
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    23
# questions.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    24
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    25
42538
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    26
################################################################################
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    27
#
56124
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
    28
# Setup flags for C/C++ compiler
42538
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    29
#
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    30
56124
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
    31
###############################################################################
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
    32
#
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
    33
# How to compile shared libraries.
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
    34
#
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
    35
AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
    36
[
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    37
  if test "x$TOOLCHAIN_TYPE" = xgcc; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    38
    C_FLAG_REORDER=''
56168
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    39
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    40
    # Default works for linux, might work on other platforms as well.
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    41
    SHARED_LIBRARY_FLAGS='-shared'
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    42
    SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    43
    SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    44
    SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    45
    SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    46
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    47
  elif test "x$TOOLCHAIN_TYPE" = xclang; then
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    48
    C_FLAG_REORDER=''
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    49
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    50
    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    51
      # Linking is different on MacOSX
56158
97b2b2de66f2 Fixing PIC-flag issues, and all remaining differences on linux_x64.
ihse
parents: 56146
diff changeset
    52
      SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0"
44398
406532d25529 8177634: Fix for 8175307 may cause linker errors on OS X 10.9
ihse
parents: 44074
diff changeset
    53
      SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path$(or [$]1,/.)'
23161
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22730
diff changeset
    54
      SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34120
diff changeset
    55
      SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1'
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35451
diff changeset
    56
      SET_SHARED_LIBRARY_MAPFILE='-Wl,-exported_symbols_list,[$]1'
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
    57
23161
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22730
diff changeset
    58
    else
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22730
diff changeset
    59
      # Default works for linux, might work on other platforms as well.
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22730
diff changeset
    60
      SHARED_LIBRARY_FLAGS='-shared'
41875
854ef5325653 8160491: tar.gz bundles missing files containing $
erikj
parents: 41662
diff changeset
    61
      SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34120
diff changeset
    62
      SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34120
diff changeset
    63
      SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
42538
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    64
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    65
      # arm specific settings
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    66
      if test "x$OPENJDK_TARGET_CPU" = "xarm"; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    67
        # '-Wl,-z,origin' isn't used on arm.
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    68
        SET_SHARED_LIBRARY_ORIGIN='-Wl,-rpath,\$$$$ORIGIN[$]1'
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    69
      else
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    70
        SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    71
      fi
56168
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    72
    fi
42538
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    73
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    74
  elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    75
    C_FLAG_REORDER='-xF'
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    76
    SHARED_LIBRARY_FLAGS="-G"
41875
854ef5325653 8160491: tar.gz bundles missing files containing $
erikj
parents: 41662
diff changeset
    77
    SET_EXECUTABLE_ORIGIN='-R\$$ORIGIN[$]1'
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    78
    SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34120
diff changeset
    79
    SET_SHARED_LIBRARY_NAME='-h [$]1'
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    80
    SET_SHARED_LIBRARY_MAPFILE='-M[$]1'
56168
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    81
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    82
  elif test "x$TOOLCHAIN_TYPE" = xxlc; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    83
    C_FLAG_REORDER=''
36051
25fa80338f92 8150197: Integrate AIX fixes from build-infra
simonis
parents: 36050
diff changeset
    84
    SHARED_LIBRARY_FLAGS="-qmkshrobj -bM:SRE -bnoentry"
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    85
    SET_EXECUTABLE_ORIGIN=""
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    86
    SET_SHARED_LIBRARY_ORIGIN=''
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    87
    SET_SHARED_LIBRARY_NAME=''
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    88
    SET_SHARED_LIBRARY_MAPFILE=''
56168
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
    89
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    90
  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    91
    C_FLAG_REORDER=''
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34120
diff changeset
    92
    SHARED_LIBRARY_FLAGS="-dll"
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    93
    SET_EXECUTABLE_ORIGIN=''
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    94
    SET_SHARED_LIBRARY_ORIGIN=''
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    95
    SET_SHARED_LIBRARY_NAME=''
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35451
diff changeset
    96
    SET_SHARED_LIBRARY_MAPFILE='-def:[$]1'
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
    97
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    98
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
    99
  AC_SUBST(C_FLAG_REORDER)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   100
  AC_SUBST(SET_EXECUTABLE_ORIGIN)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   101
  AC_SUBST(SET_SHARED_LIBRARY_ORIGIN)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   102
  AC_SUBST(SET_SHARED_LIBRARY_NAME)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   103
  AC_SUBST(SET_SHARED_LIBRARY_MAPFILE)
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 34120
diff changeset
   104
  AC_SUBST(SHARED_LIBRARY_FLAGS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   105
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   106
56124
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
   107
AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   108
[
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   109
  # Debug symbols
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   110
  if test "x$TOOLCHAIN_TYPE" = xgcc; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   111
    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   112
      CFLAGS_DEBUG_SYMBOLS="-g1"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   113
    else
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   114
      CFLAGS_DEBUG_SYMBOLS="-g"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   115
    fi
23161
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22730
diff changeset
   116
  elif test "x$TOOLCHAIN_TYPE" = xclang; then
85635b5bf0a6 8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents: 22730
diff changeset
   117
    CFLAGS_DEBUG_SYMBOLS="-g"
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   118
  elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   119
    CFLAGS_DEBUG_SYMBOLS="-g -xs"
35032
c2f315819691 8145596: Enable debug symbols for all libraries
ihse
parents: 35029
diff changeset
   120
    # -g0 enables debug symbols without disabling inlining.
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   121
    CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   122
  elif test "x$TOOLCHAIN_TYPE" = xxlc; then
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   123
    CFLAGS_DEBUG_SYMBOLS="-g"
36531
ef4e1ca50af8 8151619: genSocketOptionRegistry.exe always relinked on Windows
erikj
parents: 36051
diff changeset
   124
  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
ef4e1ca50af8 8151619: genSocketOptionRegistry.exe always relinked on Windows
erikj
parents: 36051
diff changeset
   125
    CFLAGS_DEBUG_SYMBOLS="-Zi"
56162
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   126
  fi
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   127
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   128
  if test "x$CXXFLAGS_DEBUG_SYMBOLS" = x; then
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   129
    # If we did not specify special flags for C++, use C version
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   130
    CXXFLAGS_DEBUG_SYMBOLS="$CFLAGS_DEBUG_SYMBOLS"
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   131
  fi
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   132
  AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   133
  AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
56161
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   134
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   135
  # FIXME: This was never used in the old build. What to do with it?
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   136
  if test "x$TOOLCHAIN_TYPE" = xgcc; then
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   137
    # "-Og" suppported for GCC 4.8 and later
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   138
    CFLAG_OPTIMIZE_DEBUG_FLAG="-Og"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   139
    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$CFLAG_OPTIMIZE_DEBUG_FLAG],
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   140
      IF_TRUE: [HAS_CFLAG_OPTIMIZE_DEBUG=true],
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   141
      IF_FALSE: [HAS_CFLAG_OPTIMIZE_DEBUG=false])
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   142
  fi
56177
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   143
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   144
  # Debug symbols for JVM_CFLAGS
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   145
  if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   146
    JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS -xs"
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   147
    if test "x$DEBUG_LEVEL" = xslowdebug; then
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   148
      JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS -g"
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   149
    else
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   150
      # -g0 does not disable inlining, which -g does.
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   151
      JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS -g0"
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   152
    fi
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   153
  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   154
    JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS -Z7 -d2Zi+"
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   155
  else
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   156
    JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS -g"
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   157
  fi
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   158
  AC_SUBST(JVM_CFLAGS_SYMBOLS)
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   159
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   160
  # bounds, memory and behavior checking options
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   161
  if test "x$TOOLCHAIN_TYPE" = xgcc; then
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   162
    case $DEBUG_LEVEL in
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   163
    slowdebug )
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   164
      # FIXME: By adding this to C(XX)FLAGS_DEBUG_OPTIONS/JVM_CFLAGS_SYMBOLS it
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   165
      # get's added conditionally on whether we produce debug symbols or not.
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   166
      # This is most likely not really correct.
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   167
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   168
      if test "x$STACK_PROTECTOR_CFLAG" != x; then
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   169
        JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS $STACK_PROTECTOR_CFLAG --param ssp-buffer-size=1"
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   170
      fi
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   171
      ;;
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   172
    esac
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   173
  fi
56124
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
   174
])
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   175
56124
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
   176
AC_DEFUN([FLAGS_SETUP_QUALITY_CHECKS],
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
   177
[
56176
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   178
  AC_ARG_ENABLE([warnings-as-errors], [AS_HELP_STRING([--disable-warnings-as-errors],
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   179
      [do not consider native warnings to be an error @<:@enabled@:>@])])
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   180
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   181
  AC_MSG_CHECKING([if native warnings are errors])
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   182
  if test "x$enable_warnings_as_errors" = "xyes"; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   183
    AC_MSG_RESULT([yes (explicitly set)])
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   184
    WARNINGS_AS_ERRORS=true
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   185
  elif test "x$enable_warnings_as_errors" = "xno"; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   186
    AC_MSG_RESULT([no])
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   187
    WARNINGS_AS_ERRORS=false
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   188
  elif test "x$enable_warnings_as_errors" = "x"; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   189
    AC_MSG_RESULT([yes (default)])
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   190
    WARNINGS_AS_ERRORS=true
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   191
  else
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   192
    AC_MSG_ERROR([--enable-warnings-as-errors accepts no argument])
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   193
  fi
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   194
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   195
  AC_SUBST(WARNINGS_AS_ERRORS)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   196
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   197
  case "${TOOLCHAIN_TYPE}" in
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   198
    microsoft)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   199
      DISABLE_WARNING_PREFIX="-wd"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   200
      CFLAGS_WARNINGS_ARE_ERRORS="-WX"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   201
      ;;
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   202
    solstudio)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   203
      DISABLE_WARNING_PREFIX="-erroff="
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   204
      CFLAGS_WARNINGS_ARE_ERRORS="-errtags -errwarn=%all"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   205
      ;;
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   206
    gcc)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   207
      # Prior to gcc 4.4, a -Wno-X where X is unknown for that version of gcc will cause an error
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   208
      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [-Wno-this-is-a-warning-that-do-not-exist],
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   209
          IF_TRUE: [GCC_CAN_DISABLE_WARNINGS=true],
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   210
          IF_FALSE: [GCC_CAN_DISABLE_WARNINGS=false]
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   211
      )
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   212
      if test "x$GCC_CAN_DISABLE_WARNINGS" = "xtrue"; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   213
        DISABLE_WARNING_PREFIX="-Wno-"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   214
      else
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   215
        DISABLE_WARNING_PREFIX=
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   216
      fi
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   217
      CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   218
      # Repeate the check for the BUILD_CC and BUILD_CXX. Need to also reset
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   219
      # CFLAGS since any target specific flags will likely not work with the
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   220
      # build compiler
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   221
      CC_OLD="$CC"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   222
      CXX_OLD="$CXX"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   223
      CC="$BUILD_CC"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   224
      CXX="$BUILD_CXX"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   225
      CFLAGS_OLD="$CFLAGS"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   226
      CFLAGS=""
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   227
      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [-Wno-this-is-a-warning-that-do-not-exist],
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   228
          IF_TRUE: [BUILD_CC_CAN_DISABLE_WARNINGS=true],
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   229
          IF_FALSE: [BUILD_CC_CAN_DISABLE_WARNINGS=false]
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   230
      )
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   231
      if test "x$BUILD_CC_CAN_DISABLE_WARNINGS" = "xtrue"; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   232
        BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   233
      else
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   234
        BUILD_CC_DISABLE_WARNING_PREFIX=
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   235
      fi
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   236
      CC="$CC_OLD"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   237
      CXX="$CXX_OLD"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   238
      CFLAGS="$CFLAGS_OLD"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   239
      ;;
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   240
    clang)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   241
      DISABLE_WARNING_PREFIX="-Wno-"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   242
      CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   243
      ;;
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   244
    xlc)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   245
      DISABLE_WARNING_PREFIX="-qsuppress="
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   246
      CFLAGS_WARNINGS_ARE_ERRORS="-qhalt=w"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   247
      ;;
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   248
  esac
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   249
  AC_SUBST(DISABLE_WARNING_PREFIX)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   250
  AC_SUBST(BUILD_CC_DISABLE_WARNING_PREFIX)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   251
  AC_SUBST(CFLAGS_WARNINGS_ARE_ERRORS)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56168
diff changeset
   252
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   253
  # bounds, memory and behavior checking options
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   254
  if test "x$TOOLCHAIN_TYPE" = xgcc; then
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   255
    case $DEBUG_LEVEL in
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   256
    release )
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   257
      # no adjustment
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   258
      ;;
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   259
    fastdebug )
26123
44827e1a7a7b 8047952: Remove FORTIFY_SOURCE from fastdebug and slowdebug builds
mduigou
parents: 25459
diff changeset
   260
      # no adjustment
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   261
      ;;
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   262
    slowdebug )
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
   263
      # FIXME: By adding this to C(XX)FLAGS_DEBUG_OPTIONS/JVM_CFLAGS_SYMBOLS it
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35451
diff changeset
   264
      # get's added conditionally on whether we produce debug symbols or not.
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35451
diff changeset
   265
      # This is most likely not really correct.
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35451
diff changeset
   266
30856
09b01c98ca8d 8081692: Configure should verify that -fstack-protector is valid
ihse
parents: 30740
diff changeset
   267
      # Add runtime stack smashing and undefined behavior checks.
09b01c98ca8d 8081692: Configure should verify that -fstack-protector is valid
ihse
parents: 30740
diff changeset
   268
      # Not all versions of gcc support -fstack-protector
09b01c98ca8d 8081692: Configure should verify that -fstack-protector is valid
ihse
parents: 30740
diff changeset
   269
      STACK_PROTECTOR_CFLAG="-fstack-protector-all"
56168
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
   270
      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$STACK_PROTECTOR_CFLAG -Werror],
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
   271
          IF_FALSE: [STACK_PROTECTOR_CFLAG=""])
30856
09b01c98ca8d 8081692: Configure should verify that -fstack-protector is valid
ihse
parents: 30740
diff changeset
   272
09b01c98ca8d 8081692: Configure should verify that -fstack-protector is valid
ihse
parents: 30740
diff changeset
   273
      CFLAGS_DEBUG_OPTIONS="$STACK_PROTECTOR_CFLAG --param ssp-buffer-size=1"
09b01c98ca8d 8081692: Configure should verify that -fstack-protector is valid
ihse
parents: 30740
diff changeset
   274
      CXXFLAGS_DEBUG_OPTIONS="$STACK_PROTECTOR_CFLAG --param ssp-buffer-size=1"
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   275
      ;;
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   276
    esac
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   277
  fi
56124
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
   278
])
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   279
56124
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
   280
AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
   281
[
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
   282
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   283
  # Optimization levels
56162
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   284
  # Most toolchains share opt flags between CC and CXX;
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   285
  # setup for C and duplicate afterwards.
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   286
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   287
  if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
56162
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   288
    CC_HIGHEST="-fns -fsimple -fsingle -xbuiltin=%all -xdepend -xrestrict -xlibmil"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   289
56162
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   290
    C_O_FLAG_HIGHEST_JVM="-xO4"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   291
    C_O_FLAG_DEBUG_JVM=""
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   292
    C_O_FLAG_SIZE=""
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   293
    C_O_FLAG_DEBUG=""
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   294
    C_O_FLAG_NONE=""
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   295
    if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86"; then
56162
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   296
      C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   297
      C_O_FLAG_HI="-xO4 -Wu,-O4~yz"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   298
      C_O_FLAG_NORM="-xO2 -Wu,-O2~yz"
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   299
    elif test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then
56168
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
   300
      C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 \
cb0b10e44247 Cleaning up.
ihse
parents: 56162
diff changeset
   301
          -xprefetch=auto,explicit -xchip=ultra $CC_HIGHEST"
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   302
      C_O_FLAG_HI="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0"
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   303
      C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0"
56162
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   304
    fi
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   305
  elif test "x$TOOLCHAIN_TYPE" = xgcc; then
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   306
    C_O_FLAG_HIGHEST_JVM="-O3"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   307
    C_O_FLAG_HIGHEST="-O3"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   308
    C_O_FLAG_HI="-O3"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   309
    C_O_FLAG_NORM="-O2"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   310
    C_O_FLAG_SIZE="-Os"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   311
    C_O_FLAG_DEBUG="-O0"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   312
    C_O_FLAG_DEBUG_JVM="-O0"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   313
    C_O_FLAG_NONE="-O0"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   314
  elif test "x$TOOLCHAIN_TYPE" = xclang; then
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   315
    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   316
      # On MacOSX we optimize for size, something
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   317
      # we should do for all platforms?
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   318
      C_O_FLAG_HIGHEST_JVM="-Os"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   319
      C_O_FLAG_HIGHEST="-Os"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   320
      C_O_FLAG_HI="-Os"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   321
      C_O_FLAG_NORM="-Os"
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
   322
      C_O_FLAG_DEBUG_JVM=""
56162
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   323
    else
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   324
      C_O_FLAG_HIGHEST_JVM="-O3"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   325
      C_O_FLAG_HIGHEST="-O3"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   326
      C_O_FLAG_HI="-O3"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   327
      C_O_FLAG_NORM="-O2"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   328
      C_O_FLAG_DEBUG_JVM="-O0"
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   329
    fi
56162
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   330
    C_O_FLAG_SIZE="-Os"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   331
    C_O_FLAG_DEBUG="-O0"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   332
    C_O_FLAG_NONE="-O0"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   333
  elif test "x$TOOLCHAIN_TYPE" = xxlc; then
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   334
    C_O_FLAG_HIGHEST_JVM="-O3 -qhot=level=1 -qinline -qinlglue"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   335
    C_O_FLAG_HIGHEST="-O3 -qhot=level=1 -qinline -qinlglue"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   336
    C_O_FLAG_HI="-O3 -qinline -qinlglue"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   337
    C_O_FLAG_NORM="-O2"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   338
    C_O_FLAG_DEBUG="-qnoopt"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   339
    # FIXME: Value below not verified.
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   340
    C_O_FLAG_DEBUG_JVM=""
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   341
    C_O_FLAG_NONE="-qnoopt"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   342
  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   343
    C_O_FLAG_HIGHEST_JVM="-O2 -Oy-"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   344
    C_O_FLAG_HIGHEST="-O2"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   345
    C_O_FLAG_HI="-O1"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   346
    C_O_FLAG_NORM="-O1"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   347
    C_O_FLAG_DEBUG="-Od"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   348
    C_O_FLAG_DEBUG_JVM=""
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   349
    C_O_FLAG_NONE="-Od"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   350
    C_O_FLAG_SIZE="-Os"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   351
  fi
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   352
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   353
  # Now copy to C++ flags
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   354
  CXX_O_FLAG_HIGHEST_JVM="$C_O_FLAG_HIGHEST_JVM"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   355
  CXX_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   356
  CXX_O_FLAG_HI="$C_O_FLAG_HI"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   357
  CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   358
  CXX_O_FLAG_DEBUG="$C_O_FLAG_DEBUG"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   359
  CXX_O_FLAG_DEBUG_JVM="$C_O_FLAG_DEBUG_JVM"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   360
  CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   361
  CXX_O_FLAG_SIZE="$C_O_FLAG_SIZE"
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   362
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   363
  if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   364
    # In solstudio, also add this to C (but not C++) flags...
d421dac1932f Remove duplication in debug flags.
ihse
parents: 56161
diff changeset
   365
    C_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST -xalias_level=basic"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   366
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   367
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   368
  # Adjust optimization flags according to debug level.
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   369
  case $DEBUG_LEVEL in
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   370
    release )
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   371
      # no adjustment
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   372
      ;;
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   373
    fastdebug )
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   374
      # Not quite so much optimization
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   375
      C_O_FLAG_HI="$C_O_FLAG_NORM"
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   376
      CXX_O_FLAG_HI="$CXX_O_FLAG_NORM"
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   377
      ;;
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   378
    slowdebug )
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   379
      # Disable optimization
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
   380
      C_O_FLAG_HIGHEST_JVM="$C_O_FLAG_DEBUG_JVM"
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   381
      C_O_FLAG_HIGHEST="$C_O_FLAG_DEBUG"
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   382
      C_O_FLAG_HI="$C_O_FLAG_DEBUG"
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   383
      C_O_FLAG_NORM="$C_O_FLAG_DEBUG"
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
   384
      C_O_FLAG_SIZE="$C_O_FLAG_DEBUG"
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
   385
      CXX_O_FLAG_HIGHEST_JVM="$CXX_O_FLAG_DEBUG_JVM"
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   386
      CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_DEBUG"
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   387
      CXX_O_FLAG_HI="$CXX_O_FLAG_DEBUG"
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   388
      CXX_O_FLAG_NORM="$CXX_O_FLAG_DEBUG"
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
   389
      CXX_O_FLAG_SIZE="$CXX_O_FLAG_DEBUG"
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   390
      ;;
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   391
  esac
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   392
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
   393
  AC_SUBST(C_O_FLAG_HIGHEST_JVM)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   394
  AC_SUBST(C_O_FLAG_HIGHEST)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   395
  AC_SUBST(C_O_FLAG_HI)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   396
  AC_SUBST(C_O_FLAG_NORM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   397
  AC_SUBST(C_O_FLAG_NONE)
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
   398
  AC_SUBST(C_O_FLAG_SIZE)
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
   399
  AC_SUBST(CXX_O_FLAG_HIGHEST_JVM)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   400
  AC_SUBST(CXX_O_FLAG_HIGHEST)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   401
  AC_SUBST(CXX_O_FLAG_HI)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   402
  AC_SUBST(CXX_O_FLAG_NORM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   403
  AC_SUBST(CXX_O_FLAG_NONE)
37402
62b5f067032e 8152666: The new Hotspot Build System
erikj
parents: 36541
diff changeset
   404
  AC_SUBST(CXX_O_FLAG_SIZE)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   405
])