common/autoconf/platform.m4
author alexsch
Tue, 22 Jul 2014 13:23:01 +0400
changeset 25793 56060390dd25
parent 25040 09052d7f1467
child 25854 98ce0879ab4c
permissions -rw-r--r--
8030051: Check class loaders usage in Swing classes Reviewed-by: serb, pchelko
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     2
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    26
# Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    27
# Converts autoconf style CPU name to OpenJDK style, into
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    28
# VAR_CPU, VAR_CPU_ARCH, VAR_CPU_BITS and VAR_CPU_ENDIAN.
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    29
AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    30
[
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    31
  # First argument is the cpu name from the trip/quad
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    32
  case "$1" in
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    33
    x86_64)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    34
      VAR_CPU=x86_64
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    35
      VAR_CPU_ARCH=x86
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    36
      VAR_CPU_BITS=64
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    37
      VAR_CPU_ENDIAN=little
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    38
      ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    39
    i?86)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    40
      VAR_CPU=x86
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    41
      VAR_CPU_ARCH=x86
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    42
      VAR_CPU_BITS=32
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    43
      VAR_CPU_ENDIAN=little
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    44
      ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    45
    arm*)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    46
      VAR_CPU=arm
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    47
      VAR_CPU_ARCH=arm
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    48
      VAR_CPU_BITS=32
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    49
      VAR_CPU_ENDIAN=little
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    50
      ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    51
    powerpc)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    52
      VAR_CPU=ppc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    53
      VAR_CPU_ARCH=ppc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    54
      VAR_CPU_BITS=32
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    55
      VAR_CPU_ENDIAN=big
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
    56
      ;;
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    57
    powerpc64)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    58
      VAR_CPU=ppc64
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    59
      VAR_CPU_ARCH=ppc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    60
      VAR_CPU_BITS=64
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    61
      VAR_CPU_ENDIAN=big
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
    62
      ;;
23437
e3f4c0b99422 8036767: PPC64: Support for little endian execution model
kvn
parents: 22467
diff changeset
    63
    powerpc64le)
e3f4c0b99422 8036767: PPC64: Support for little endian execution model
kvn
parents: 22467
diff changeset
    64
      VAR_CPU=ppc64
e3f4c0b99422 8036767: PPC64: Support for little endian execution model
kvn
parents: 22467
diff changeset
    65
      VAR_CPU_ARCH=ppc
e3f4c0b99422 8036767: PPC64: Support for little endian execution model
kvn
parents: 22467
diff changeset
    66
      VAR_CPU_BITS=64
e3f4c0b99422 8036767: PPC64: Support for little endian execution model
kvn
parents: 22467
diff changeset
    67
      VAR_CPU_ENDIAN=little
e3f4c0b99422 8036767: PPC64: Support for little endian execution model
kvn
parents: 22467
diff changeset
    68
      ;;
19676
2c525ed65d4c 8024320: Add s390(x) detection to platform.m4
omajid
parents: 19260
diff changeset
    69
    s390)
2c525ed65d4c 8024320: Add s390(x) detection to platform.m4
omajid
parents: 19260
diff changeset
    70
      VAR_CPU=s390
2c525ed65d4c 8024320: Add s390(x) detection to platform.m4
omajid
parents: 19260
diff changeset
    71
      VAR_CPU_ARCH=s390
2c525ed65d4c 8024320: Add s390(x) detection to platform.m4
omajid
parents: 19260
diff changeset
    72
      VAR_CPU_BITS=32
2c525ed65d4c 8024320: Add s390(x) detection to platform.m4
omajid
parents: 19260
diff changeset
    73
      VAR_CPU_ENDIAN=big
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
    74
      ;;
19676
2c525ed65d4c 8024320: Add s390(x) detection to platform.m4
omajid
parents: 19260
diff changeset
    75
    s390x)
2c525ed65d4c 8024320: Add s390(x) detection to platform.m4
omajid
parents: 19260
diff changeset
    76
      VAR_CPU=s390x
2c525ed65d4c 8024320: Add s390(x) detection to platform.m4
omajid
parents: 19260
diff changeset
    77
      VAR_CPU_ARCH=s390
2c525ed65d4c 8024320: Add s390(x) detection to platform.m4
omajid
parents: 19260
diff changeset
    78
      VAR_CPU_BITS=64
2c525ed65d4c 8024320: Add s390(x) detection to platform.m4
omajid
parents: 19260
diff changeset
    79
      VAR_CPU_ENDIAN=big
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
    80
      ;;
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    81
    sparc)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    82
      VAR_CPU=sparc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    83
      VAR_CPU_ARCH=sparc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    84
      VAR_CPU_BITS=32
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    85
      VAR_CPU_ENDIAN=big
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
    86
      ;;
25040
09052d7f1467 8047763: Recognize sparc64 as a sparc platform
mikael
parents: 23437
diff changeset
    87
    sparcv9|sparc64)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    88
      VAR_CPU=sparcv9
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    89
      VAR_CPU_ARCH=sparc
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    90
      VAR_CPU_BITS=64
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    91
      VAR_CPU_ENDIAN=big
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
    92
      ;;
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    93
    *)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
    94
      AC_MSG_ERROR([unsupported cpu $1])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    95
      ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    96
  esac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    97
])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    98
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    99
# Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   100
# Converts autoconf style OS name to OpenJDK style, into
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   101
# VAR_OS and VAR_OS_API.
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   102
AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_OS],
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   103
[
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   104
  case "$1" in
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   105
    *linux*)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   106
      VAR_OS=linux
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   107
      VAR_OS_API=posix
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   108
      VAR_OS_ENV=linux
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   109
      ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   110
    *solaris*)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   111
      VAR_OS=solaris
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   112
      VAR_OS_API=posix
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   113
      VAR_OS_ENV=solaris
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   114
      ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   115
    *darwin*)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   116
      VAR_OS=macosx
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   117
      VAR_OS_API=posix
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   118
      VAR_OS_ENV=macosx
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   119
      ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   120
    *bsd*)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   121
      VAR_OS=bsd
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   122
      VAR_OS_API=posix
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   123
      VAR_OS_ENV=bsd
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   124
      ;;
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   125
    *cygwin*)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   126
      VAR_OS=windows
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   127
      VAR_OS_API=winapi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   128
      VAR_OS_ENV=windows.cygwin
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   129
      ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   130
    *mingw*)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   131
      VAR_OS=windows
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   132
      VAR_OS_API=winapi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   133
      VAR_OS_ENV=windows.msys
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   134
      ;;
22466
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   135
    *aix*)
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   136
      VAR_OS=aix
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   137
      VAR_OS_API=posix
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   138
      VAR_OS_ENV=aix
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   139
      ;;
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   140
    *)
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   141
      AC_MSG_ERROR([unsupported operating system $1])
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   142
      ;;
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   143
  esac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   144
])
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   145
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   146
# Expects $host_os $host_cpu $build_os and $build_cpu
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   147
# and $with_target_bits to have been setup!
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   148
#
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   149
# Translate the standard triplet(quadruplet) definition
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   150
# of the target/build system into OPENJDK_TARGET_OS, OPENJDK_TARGET_CPU,
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   151
# OPENJDK_BUILD_OS, etc.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   152
AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   153
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   154
  # Copy the autoconf trip/quadruplet verbatim to OPENJDK_TARGET_AUTOCONF_NAME
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   155
  # (from the autoconf "host") and OPENJDK_BUILD_AUTOCONF_NAME
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   156
  # Note that we might later on rewrite e.g. OPENJDK_TARGET_CPU due to reduced build,
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   157
  # but this will not change the value of OPENJDK_TARGET_AUTOCONF_NAME.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   158
  OPENJDK_TARGET_AUTOCONF_NAME="$host"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   159
  OPENJDK_BUILD_AUTOCONF_NAME="$build"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   160
  AC_SUBST(OPENJDK_TARGET_AUTOCONF_NAME)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   161
  AC_SUBST(OPENJDK_BUILD_AUTOCONF_NAME)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   162
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   163
  # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   164
  PLATFORM_EXTRACT_VARS_FROM_OS($build_os)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   165
  PLATFORM_EXTRACT_VARS_FROM_CPU($build_cpu)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   166
  # ..and setup our own variables. (Do this explicitely to facilitate searching)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   167
  OPENJDK_BUILD_OS="$VAR_OS"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   168
  OPENJDK_BUILD_OS_API="$VAR_OS_API"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   169
  OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   170
  OPENJDK_BUILD_CPU="$VAR_CPU"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   171
  OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   172
  OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   173
  OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   174
  AC_SUBST(OPENJDK_BUILD_OS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   175
  AC_SUBST(OPENJDK_BUILD_OS_API)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   176
  AC_SUBST(OPENJDK_BUILD_CPU)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   177
  AC_SUBST(OPENJDK_BUILD_CPU_ARCH)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   178
  AC_SUBST(OPENJDK_BUILD_CPU_BITS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   179
  AC_SUBST(OPENJDK_BUILD_CPU_ENDIAN)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   180
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   181
  AC_MSG_CHECKING([openjdk-build os-cpu])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   182
  AC_MSG_RESULT([$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   183
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   184
  # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   185
  PLATFORM_EXTRACT_VARS_FROM_OS($host_os)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   186
  PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   187
  # ... and setup our own variables. (Do this explicitely to facilitate searching)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   188
  OPENJDK_TARGET_OS="$VAR_OS"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   189
  OPENJDK_TARGET_OS_API="$VAR_OS_API"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   190
  OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   191
  OPENJDK_TARGET_CPU="$VAR_CPU"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   192
  OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   193
  OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   194
  OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   195
  AC_SUBST(OPENJDK_TARGET_OS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   196
  AC_SUBST(OPENJDK_TARGET_OS_API)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   197
  AC_SUBST(OPENJDK_TARGET_CPU)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   198
  AC_SUBST(OPENJDK_TARGET_CPU_ARCH)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   199
  AC_SUBST(OPENJDK_TARGET_CPU_BITS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   200
  AC_SUBST(OPENJDK_TARGET_CPU_ENDIAN)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   201
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   202
  AC_MSG_CHECKING([openjdk-target os-cpu])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   203
  AC_MSG_RESULT([$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   204
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   205
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   206
# Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   207
# accordingly. Must be done after setting up build and target system, but before
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   208
# doing anything else with these values.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   209
AC_DEFUN([PLATFORM_SETUP_TARGET_CPU_BITS],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   210
[
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   211
  AC_ARG_WITH(target-bits, [AS_HELP_STRING([--with-target-bits],
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   212
       [build 32-bit or 64-bit binaries (for platforms that support it), e.g. --with-target-bits=32 @<:@guessed@:>@])])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   213
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   214
  # We have three types of compiles:
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   215
  # native  == normal compilation, target system == build system
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   216
  # cross   == traditional cross compilation, target system != build system; special toolchain needed
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   217
  # reduced == using native compilers, but with special flags (e.g. -m32) to produce 32-bit builds on 64-bit machines
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   218
  #
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   219
  if test "x$OPENJDK_BUILD_AUTOCONF_NAME" != "x$OPENJDK_TARGET_AUTOCONF_NAME"; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   220
    # We're doing a proper cross-compilation
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   221
    COMPILE_TYPE="cross"
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   222
  else
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   223
    COMPILE_TYPE="native"
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   224
  fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   225
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   226
  if test "x$with_target_bits" != x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   227
    if test "x$COMPILE_TYPE" = "xcross"; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   228
      AC_MSG_ERROR([It is not possible to combine --with-target-bits=X and proper cross-compilation. Choose either.])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   229
    fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   230
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   231
    if test "x$with_target_bits" = x32 && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   232
      # A reduced build is requested
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   233
      COMPILE_TYPE="reduced"
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   234
      OPENJDK_TARGET_CPU_BITS=32
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   235
      if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86"; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   236
        OPENJDK_TARGET_CPU=x86
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   237
      elif test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   238
        OPENJDK_TARGET_CPU=sparc
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   239
      else
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   240
        AC_MSG_ERROR([Reduced build (--with-target-bits=32) is only supported on x86_64 and sparcv9])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   241
      fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   242
    elif test "x$with_target_bits" = x64 && test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   243
      AC_MSG_ERROR([It is not possible to use --with-target-bits=64 on a 32 bit system. Use proper cross-compilation instead.])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   244
    elif test "x$with_target_bits" = "x$OPENJDK_TARGET_CPU_BITS"; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   245
      AC_MSG_NOTICE([--with-target-bits are set to build platform address size; argument has no meaning])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   246
    else
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   247
      AC_MSG_ERROR([--with-target-bits can only be 32 or 64, you specified $with_target_bits!])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   248
    fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   249
  fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   250
  AC_SUBST(COMPILE_TYPE)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   251
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   252
  AC_MSG_CHECKING([compilation type])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   253
  AC_MSG_RESULT([$COMPILE_TYPE])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   254
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   255
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   256
# Setup the legacy variables, for controlling the old makefiles.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   257
#
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   258
AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   259
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   260
  # Also store the legacy naming of the cpu.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   261
  # Ie i586 and amd64 instead of x86 and x86_64
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   262
  OPENJDK_TARGET_CPU_LEGACY="$OPENJDK_TARGET_CPU"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   263
  if test "x$OPENJDK_TARGET_CPU" = xx86; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   264
    OPENJDK_TARGET_CPU_LEGACY="i586"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   265
  elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   266
    # On all platforms except MacOSX replace x86_64 with amd64.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   267
    OPENJDK_TARGET_CPU_LEGACY="amd64"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   268
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   269
  AC_SUBST(OPENJDK_TARGET_CPU_LEGACY)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   270
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   271
  # And the second legacy naming of the cpu.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   272
  # Ie i386 and amd64 instead of x86 and x86_64.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   273
  OPENJDK_TARGET_CPU_LEGACY_LIB="$OPENJDK_TARGET_CPU"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   274
  if test "x$OPENJDK_TARGET_CPU" = xx86; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   275
    OPENJDK_TARGET_CPU_LEGACY_LIB="i386"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   276
  elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   277
    OPENJDK_TARGET_CPU_LEGACY_LIB="amd64"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   278
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   279
  AC_SUBST(OPENJDK_TARGET_CPU_LEGACY_LIB)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   280
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   281
  # This is the name of the cpu (but using i386 and amd64 instead of
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   282
  # x86 and x86_64, respectively), preceeded by a /, to be used when
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   283
  # locating libraries. On macosx, it's empty, though.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   284
  OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   285
  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   286
    OPENJDK_TARGET_CPU_LIBDIR=""
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   287
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   288
  AC_SUBST(OPENJDK_TARGET_CPU_LIBDIR)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   289
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   290
  # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   291
  # /amd64 or /sparcv9. This string is appended to some library paths, like this:
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   292
  # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   293
  OPENJDK_TARGET_CPU_ISADIR=""
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   294
  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   295
    if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   296
      OPENJDK_TARGET_CPU_ISADIR="/amd64"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   297
    elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   298
      OPENJDK_TARGET_CPU_ISADIR="/sparcv9"
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   299
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   300
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   301
  AC_SUBST(OPENJDK_TARGET_CPU_ISADIR)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   302
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   303
  # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   304
  OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   305
  if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   306
    # On linux only, we replace x86 with i386.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   307
    OPENJDK_TARGET_CPU_OSARCH="i386"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   308
  elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   309
    # On all platforms except macosx, we replace x86_64 with amd64.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   310
    OPENJDK_TARGET_CPU_OSARCH="amd64"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   311
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   312
  AC_SUBST(OPENJDK_TARGET_CPU_OSARCH)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   313
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   314
  OPENJDK_TARGET_CPU_JLI="$OPENJDK_TARGET_CPU"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   315
  if test "x$OPENJDK_TARGET_CPU" = xx86; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   316
    OPENJDK_TARGET_CPU_JLI="i386"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   317
  elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   318
    # On all platforms except macosx, we replace x86_64 with amd64.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   319
    OPENJDK_TARGET_CPU_JLI="amd64"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   320
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   321
  # Now setup the -D flags for building libjli.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   322
  OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   323
  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   324
    if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   325
      OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   326
    elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   327
      OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   328
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   329
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   330
  AC_SUBST(OPENJDK_TARGET_CPU_JLI_CFLAGS)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   331
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   332
  # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   333
  if test "x$OPENJDK_TARGET_OS_API" = xposix; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   334
    OPENJDK_TARGET_OS_API_DIR="solaris"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   335
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   336
  if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   337
    OPENJDK_TARGET_OS_API_DIR="windows"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   338
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   339
  AC_SUBST(OPENJDK_TARGET_OS_API_DIR)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   340
21055
d52217bb8e80 8016096: [macosx] jawt_md.h shipped with jdk is outdated
dholmes
parents: 20363
diff changeset
   341
  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
d52217bb8e80 8016096: [macosx] jawt_md.h shipped with jdk is outdated
dholmes
parents: 20363
diff changeset
   342
      OPENJDK_TARGET_OS_EXPORT_DIR=macosx
d52217bb8e80 8016096: [macosx] jawt_md.h shipped with jdk is outdated
dholmes
parents: 20363
diff changeset
   343
  else
d52217bb8e80 8016096: [macosx] jawt_md.h shipped with jdk is outdated
dholmes
parents: 20363
diff changeset
   344
      OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_API_DIR}
d52217bb8e80 8016096: [macosx] jawt_md.h shipped with jdk is outdated
dholmes
parents: 20363
diff changeset
   345
  fi
d52217bb8e80 8016096: [macosx] jawt_md.h shipped with jdk is outdated
dholmes
parents: 20363
diff changeset
   346
  AC_SUBST(OPENJDK_TARGET_OS_EXPORT_DIR)
d52217bb8e80 8016096: [macosx] jawt_md.h shipped with jdk is outdated
dholmes
parents: 20363
diff changeset
   347
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   348
  if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   349
    A_LP64="LP64:="
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   350
    # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   351
    # unpack200.exe
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   352
    if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   353
      ADD_LP64="-D_LP64=1"
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   354
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   355
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   356
  AC_SUBST(LP64,$A_LP64)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   357
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   358
  if test "x$COMPILE_TYPE" = "xcross"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   359
    # FIXME: ... or should this include reduced builds..?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   360
    DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   361
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   362
    DEFINE_CROSS_COMPILE_ARCH=""
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   363
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   364
  AC_SUBST(DEFINE_CROSS_COMPILE_ARCH)
16581
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 14111
diff changeset
   365
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   366
  # ZERO_ARCHDEF is used to enable architecture-specific code
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   367
  case "${OPENJDK_TARGET_CPU}" in
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   368
    ppc*)    ZERO_ARCHDEF=PPC   ;;
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   369
    s390*)   ZERO_ARCHDEF=S390  ;;
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   370
    sparc*)  ZERO_ARCHDEF=SPARC ;;
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   371
    x86_64*) ZERO_ARCHDEF=AMD64 ;;
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   372
    x86)     ZERO_ARCHDEF=IA32  ;;
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   373
    *)      ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   374
  esac
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   375
  AC_SUBST(ZERO_ARCHDEF)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   376
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   377
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   378
AC_DEFUN([PLATFORM_SET_RELEASE_FILE_OS_VALUES],
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   379
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   380
  if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   381
    REQUIRED_OS_NAME=SunOS
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   382
    REQUIRED_OS_VERSION=5.10
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   383
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   384
  if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   385
    REQUIRED_OS_NAME=Linux
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   386
    REQUIRED_OS_VERSION=2.6
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   387
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   388
  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   389
    REQUIRED_OS_NAME=Windows
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   390
    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   391
      REQUIRED_OS_VERSION=5.2
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   392
    else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   393
      REQUIRED_OS_VERSION=5.1
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   394
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   395
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   396
  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   397
    REQUIRED_OS_NAME=Darwin
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   398
    REQUIRED_OS_VERSION=11.2
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   399
  fi
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   400
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   401
  AC_SUBST(REQUIRED_OS_NAME)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   402
  AC_SUBST(REQUIRED_OS_VERSION)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   403
])
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   404
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   405
#%%% Build and target systems %%%
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   406
AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET],
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   407
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   408
  # Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   409
  # is confusing; it assumes you are cross-compiling a cross-compiler (!)  and "target" is thus the target of the
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   410
  # product you're building. The target of this build is called "host". Since this is confusing to most people, we
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   411
  # have not adopted that system, but use "target" as the platform we are building for. In some places though we need
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   412
  # to use the configure naming style.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   413
  AC_CANONICAL_BUILD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   414
  AC_CANONICAL_HOST
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   415
  AC_CANONICAL_TARGET
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   416
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   417
  PLATFORM_EXTRACT_TARGET_AND_BUILD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   418
  PLATFORM_SETUP_TARGET_CPU_BITS
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   419
  PLATFORM_SET_RELEASE_FILE_OS_VALUES
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   420
  PLATFORM_SETUP_LEGACY_VARS
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   421
])
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   422
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   423
AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   424
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   425
  ###############################################################################
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   426
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   427
  # Note that this is the build platform OS version!
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   428
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   429
  OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   430
  OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   431
  OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   432
  OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   433
  AC_SUBST(OS_VERSION_MAJOR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   434
  AC_SUBST(OS_VERSION_MINOR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   435
  AC_SUBST(OS_VERSION_MICRO)
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   436
])
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   437
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   438
# Support macro for PLATFORM_SETUP_OPENJDK_TARGET_BITS.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   439
# Add -mX to various FLAGS variables.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   440
AC_DEFUN([PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   441
[
19760
7cd5ce917641 8024665: Move open changes for JDK-8020411 to closed source
ihse
parents: 19676
diff changeset
   442
  # When we add flags to the "official" CFLAGS etc, we need to
7cd5ce917641 8024665: Move open changes for JDK-8020411 to closed source
ihse
parents: 19676
diff changeset
   443
  # keep track of these additions in ADDED_CFLAGS etc. These
7cd5ce917641 8024665: Move open changes for JDK-8020411 to closed source
ihse
parents: 19676
diff changeset
   444
  # will later be checked to make sure only controlled additions
7cd5ce917641 8024665: Move open changes for JDK-8020411 to closed source
ihse
parents: 19676
diff changeset
   445
  # have been made to CFLAGS etc.
22466
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   446
  ADDED_CFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   447
  ADDED_CXXFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   448
  ADDED_LDFLAGS=" ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   449
19760
7cd5ce917641 8024665: Move open changes for JDK-8020411 to closed source
ihse
parents: 19676
diff changeset
   450
  CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
7cd5ce917641 8024665: Move open changes for JDK-8020411 to closed source
ihse
parents: 19676
diff changeset
   451
  CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
7cd5ce917641 8024665: Move open changes for JDK-8020411 to closed source
ihse
parents: 19676
diff changeset
   452
  LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   453
19760
7cd5ce917641 8024665: Move open changes for JDK-8020411 to closed source
ihse
parents: 19676
diff changeset
   454
  CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
7cd5ce917641 8024665: Move open changes for JDK-8020411 to closed source
ihse
parents: 19676
diff changeset
   455
  CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
7cd5ce917641 8024665: Move open changes for JDK-8020411 to closed source
ihse
parents: 19676
diff changeset
   456
  LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   457
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   458
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   459
AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_BITS],
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   460
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   461
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   462
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   463
  # Now we check if libjvm.so will use 32 or 64 bit pointers for the C/C++ code.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   464
  # (The JVM can use 32 or 64 bit Java pointers but that decision
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   465
  # is made at runtime.)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   466
  #
16984
ba1791eeb074 8013480: fix zero build on arm
omajid
parents: 16581
diff changeset
   467
22467
kvn
parents: 22466 21055
diff changeset
   468
  if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xaix; then
kvn
parents: 22466 21055
diff changeset
   469
    # Always specify -m flag on Solaris
kvn
parents: 22466 21055
diff changeset
   470
    # And -q on AIX because otherwise the compiler produces 32-bit objects by default
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   471
    PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   472
  elif test "x$COMPILE_TYPE" = xreduced; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   473
    if test "x$OPENJDK_TARGET_OS" != xwindows; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   474
      # Specify -m if running reduced on other Posix platforms
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   475
      PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   476
    fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   477
  fi
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   478
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   479
  # Make compilation sanity check
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   480
  AC_CHECK_HEADERS([stdio.h], , [
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   481
    AC_MSG_NOTICE([Failed to compile stdio.h. This likely implies missing compile dependencies.])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   482
    if test "x$COMPILE_TYPE" = xreduced; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   483
      AC_MSG_NOTICE([You are doing a reduced build. Check that you have 32-bit libraries installed.])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   484
    elif test "x$COMPILE_TYPE" = xcross; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   485
      AC_MSG_NOTICE([You are doing a cross-compilation. Check that you have all target platform libraries installed.])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   486
    fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   487
    AC_MSG_ERROR([Cannot continue.])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   488
  ])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   489
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   490
  AC_CHECK_SIZEOF([int *], [1111])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   491
22467
kvn
parents: 22466 21055
diff changeset
   492
  # AC_CHECK_SIZEOF defines 'ac_cv_sizeof_int_p' to hold the number of bytes used by an 'int*'
kvn
parents: 22466 21055
diff changeset
   493
  if test "x$ac_cv_sizeof_int_p" = x; then
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   494
    # The test failed, lets stick to the assumed value.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   495
    AC_MSG_WARN([The number of bits in the target could not be determined, using $OPENJDK_TARGET_CPU_BITS.])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   496
  else
22466
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   497
    TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p`
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   498
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   499
    if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then
22467
kvn
parents: 22466 21055
diff changeset
   500
      # This situation may happen on 64-bit platforms where the compiler by default only generates 32-bit objects
kvn
parents: 22466 21055
diff changeset
   501
      # Let's try to implicitely set the compilers target architecture and retry the test
kvn
parents: 22466 21055
diff changeset
   502
      AC_MSG_NOTICE([The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS).])
kvn
parents: 22466 21055
diff changeset
   503
      AC_MSG_NOTICE([I'll retry after setting the platforms compiler target bits flag to ${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}])
kvn
parents: 22466 21055
diff changeset
   504
      PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS
22466
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   505
22467
kvn
parents: 22466 21055
diff changeset
   506
      # We have to unset 'ac_cv_sizeof_int_p' first, otherwise AC_CHECK_SIZEOF will use the previously cached value!
kvn
parents: 22466 21055
diff changeset
   507
      unset ac_cv_sizeof_int_p
kvn
parents: 22466 21055
diff changeset
   508
      # And we have to undef the definition of SIZEOF_INT_P in confdefs.h by the previous invocation of AC_CHECK_SIZEOF
kvn
parents: 22466 21055
diff changeset
   509
      cat >>confdefs.h <<_ACEOF
22466
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   510
#undef SIZEOF_INT_P
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   511
_ACEOF
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   512
22467
kvn
parents: 22466 21055
diff changeset
   513
      AC_CHECK_SIZEOF([int *], [1111])
22466
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   514
22467
kvn
parents: 22466 21055
diff changeset
   515
      TESTED_TARGET_CPU_BITS=`expr 8 \* $ac_cv_sizeof_int_p`
22466
25aaf85d1ada 8024265: Enable new build on AIX
simonis
parents: 19260
diff changeset
   516
22467
kvn
parents: 22466 21055
diff changeset
   517
      if test "x$TESTED_TARGET_CPU_BITS" != "x$OPENJDK_TARGET_CPU_BITS"; then
kvn
parents: 22466 21055
diff changeset
   518
        AC_MSG_ERROR([The tested number of bits in the target ($TESTED_TARGET_CPU_BITS) differs from the number of bits expected to be found in the target ($OPENJDK_TARGET_CPU_BITS)])
kvn
parents: 22466 21055
diff changeset
   519
      fi
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   520
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   521
  fi
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   522
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   523
  AC_MSG_CHECKING([for target address size])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   524
  AC_MSG_RESULT([$OPENJDK_TARGET_CPU_BITS bits])
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   525
])
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   526
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   527
AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS],
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   528
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   529
  ###############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   530
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   531
  # Is the target little of big endian?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   532
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   533
  AC_C_BIGENDIAN([ENDIAN="big"],[ENDIAN="little"],[ENDIAN="unknown"],[ENDIAN="universal_endianness"])
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   534
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   535
  if test "x$ENDIAN" = xuniversal_endianness; then
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   536
    AC_MSG_ERROR([Building with both big and little endianness is not supported])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   537
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   538
  if test "x$ENDIAN" != "x$OPENJDK_TARGET_CPU_ENDIAN"; then
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   539
    AC_MSG_ERROR([The tested endian in the target ($ENDIAN) differs from the endian expected to be found in the target ($OPENJDK_TARGET_CPU_ENDIAN)])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19760
diff changeset
   540
  fi
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   541
])