make/autoconf/flags.m4
author ihse
Mon, 26 Feb 2018 14:25:00 +0100
branchihse-cflags-rewrite-branch
changeset 56178 7e63ac6274dd
parent 56177 2fbe3b84ee3d
child 56179 dc0add3a3212
permissions -rw-r--r--
Move all CFLAGS handling to cflags.m4.
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
56154
af8654dcd46a Fix syntax errors.
ihse
parents: 56153
diff changeset
    26
m4_include([flags-cflags.m4])
56150
37625ab20ec7 Move LDFLAGS handling to flags-ldflags.m4.
ihse
parents: 56149
diff changeset
    27
m4_include([flags-ldflags.m4])
56154
af8654dcd46a Fix syntax errors.
ihse
parents: 56153
diff changeset
    28
m4_include([flags-other.m4])
56150
37625ab20ec7 Move LDFLAGS handling to flags-ldflags.m4.
ihse
parents: 56149
diff changeset
    29
56170
d509ae946997 Improve sorting of flags.
ihse
parents: 56162
diff changeset
    30
# Sort the flags in a given variable, and remove superfluous whitespace.
d509ae946997 Improve sorting of flags.
ihse
parents: 56162
diff changeset
    31
#
d509ae946997 Improve sorting of flags.
ihse
parents: 56162
diff changeset
    32
# $1 = name of variable to sort
d509ae946997 Improve sorting of flags.
ihse
parents: 56162
diff changeset
    33
AC_DEFUN([FLAGS_SORT_FLAGS], [
d509ae946997 Improve sorting of flags.
ihse
parents: 56162
diff changeset
    34
  $1=`$ECHO ${$1} | $TR ' ' '\n' | $SORT | $TR '\n' ' '`
d509ae946997 Improve sorting of flags.
ihse
parents: 56162
diff changeset
    35
])
d509ae946997 Improve sorting of flags.
ihse
parents: 56162
diff changeset
    36
42538
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    37
################################################################################
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    38
#
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    39
# Setup ABI profile (for arm)
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    40
#
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    41
AC_DEFUN([FLAGS_SETUP_ABI_PROFILE],
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    42
[
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    43
  AC_ARG_WITH(abi-profile, [AS_HELP_STRING([--with-abi-profile],
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    44
      [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    45
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    46
  if test "x$with_abi_profile" != x; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    47
    if test "x$OPENJDK_TARGET_CPU" != xarm && \
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    48
        test "x$OPENJDK_TARGET_CPU" != xaarch64; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    49
      AC_MSG_ERROR([--with-abi-profile only available on arm/aarch64])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    50
    fi
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    51
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    52
    OPENJDK_TARGET_ABI_PROFILE=$with_abi_profile
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    53
    AC_MSG_CHECKING([for ABI profle])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    54
    AC_MSG_RESULT([$OPENJDK_TARGET_ABI_PROFILE])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    55
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    56
    if test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-vfp-sflt; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    57
      ARM_FLOAT_TYPE=vfp-sflt
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    58
      ARM_ARCH_TYPE_FLAGS='-march=armv7-a -mthumb'
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    59
    elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-vfp-hflt; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    60
      ARM_FLOAT_TYPE=vfp-hflt
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    61
      ARM_ARCH_TYPE_FLAGS='-march=armv7-a -mthumb'
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    62
    elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    63
      ARM_FLOAT_TYPE=sflt
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    64
      ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    65
    elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    66
      ARM_FLOAT_TYPE=vfp-sflt
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    67
      ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    68
    elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv6-vfp-hflt; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    69
      ARM_FLOAT_TYPE=vfp-hflt
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    70
      ARM_ARCH_TYPE_FLAGS='-march=armv6 -marm'
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    71
    elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm64; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    72
      # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    73
      ARM_FLOAT_TYPE=
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    74
      ARM_ARCH_TYPE_FLAGS=
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    75
    elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xaarch64; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    76
      # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    77
      ARM_FLOAT_TYPE=
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    78
      ARM_ARCH_TYPE_FLAGS=
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    79
    else
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    80
      AC_MSG_ERROR([Invalid ABI profile: "$OPENJDK_TARGET_ABI_PROFILE"])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    81
    fi
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    82
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    83
    if test "x$ARM_FLOAT_TYPE" = xvfp-sflt; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    84
      ARM_FLOAT_TYPE_FLAGS='-mfloat-abi=softfp -mfpu=vfp -DFLOAT_ARCH=-vfp-sflt'
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    85
    elif test "x$ARM_FLOAT_TYPE" = xvfp-hflt; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    86
      ARM_FLOAT_TYPE_FLAGS='-mfloat-abi=hard -mfpu=vfp -DFLOAT_ARCH=-vfp-hflt'
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    87
    elif test "x$ARM_FLOAT_TYPE" = xsflt; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    88
      ARM_FLOAT_TYPE_FLAGS='-msoft-float -mfpu=vfp'
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    89
    fi
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    90
    AC_MSG_CHECKING([for $ARM_FLOAT_TYPE floating point flags])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    91
    AC_MSG_RESULT([$ARM_FLOAT_TYPE_FLAGS])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    92
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    93
    AC_MSG_CHECKING([for arch type flags])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    94
    AC_MSG_RESULT([$ARM_ARCH_TYPE_FLAGS])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    95
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    96
    # Now set JDK_ARCH_ABI_PROP_NAME. This is equivalent to the last part of the
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    97
    # autoconf target triplet.
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    98
    [ JDK_ARCH_ABI_PROP_NAME=`$ECHO $OPENJDK_TARGET_AUTOCONF_NAME | $SED -e 's/.*-\([^-]*\)$/\1/'` ]
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
    99
    # Sanity check that it is a known ABI.
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   100
    if test "x$JDK_ARCH_ABI_PROP_NAME" != xgnu && \
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   101
        test "x$JDK_ARCH_ABI_PROP_NAME" != xgnueabi  && \
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   102
        test "x$JDK_ARCH_ABI_PROP_NAME" != xgnueabihf; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   103
          AC_MSG_WARN([Unknown autoconf target triplet ABI: "$JDK_ARCH_ABI_PROP_NAME"])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   104
    fi
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   105
    AC_MSG_CHECKING([for ABI property name])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   106
    AC_MSG_RESULT([$JDK_ARCH_ABI_PROP_NAME])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   107
    AC_SUBST(JDK_ARCH_ABI_PROP_NAME)
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   108
  fi
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   109
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   110
  # When building with an abi profile, the name of that profile is appended on the
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   111
  # bundle platform, which is used in bundle names.
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   112
  if test "x$OPENJDK_TARGET_ABI_PROFILE" != x; then
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   113
    OPENJDK_TARGET_BUNDLE_PLATFORM="$OPENJDK_TARGET_OS_BUNDLE-$OPENJDK_TARGET_ABI_PROFILE"
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   114
  fi
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   115
])
973e43884dba 8168503: JEP 297: Unified arm32/arm64 Port
bobv
parents: 42530
diff changeset
   116
56176
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   117
AC_DEFUN([FLAGS_SETUP_MACOSX_VERSION],
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   118
[
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   119
  # Additional macosx handling
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   120
  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   121
    # MACOSX_VERSION_MIN specifies the lowest version of Macosx that the built
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   122
    # binaries should be compatible with, even if compiled on a newer version
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   123
    # of the OS. It currently has a hard coded value. Setting this also limits
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   124
    # exposure to API changes in header files. Bumping this is likely to
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   125
    # require code changes to build.
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   126
    MACOSX_VERSION_MIN=10.7.0
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   127
    MACOSX_VERSION_MIN_NODOTS=1070
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   128
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   129
    AC_SUBST(MACOSX_VERSION_MIN)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   130
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   131
    # Setting --with-macosx-version-max=<version> makes it an error to build or
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   132
    # link to macosx APIs that are newer than the given OS version. The expected
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   133
    # format for <version> is either nn.n.n or nn.nn.nn. See /usr/include/AvailabilityMacros.h.
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   134
    AC_ARG_WITH([macosx-version-max], [AS_HELP_STRING([--with-macosx-version-max],
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   135
        [error on use of newer functionality. @<:@macosx@:>@])],
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   136
        [
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   137
          if echo "$with_macosx_version_max" | $GREP -q "^[[0-9]][[0-9]]\.[[0-9]]\.[[0-9]]\$"; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   138
              MACOSX_VERSION_MAX=$with_macosx_version_max
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   139
          elif echo "$with_macosx_version_max" | $GREP -q "^[[0-9]][[0-9]]\.[[0-9]][[0-9]]\.[[0-9]][[0-9]]\$"; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   140
              MACOSX_VERSION_MAX=$with_macosx_version_max
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   141
          elif test "x$with_macosx_version_max" = "xno"; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   142
              # Use build system default
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   143
              MACOSX_VERSION_MAX=
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   144
          else
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   145
              AC_MSG_ERROR([osx version format must be nn.n.n or nn.nn.nn])
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   146
          fi
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   147
        ],
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   148
        [MACOSX_VERSION_MAX=]
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   149
    )
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   150
    MACOSX_VERSION_MAX_NODOTS=`$ECHO $MACOSX_VERSION_MAX | $TR -d .`
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   151
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   152
    AC_SUBST(MACOSX_VERSION_MAX)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   153
  fi
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   154
])
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   155
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   156
# Reset the global CFLAGS/LDFLAGS variables and initialize them with the
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   157
# corresponding configure arguments instead
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   158
AC_DEFUN_ONCE([FLAGS_SETUP_USER_SUPPLIED_FLAGS],
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   159
[
56161
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   160
  if test "x$CFLAGS" != "x"; then
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   161
    AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags])
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   162
  fi
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   163
56161
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   164
  if test "x$CXXFLAGS" != "x"; then
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   165
    AC_MSG_WARN([Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags])
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   166
  fi
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   167
56161
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   168
  if test "x$LDFLAGS" != "x"; then
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   169
    AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags])
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   170
  fi
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   171
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   172
  AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags],
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   173
      [extra flags to be used when compiling jdk c-files])])
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   174
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   175
  AC_ARG_WITH(extra-cxxflags, [AS_HELP_STRING([--with-extra-cxxflags],
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   176
      [extra flags to be used when compiling jdk c++-files])])
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   177
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   178
  AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags],
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   179
      [extra flags to be used when linking jdk])])
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   180
56161
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   181
  USER_CFLAGS="$with_extra_cflags"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   182
  USER_CXXFLAGS="$with_extra_cxxflags"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   183
  USER_LDFLAGS="$with_extra_ldflags"
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   184
])
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   185
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   186
# Setup the sysroot flags and add them to global CFLAGS and LDFLAGS so
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   187
# that configure can use them while detecting compilers.
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   188
# TOOLCHAIN_TYPE is available here.
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   189
# Param 1 - Optional prefix to all variables. (e.g BUILD_)
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   190
AC_DEFUN([FLAGS_SETUP_SYSROOT_FLAGS],
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   191
[
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   192
  if test "x[$]$1SYSROOT" != "x"; then
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   193
    if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   194
      if test "x$OPENJDK_TARGET_OS" = xsolaris; then
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   195
        # Solaris Studio does not have a concept of sysroot. Instead we must
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   196
        # make sure the default include and lib dirs are appended to each
35450
0124e2c9ef64 8148929: Suboptimal code generated when setting sysroot include with Solaris Studio
erikj
parents: 35444
diff changeset
   197
        # compile and link command line. Must also add -I-xbuiltin to enable
0124e2c9ef64 8148929: Suboptimal code generated when setting sysroot include with Solaris Studio
erikj
parents: 35444
diff changeset
   198
        # inlining of system functions and intrinsics.
0124e2c9ef64 8148929: Suboptimal code generated when setting sysroot include with Solaris Studio
erikj
parents: 35444
diff changeset
   199
        $1SYSROOT_CFLAGS="-I-xbuiltin -I[$]$1SYSROOT/usr/include"
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   200
        $1SYSROOT_LDFLAGS="-L[$]$1SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \
41040
7b919a4497ff 8165161: Solaris: /usr/ccs /opt/sfw and /opt/csw are dead, references should be expunged
alanbur
parents: 39940
diff changeset
   201
            -L[$]$1SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR"
48909
54b423e1c4cf 8153294: Solaris devkit uses linker from system instead of in devkit
erikj
parents: 48854
diff changeset
   202
        # If the devkit contains the ld linker, make sure we use it.
54b423e1c4cf 8153294: Solaris devkit uses linker from system instead of in devkit
erikj
parents: 48854
diff changeset
   203
        AC_PATH_PROG(SOLARIS_LD, ld, , $DEVKIT_TOOLCHAIN_PATH:$DEVKIT_EXTRA_PATH)
54b423e1c4cf 8153294: Solaris devkit uses linker from system instead of in devkit
erikj
parents: 48854
diff changeset
   204
        # Make sure this ld is runnable.
54b423e1c4cf 8153294: Solaris devkit uses linker from system instead of in devkit
erikj
parents: 48854
diff changeset
   205
        if test -f "$SOLARIS_LD"; then
54b423e1c4cf 8153294: Solaris devkit uses linker from system instead of in devkit
erikj
parents: 48854
diff changeset
   206
          if "$SOLARIS_LD" -V > /dev/null 2> /dev/null; then
54b423e1c4cf 8153294: Solaris devkit uses linker from system instead of in devkit
erikj
parents: 48854
diff changeset
   207
            $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -Yl,$(dirname $SOLARIS_LD)"
54b423e1c4cf 8153294: Solaris devkit uses linker from system instead of in devkit
erikj
parents: 48854
diff changeset
   208
          else
54b423e1c4cf 8153294: Solaris devkit uses linker from system instead of in devkit
erikj
parents: 48854
diff changeset
   209
            AC_MSG_WARN([Could not run $SOLARIS_LD found in devkit, reverting to system ld])
54b423e1c4cf 8153294: Solaris devkit uses linker from system instead of in devkit
erikj
parents: 48854
diff changeset
   210
          fi
54b423e1c4cf 8153294: Solaris devkit uses linker from system instead of in devkit
erikj
parents: 48854
diff changeset
   211
        fi
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   212
      fi
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   213
    elif test "x$TOOLCHAIN_TYPE" = xgcc; then
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   214
      $1SYSROOT_CFLAGS="--sysroot=[$]$1SYSROOT"
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   215
      $1SYSROOT_LDFLAGS="--sysroot=[$]$1SYSROOT"
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   216
    elif test "x$TOOLCHAIN_TYPE" = xclang; then
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   217
      $1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT"
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   218
      $1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT"
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   219
    fi
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   220
  fi
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   221
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   222
  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   223
    # We also need -iframework<path>/System/Library/Frameworks
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   224
    $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -iframework [$]$1SYSROOT/System/Library/Frameworks"
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   225
    $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -iframework [$]$1SYSROOT/System/Library/Frameworks"
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   226
    # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   227
    # set this here so it doesn't have to be peppered throughout the forest
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   228
    $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   229
    $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -F [$]$1SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks"
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   230
  fi
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   231
33395
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   232
  AC_SUBST($1SYSROOT_CFLAGS)
5907d5b1287c 8140593: Add configure parameter for devkit for the build compiler
erikj
parents: 33394
diff changeset
   233
  AC_SUBST($1SYSROOT_LDFLAGS)
32810
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   234
])
8203e52cd373 8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents: 30856
diff changeset
   235
56177
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   236
AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
56161
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   237
[
56177
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   238
  # We should always include user supplied flags
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   239
  FLAGS_SETUP_USER_SUPPLIED_FLAGS
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   240
  # The sysroot flags are needed for configure to be able to run the compilers
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   241
  FLAGS_SETUP_SYSROOT_FLAGS
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   242
56161
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   243
  if test "x$TOOLCHAIN_TYPE" = xxlc; then
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   244
    MACHINE_FLAG="-q${OPENJDK_TARGET_CPU_BITS}"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   245
  elif test "x$TOOLCHAIN_TYPE" != xmicrosoft; then
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   246
    MACHINE_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   247
  fi
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   248
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   249
  # FIXME: global flags are not used yet...
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   250
  # The "global" flags will *always* be set. Without them, it is not possible to
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   251
  # get a working compilation.
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   252
  GLOBAL_CFLAGS="$MACHINE_FLAG $SYSROOT_CFLAGS $USER_CFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   253
  GLOBAL_CXXFLAGS="$MACHINE_FLAG $SYSROOT_CFLAGS $USER_CXXFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   254
  GLOBAL_LDFLAGS="$MACHINE_FLAG $SYSROOT_LDFLAGS $USER_LDFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   255
  # FIXME: Don't really know how to do with this, but this was the old behavior
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   256
  GLOBAL_CPPFLAGS="$SYSROOT_CFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   257
  AC_SUBST(GLOBAL_CFLAGS)
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   258
  AC_SUBST(GLOBAL_CXXFLAGS)
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   259
  AC_SUBST(GLOBAL_LDFLAGS)
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   260
  AC_SUBST(GLOBAL_CPPFLAGS)
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   261
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   262
  # FIXME: For compatilibity, export this as EXTRA_CFLAGS for now.
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   263
  EXTRA_CFLAGS="$MACHINE_FLAG $USER_CFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   264
  EXTRA_CXXFLAGS="$MACHINE_FLAG $USER_CXXFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   265
  EXTRA_LDFLAGS="$MACHINE_FLAG $USER_LDFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   266
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   267
  AC_SUBST(EXTRA_CFLAGS)
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   268
  AC_SUBST(EXTRA_CXXFLAGS)
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   269
  AC_SUBST(EXTRA_LDFLAGS)
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   270
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   271
  # For autoconf testing to work, the global flags must also be stored in the
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   272
  # "unnamed" CFLAGS etc.
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   273
  CFLAGS="$GLOBAL_CFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   274
  CXXFLAGS="$GLOBAL_CXXFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   275
  LDFLAGS="$GLOBAL_LDFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   276
  CPPFLAGS="$GLOBAL_CPPFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   277
])
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   278
56176
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   279
AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   280
[
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   281
  # COMPILER_TARGET_BITS_FLAG  : option for selecting 32- or 64-bit output
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   282
  # COMPILER_COMMAND_FILE_FLAG : option for passing a command file to the compiler
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   283
  # COMPILER_BINDCMD_FILE_FLAG : option for specifying a file which saves the binder
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   284
  #                              commands produced by the link step (currently AIX only)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   285
  if test "x$TOOLCHAIN_TYPE" = xxlc; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   286
    COMPILER_TARGET_BITS_FLAG="-q"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   287
    COMPILER_COMMAND_FILE_FLAG="-f"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   288
    COMPILER_BINDCMD_FILE_FLAG="-bloadmap:"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   289
  else
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   290
    COMPILER_TARGET_BITS_FLAG="-m"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   291
    COMPILER_COMMAND_FILE_FLAG="@"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   292
    COMPILER_BINDCMD_FILE_FLAG=""
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   293
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   294
    # The solstudio linker does not support @-files.
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   295
    if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   296
      COMPILER_COMMAND_FILE_FLAG=
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   297
    fi
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   298
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   299
    # Check if @file is supported by gcc
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   300
    if test "x$TOOLCHAIN_TYPE" = xgcc; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   301
      AC_MSG_CHECKING([if @file is supported by gcc])
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   302
      # Extra emtpy "" to prevent ECHO from interpreting '--version' as argument
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   303
      $ECHO "" "--version" > command.file
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   304
      if $CXX @command.file 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   305
        AC_MSG_RESULT(yes)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   306
        COMPILER_COMMAND_FILE_FLAG="@"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   307
      else
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   308
        AC_MSG_RESULT(no)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   309
        COMPILER_COMMAND_FILE_FLAG=
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   310
      fi
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   311
      $RM command.file
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   312
    fi
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   313
  fi
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   314
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   315
  AC_SUBST(COMPILER_TARGET_BITS_FLAG)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   316
  AC_SUBST(COMPILER_COMMAND_FILE_FLAG)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   317
  AC_SUBST(COMPILER_BINDCMD_FILE_FLAG)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   318
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   319
  # Check that the compiler supports -mX (or -qX on AIX) flags
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   320
  # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   321
  FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}],
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   322
      IF_TRUE: [COMPILER_SUPPORTS_TARGET_BITS_FLAG=true],
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   323
      IF_FALSE: [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false])
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   324
  AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   325
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   326
  if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   327
    CC_OUT_OPTION=-Fo
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   328
    EXE_OUT_OPTION=-out:
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   329
    LD_OUT_OPTION=-out:
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   330
    AR_OUT_OPTION=-out:
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   331
  else
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   332
    # The option used to specify the target .o,.a or .so file.
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   333
    # When compiling, how to specify the to be created object file.
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   334
    CC_OUT_OPTION='-o$(SPACE)'
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   335
    # When linking, how to specify the to be created executable.
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   336
    EXE_OUT_OPTION='-o$(SPACE)'
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   337
    # When linking, how to specify the to be created dynamically linkable library.
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   338
    LD_OUT_OPTION='-o$(SPACE)'
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   339
    # When archiving, how to specify the to be create static archive for object files.
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   340
    AR_OUT_OPTION='rcs$(SPACE)'
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   341
  fi
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   342
  AC_SUBST(CC_OUT_OPTION)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   343
  AC_SUBST(EXE_OUT_OPTION)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   344
  AC_SUBST(LD_OUT_OPTION)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   345
  AC_SUBST(AR_OUT_OPTION)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   346
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   347
  # Generate make dependency files
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   348
  if test "x$TOOLCHAIN_TYPE" = xgcc; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   349
    C_FLAG_DEPS="-MMD -MF"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   350
  elif test "x$TOOLCHAIN_TYPE" = xclang; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   351
    C_FLAG_DEPS="-MMD -MF"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   352
  elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   353
    C_FLAG_DEPS="-xMMD -xMF"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   354
  elif test "x$TOOLCHAIN_TYPE" = xxlc; then
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   355
    C_FLAG_DEPS="-qmakedep=gcc -MF"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   356
  fi
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   357
  CXX_FLAG_DEPS="$C_FLAG_DEPS"
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   358
  AC_SUBST(C_FLAG_DEPS)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   359
  AC_SUBST(CXX_FLAG_DEPS)
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   360
])
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   361
56177
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   362
AC_DEFUN_ONCE([FLAGS_POST_TOOLCHAIN],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   363
[
56124
b2b9dfdc39c8 Start breaking out stuff from flags.m4.
ihse
parents: 48854
diff changeset
   364
  FLAGS_SETUP_TOOLCHAIN_CONTROL
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   365
56161
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   366
  if test "x$BUILD_SYSROOT" != x; then
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   367
    FLAGS_SETUP_SYSROOT_FLAGS([BUILD_])
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   368
  else
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   369
    BUILD_SYSROOT_CFLAGS="$SYSROOT_CFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   370
    BUILD_SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS"
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   371
  fi
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   372
  AC_SUBST(BUILD_SYSROOT_CFLAGS)
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   373
  AC_SUBST(BUILD_SYSROOT_LDFLAGS)
a7585ecb9fc2 Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents: 56158
diff changeset
   374
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   375
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   376
56177
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   377
AC_DEFUN([FLAGS_SETUP_FLAGS],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   378
[
56176
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   379
  FLAGS_SETUP_MACOSX_VERSION
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   380
  FLAGS_SETUP_ABI_PROFILE
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   381
56176
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   382
  FLAGS_SETUP_SHARED_LIBS
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   383
  FLAGS_SETUP_DEBUG_SYMBOLS
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   384
  FLAGS_SETUP_QUALITY_CHECKS
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   385
  FLAGS_SETUP_OPTIMIZATION
56177
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   386
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   387
  FLAGS_SETUP_CFLAGS
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   388
  FLAGS_SETUP_LDFLAGS
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   389
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   390
  FLAGS_SETUP_ARFLAGS
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   391
  FLAGS_SETUP_STRIPFLAGS
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   392
  FLAGS_SETUP_RCFLAGS
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   393
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   394
  FLAGS_SETUP_ASFLAGS
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   395
  FLAGS_SETUP_ASFLAGS_CPU_DEP([TARGET])
2fbe3b84ee3d Even more restructuring.
ihse
parents: 56176
diff changeset
   396
  FLAGS_SETUP_ASFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
56176
b3e3a12dcb33 Lots of structural rearrangements. Also fix for adding EXTRA_FLAGS to BUILD
ihse
parents: 56175
diff changeset
   397
])
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22715
diff changeset
   398
36535
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   399
# FLAGS_C_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARGUMENT], IF_TRUE: [RUN-IF-TRUE],
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   400
#                                  IF_FALSE: [RUN-IF-FALSE])
16987
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   401
# ------------------------------------------------------------
36535
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   402
# Check that the C compiler supports an argument
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   403
BASIC_DEFUN_NAMED([FLAGS_C_COMPILER_CHECK_ARGUMENTS],
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   404
    [*ARGUMENT IF_TRUE IF_FALSE], [$@],
16987
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   405
[
36535
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   406
  AC_MSG_CHECKING([if the C compiler supports "ARG_ARGUMENT"])
16987
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   407
  supports=yes
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   408
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   409
  saved_cflags="$CFLAGS"
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   410
  CFLAGS="$CFLAGS ARG_ARGUMENT"
16987
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   411
  AC_LANG_PUSH([C])
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   412
  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [],
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   413
      [supports=no])
16987
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   414
  AC_LANG_POP([C])
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   415
  CFLAGS="$saved_cflags"
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   416
36535
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   417
  AC_MSG_RESULT([$supports])
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   418
  if test "x$supports" = "xyes" ; then
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   419
    :
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   420
    ARG_IF_TRUE
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   421
  else
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   422
    :
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   423
    ARG_IF_FALSE
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   424
  fi
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   425
])
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   426
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   427
# FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARGUMENT], IF_TRUE: [RUN-IF-TRUE],
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   428
#                                    IF_FALSE: [RUN-IF-FALSE])
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   429
# ------------------------------------------------------------
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   430
# Check that the C++ compiler supports an argument
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   431
BASIC_DEFUN_NAMED([FLAGS_CXX_COMPILER_CHECK_ARGUMENTS],
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   432
    [*ARGUMENT IF_TRUE IF_FALSE], [$@],
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   433
[
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   434
  AC_MSG_CHECKING([if the C++ compiler supports "ARG_ARGUMENT"])
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   435
  supports=yes
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   436
16987
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   437
  saved_cxxflags="$CXXFLAGS"
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   438
  CXXFLAGS="$CXXFLAG ARG_ARGUMENT"
16987
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   439
  AC_LANG_PUSH([C++])
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   440
  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [],
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20362
diff changeset
   441
      [supports=no])
16987
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   442
  AC_LANG_POP([C++])
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   443
  CXXFLAGS="$saved_cxxflags"
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   444
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   445
  AC_MSG_RESULT([$supports])
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   446
  if test "x$supports" = "xyes" ; then
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   447
    :
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   448
    ARG_IF_TRUE
16987
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   449
  else
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   450
    :
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   451
    ARG_IF_FALSE
16987
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   452
  fi
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   453
])
19305cbf4362 8013786: JDK-8013480 broke configure on solaris
erikj
parents: 16582
diff changeset
   454
36535
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   455
# FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARGUMENT], IF_TRUE: [RUN-IF-TRUE],
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   456
#                                IF_FALSE: [RUN-IF-FALSE])
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   457
# ------------------------------------------------------------
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   458
# Check that the C and C++ compilers support an argument
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   459
BASIC_DEFUN_NAMED([FLAGS_COMPILER_CHECK_ARGUMENTS],
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   460
    [*ARGUMENT IF_TRUE IF_FALSE], [$@],
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   461
[
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   462
  FLAGS_C_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARG_ARGUMENT],
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   463
  					     IF_TRUE: [C_COMP_SUPPORTS="yes"],
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   464
					     IF_FALSE: [C_COMP_SUPPORTS="no"])
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   465
  FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARG_ARGUMENT],
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   466
  					       IF_TRUE: [CXX_COMP_SUPPORTS="yes"],
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   467
					       IF_FALSE: [CXX_COMP_SUPPORTS="no"])
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   468
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   469
  AC_MSG_CHECKING([if both compilers support "ARG_ARGUMENT"])
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   470
  supports=no
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   471
  if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
42141
06c697759688 7164925: Change -KPIC to -xcode=pic32 on sparc
ihse
parents: 42140
diff changeset
   472
36535
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   473
  AC_MSG_RESULT([$supports])
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   474
  if test "x$supports" = "xyes" ; then
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   475
    :
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   476
    ARG_IF_TRUE
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   477
  else
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   478
    :
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   479
    ARG_IF_FALSE
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   480
  fi
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   481
])
141db8da8c18 8151841: Build needs additional flags to compile with GCC 6
andrew
parents: 36531
diff changeset
   482
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   483
# FLAGS_LINKER_CHECK_ARGUMENTS(ARGUMENT: [ARGUMENT], IF_TRUE: [RUN-IF-TRUE],
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   484
#                                   IF_FALSE: [RUN-IF-FALSE])
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   485
# ------------------------------------------------------------
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   486
# Check that the linker support an argument
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   487
BASIC_DEFUN_NAMED([FLAGS_LINKER_CHECK_ARGUMENTS],
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   488
    [*ARGUMENT IF_TRUE IF_FALSE], [$@],
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   489
[
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   490
  AC_MSG_CHECKING([if linker supports "ARG_ARGUMENT"])
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   491
  supports=yes
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   492
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   493
  saved_ldflags="$LDFLAGS"
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   494
  LDFLAGS="$LDFLAGS ARG_ARGUMENT"
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   495
  AC_LANG_PUSH([C])
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   496
  AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   497
      [], [supports=no])
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   498
  AC_LANG_POP([C])
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   499
  LDFLAGS="$saved_ldflags"
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   500
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   501
  AC_MSG_RESULT([$supports])
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   502
  if test "x$supports" = "xyes" ; then
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   503
    :
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   504
    ARG_IF_TRUE
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   505
  else
34923
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   506
    :
0a2be16ce53d 8146995: Introduce named arguments in configure
ihse
parents: 34864
diff changeset
   507
    ARG_IF_FALSE
24911
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   508
  fi
a039e17f8896 8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents: 23981
diff changeset
   509
])