jdk/make/lib/CoreLibraries.gmk
author chegar
Sun, 17 Aug 2014 15:54:13 +0100
changeset 25859 3317bb8137f4
parent 25086 f5f41ed620d5
child 26191 a0ff4b39d34b
permissions -rw-r--r--
8054834: Modular Source Code Reviewed-by: alanb, chegar, ihse, mduigou Contributed-by: alan.bateman@oracle.com, alex.buckley@oracle.com, chris.hegarty@oracle.com, erik.joelsson@oracle.com, jonathan.gibbons@oracle.com, karen.kinnear@oracle.com, magnus.ihse.bursie@oracle.com, mandy.chung@oracle.com, mark.reinhold@oracle.com, paul.sandoz@oracle.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
24967
582420f5ab6c 8041498: Remove npt library
dsamersoff
parents: 24710
diff changeset
     2
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
9670c1610c53 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
9670c1610c53 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
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
9670c1610c53 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
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9670c1610c53 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
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
9670c1610c53 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
9670c1610c53 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,
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9670c1610c53 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
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    26
WIN_VERIFY_LIB := $(JDK_OUTPUTDIR)/objs/libverify/verify.lib
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    27
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    28
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    30
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    31
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    32
ifneq ($(OPENJDK_TARGET_OS), solaris)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    33
  BUILD_LIBFDLIBM_OPTIMIZATION := NONE
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    34
endif
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    35
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
    36
LIBFDLIBM_SRC := $(JDK_TOPDIR)/src/java.base/share/native/libfdlibm
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
    37
LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC)
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
    38
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    39
ifneq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    40
  $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    41
      STATIC_LIBRARY := fdlibm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    42
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
    43
      SRC := $(LIBFDLIBM_SRC), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    44
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    45
      OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
    46
      CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    47
      CFLAGS_windows_debug := -DLOGGING, \
22594
kvn
parents: 22593 20896
diff changeset
    48
      CFLAGS_aix := -qfloat=nomaf, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    49
      ARFLAGS := $(ARFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    50
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    51
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    52
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    53
else
14855
d104ff4d4bb9 8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents: 14789
diff changeset
    54
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
    55
  # On macosx the old build does partial (incremental) linking of fdlibm instead of
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
    56
  # a plain static library.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    57
  $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    58
      LIBRARY := fdlibm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    59
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
    60
      SRC := $(LIBFDLIBM_SRC), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    61
      LANG := C, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
    62
      CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    63
      LDFLAGS := -nostdlib -r -arch x86_64, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    64
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    65
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    66
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    67
  BUILD_LIBFDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    68
  $(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16513
diff changeset
    69
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    70
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    71
endif
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
    72
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    73
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    74
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    75
BUILD_LIBVERIFY_SRC := check_code.c check_format.c
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    76
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    77
ifeq ($(OPENJDK_TARGET_OS), solaris)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    78
  ifneq ($(OPENJDK_TARGET_CPU), x86_64)
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21628
diff changeset
    79
    BUILD_LIBVERIFY_REORDER := $(JDK_TOPDIR)/make/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    80
  endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    81
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    82
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    83
LIBVERIFY_OPTIMIZATION := HIGH
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    84
ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    85
  ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    86
    LIBVERIFY_OPTIMIZATION := LOW
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    87
  endif
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    88
endif
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
    89
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    90
$(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    91
    LIBRARY := verify, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    92
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
    93
    SRC := $(JDK_TOPDIR)/src/java.base/share/native/libverify, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    94
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    95
    OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    96
    CFLAGS := $(CFLAGS_JDKLIB), \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21628
diff changeset
    97
    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libverify/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    98
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    99
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   100
    LDFLAGS_SUFFIX_posix := -ljvm -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   101
    LDFLAGS_SUFFIX_windows := jvm.lib, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   102
    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   103
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   104
        -D "JDK_FNAME=verify.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   105
        -D "JDK_INTERNAL_NAME=verify" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   106
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   107
    REORDER := $(BUILD_LIBVERIFY_REORDER), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   108
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libverify, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   109
    DEBUG_SYMBOLS := true))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   110
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   111
BASE_LIBRARIES += $(BUILD_LIBVERIFY)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   112
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   113
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   114
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   115
LIBJAVA_SRC_DIRS := $(call FindSrcDirsForLib, java.base, java)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   116
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   117
ifeq ($(OPENJDK_TARGET_OS), macosx)
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   118
  LIBJAVA_EXCLUDE_FILES += $(JDK_TOPDIR)/src/java.base/unix/native/libjava/HostLocaleProviderAdapter_md.c
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   119
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   120
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   121
LIBJAVA_CFLAGS := $(addprefix -I, $(LIBJAVA_SRC_DIRS)) \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   122
    -I$(JDK_TOPDIR)/src/java.base/share/native/libfdlibm \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   123
    -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   124
    -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   125
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   126
LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   127
    -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   128
    -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   129
     -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   130
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   131
ifneq (, $(JDK_UPDATE_VERSION))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   132
  LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   133
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   134
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   135
ifneq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   136
  LIBJAVA_EXCLUDE_FILES += java_props_macosx.c
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   137
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   138
  BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   139
  BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   140
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   141
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   142
ifeq ($(OPENJDK_TARGET_OS), solaris)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   143
  ifneq ($(OPENJDK_TARGET_CPU), x86_64)
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21628
diff changeset
   144
    LIBJAVA_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   145
  endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   146
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   147
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   148
$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   149
    LIBRARY := java, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   150
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   151
    SRC := $(LIBJAVA_SRC_DIRS), \
22951
5fd21112b2b6 8034043: Native methods for preferences API should not be in libjava
alanb
parents: 22941
diff changeset
   152
    EXCLUDES := fdlibm/src zip prefs, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   153
    EXCLUDE_FILES := $(LIBJAVA_EXCLUDE_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   154
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   155
    OPTIMIZATION := HIGH, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   156
    CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   157
        $(LIBJAVA_CFLAGS), \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21628
diff changeset
   158
    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   159
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   160
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   161
    LDFLAGS_SUFFIX_posix := -ljvm -lverify, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   162
    LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   163
    LDFLAGS_SUFFIX_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
22594
kvn
parents: 22593 20896
diff changeset
   164
    LDFLAGS_SUFFIX_aix := $(LIBDL) $(BUILD_LIBFDLIBM) -lm,\
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   165
    LDFLAGS_SUFFIX_macosx := -L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   166
        -framework CoreFoundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   167
        -framework Foundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   168
        -framework Security -framework SystemConfiguration, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   169
    LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   170
        jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   171
        shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   172
        advapi32.lib, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   173
    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   174
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   175
        -D "JDK_FNAME=java.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   176
        -D "JDK_INTERNAL_NAME=java" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   177
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   178
    REORDER := $(LIBJAVA_REORDER), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   179
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   180
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   181
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   182
BASE_LIBRARIES += $(BUILD_LIBJAVA)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   183
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   184
$(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   185
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   186
$(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   187
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   188
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   189
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   190
BUILD_LIBZIP_EXCLUDES :=
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   191
ifeq ($(USE_EXTERNAL_LIBZ), true)
24710
c019dc4104b2 8044725: Bug in zlib 1.2.5 prevents inflation of some gzipped files
sherman
parents: 23562
diff changeset
   192
  LIBZIP_EXCLUDES += zlib-1.2.8
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   193
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   194
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   195
BUILD_LIBZIP_REORDER :=
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   196
ifeq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   197
  ifneq ($(OPENJDK_TARGET_CPU), x86_64)
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21628
diff changeset
   198
    BUILD_LIBZIP_REORDER := $(JDK_TOPDIR)/make/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   199
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   200
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   201
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   202
ifeq ($(LIBZIP_CAN_USE_MMAP), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   203
  BUILD_LIBZIP_MMAP := -DUSE_MMAP
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   204
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   205
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   206
$(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   207
    LIBRARY := zip, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   208
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   209
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   210
    OPTIMIZATION := LOW, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   211
    SRC := $(JDK_TOPDIR)/src/java.base/share/native/libzip, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   212
    EXCLUDES := $(LIBZIP_EXCLUDES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   213
    CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   214
        $(ZLIB_CPPFLAGS) \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   215
        -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   216
        -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   217
        -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   218
    CFLAGS_posix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21628
diff changeset
   219
    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libzip/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   220
    REORDER := $(BUILD_LIBZIP_REORDER), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   221
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   222
        $(call SET_SHARED_LIBRARY_ORIGIN) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   223
        $(EXPORT_ZIP_FUNCS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   224
    LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   225
        -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   226
        $(WIN_JAVA_LIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   227
    LDFLAGS_SUFFIX_linux := -ljvm -ljava $(LIBZ), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   228
    LDFLAGS_SUFFIX_solaris := -ljvm -ljava $(LIBZ) -lc, \
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   229
    LDFLAGS_SUFFIX_aix := -ljvm -ljava $(LIBZ),\
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   230
    LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   231
    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   232
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   233
        -D "JDK_FNAME=zip.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   234
        -D "JDK_INTERNAL_NAME=zip" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   235
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   236
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libzip, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   237
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   238
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   239
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   240
$(BUILD_LIBZIP): $(BUILD_LIBJAVA)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   241
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   242
BASE_LIBRARIES += $(BUILD_LIBZIP)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   243
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   244
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   245
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   246
BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/java.base/share/native/libjli \
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   247
    $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjli
22951
5fd21112b2b6 8034043: Native methods for preferences API should not be in libjava
alanb
parents: 22941
diff changeset
   248
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   249
LIBJLI_CFLAGS := $(CFLAGS_JDKLIB)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   250
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   251
BUILD_LIBJLI_FILES := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   252
    java.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   253
    splashscreen_stubs.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   254
    parse_manifest.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   255
    version_comp.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   256
    wildcard.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   257
    jli_util.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   258
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   259
ifeq ($(JVM_VARIANT_ZERO), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   260
  ERGO_FAMILY := zero
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   261
else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   262
  ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   263
    ERGO_FAMILY := i586
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   264
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   265
    ERGO_FAMILY := $(OPENJDK_TARGET_CPU_ARCH)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   266
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   267
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   268
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   269
ifeq ($(OPENJDK_TARGET_OS), macosx)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   270
  BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/java.base/macosx/native/libjli
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   271
  BUILD_LIBJLI_FILES += java_md_common.c java_md_macosx.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   272
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   273
  BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   274
  BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS := -x objective-c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   275
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   276
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   277
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   278
  BUILD_LIBJLI_FILES += java_md.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   279
      cmdtoargs.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   280
  # Staticically link with c runtime on windows.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   281
  LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   282
else ifneq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   283
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   284
  BUILD_LIBJLI_FILES += java_md_common.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   285
  BUILD_LIBJLI_FILES += java_md_solinux.c ergo.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   286
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   287
  ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   288
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   289
  # if the architecture specific ergo file exists then
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   290
  # use it, else use the generic definitions from ergo.c
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   291
  ifneq ($(wildcard $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjli/$(ERGO_ARCH_FILE)), )
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   292
    BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   293
  else # !ERGO_ARCH_FILE
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   294
    LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   295
  endif # ERGO_ARCH_FILE
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   296
endif #WINDOWS
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   297
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   298
LIBJLI_CFLAGS += $(foreach dir, $(BUILD_LIBJLI_SRC_DIRS), -I$(dir))
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   299
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   300
# Append defines depending on target platform
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   301
LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   302
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   303
ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   304
  LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   305
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   306
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   307
ifneq ($(USE_EXTERNAL_LIBZ), true)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   308
  BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   309
  LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   310
  BUILD_LIBJLI_FILES += \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   311
      inflate.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   312
      inftrees.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   313
      inffast.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   314
      zadler32.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   315
      zcrc32.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   316
      zutil.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   317
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   318
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   319
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   320
  LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   321
else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   322
  LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   323
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   324
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   325
$(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   326
    LIBRARY := jli, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   327
    OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   328
    SRC := $(BUILD_LIBJLI_SRC_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   329
    INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   330
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   331
    OPTIMIZATION := HIGH, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   332
    CFLAGS := $(LIBJLI_CFLAGS), \
21805
c7d7946239de 8027566: Remove the old build system
ihse
parents: 21628
diff changeset
   333
    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjli/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   334
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   335
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   336
    LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   337
    LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   338
    LDFLAGS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   339
    LDFLAGS_SUFFIX_solaris := $(LIBZ) $(LIBDL) -lc, \
21606
1984e107a4b3 8027755: Anti-delta incorrect push for 8025198
dholmes
parents: 21605
diff changeset
   340
    LDFLAGS_SUFFIX_linux := $(LIBZ) $(LIBDL) -lc -lpthread, \
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   341
    LDFLAGS_SUFFIX_aix := $(LIBZ) $(LIBDL),\
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   342
    LDFLAGS_SUFFIX_macosx := $(LIBZ), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   343
    LDFLAGS_SUFFIX_windows := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   344
        -export:JLI_Launch \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   345
        -export:JLI_ManifestIterate \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   346
        -export:JLI_SetTraceLauncher \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   347
        -export:JLI_ReportErrorMessage \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   348
        -export:JLI_ReportErrorMessageSys \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   349
        -export:JLI_ReportMessage \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   350
        -export:JLI_ReportExceptionDescription \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   351
        -export:JLI_MemAlloc \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   352
        -export:JLI_CmdToArgs \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   353
        -export:JLI_GetStdArgc \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   354
        -export:JLI_GetStdArgs \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   355
        advapi32.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   356
        comctl32.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   357
        user32.lib, \
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   358
    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   359
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   360
        -D "JDK_FNAME=jli.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   361
        -D "JDK_INTERNAL_NAME=jli" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   362
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   363
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   364
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   365
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   366
BASE_LIBRARIES += $(BUILD_LIBJLI)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   367
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   368
# On windows, the static library has the same suffix as the import library created by
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   369
# with the shared library, so the static library is given a different name. No harm
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   370
# in doing it for all platform to reduce complexity.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   371
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   372
  $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   373
      STATIC_LIBRARY := jli_static, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   374
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   375
      SRC := $(BUILD_LIBJLI_SRC_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   376
      INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   377
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   378
      OPTIMIZATION := HIGH, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   379
      CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   380
      ARFLAGS := $(ARFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   381
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   382
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   383
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   384
  BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   385
  BASE_STATIC_LIBRARIES += $(BUILD_LIBJLI_STATIC)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   386
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   387
else ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   388
  #
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   389
  # On macosx they do partial (incremental) linking of libjli_static.a
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   390
  # code it here...rather than add support to NativeCompilation
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   391
  # as this is first time I see it
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   392
  $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   393
      LIBRARY := jli_static, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   394
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   395
      SRC := $(BUILD_LIBJLI_SRC_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   396
      INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   397
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   398
      OPTIMIZATION := HIGH, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   399
      CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   400
      LDFLAGS := -nostdlib -r, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   401
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   402
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   403
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   404
  $(JDK_OUTPUTDIR)/objs/libjli_static.a: $(BUILD_LIBJLI_STATIC)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   405
	$(call install-file)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   406
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   407
  BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   408
  BASE_STATIC_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   409
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   410
else ifeq ($(OPENJDK_TARGET_OS), aix)
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   411
  # AIX also requires a static libjli because the compiler doesn't support '-rpath'
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   412
  $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC,\
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   413
      STATIC_LIBRARY:=jli_static,\
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   414
      OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs,\
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   415
      SRC:=$(BUILD_LIBJLI_SRC_DIRS),\
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   416
      INCLUDE_FILES:=$(BUILD_LIBJLI_FILES),\
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   417
      LANG:=C,\
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   418
      OPTIMIZATION:=HIGH, \
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   419
      CFLAGS:=$(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS),\
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   420
      ARFLAGS:=$(ARFLAGS),\
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   421
      OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli_static))
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   422
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   423
  BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   424
  BASE_STATIC_LIBRARIES += $(BUILD_LIBJLI_STATIC)
22595
aaa6b141196c 8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents: 22594
diff changeset
   425
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   426
endif
25859
3317bb8137f4 8054834: Modular Source Code
chegar
parents: 25086
diff changeset
   427