jdk/makefiles/lib/CoreLibraries.gmk
author dholmes
Mon, 04 Nov 2013 06:58:30 -0500
changeset 21605 d32edf24ffcb
parent 20896 df76d62dc5ff
child 21606 1984e107a4b3
permissions -rw-r--r--
8025198: Intermittent test failure: java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java Reviewed-by: martin, dholmes Contributed-by: Tristan Yan <tristan.yan@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
#
16476
e269be167fae 8001334: Remove use of JVM_* functions from java.io code
dxu
parents: 15676
diff changeset
     2
# Copyright (c) 2011, 2013, 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
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    36
ifneq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    37
  $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    38
      STATIC_LIBRARY := fdlibm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    39
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    40
      SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    41
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    42
      OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    43
      CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    44
          -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    45
      CFLAGS_windows_debug := -DLOGGING, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    46
      ARFLAGS := $(ARFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    47
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    48
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
    49
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    50
else
14855
d104ff4d4bb9 8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents: 14789
diff changeset
    51
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
    52
  # On macosx the old build does partial (incremental) linking of fdlibm instead of
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
    53
  # a plain static library.
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    54
  $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    55
      LIBRARY := fdlibm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    56
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    57
      SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    58
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    59
      CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    60
          -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    61
      LDFLAGS := -nostdlib -r -arch x86_64, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    62
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    63
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    64
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    65
  BUILD_LIBFDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    66
  $(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC)
16636
1cc691bcfe50 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16513
diff changeset
    67
	$(call install-file)
12892
3ef14bab6254 7170079: Adjustments to build-infra makefiles
erikj
parents: 12317
diff changeset
    68
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    69
endif
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
    70
14855
d104ff4d4bb9 8005178: build-infra: Dependency on libfdlibm on mac is broken
erikj
parents: 14789
diff changeset
    71
BUILD_LIBRARIES += $(BUILD_LIBFDLIBM)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    72
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)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    79
    BUILD_LIBVERIFY_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU)
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), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    93
    SRC := $(JDK_TOPDIR)/src/share/native/common, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    94
    INCLUDE_FILES := $(BUILD_LIBVERIFY_SRC), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    95
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    96
    OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    97
    CFLAGS := $(CFLAGS_JDKLIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    98
    MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libverify/mapfile-vers, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
    99
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   100
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   101
    LDFLAGS_SUFFIX_posix := -ljvm -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   102
    LDFLAGS_SUFFIX_windows := jvm.lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   103
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   104
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   105
        -D "JDK_FNAME=verify.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   106
        -D "JDK_INTERNAL_NAME=verify" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   107
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   108
    REORDER := $(BUILD_LIBVERIFY_REORDER), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   109
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libverify, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   110
    DEBUG_SYMBOLS := true))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   111
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   112
BUILD_LIBRARIES += $(BUILD_LIBVERIFY)
12317
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
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   115
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   116
LIBJAVA_SRC_DIRS := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lang \
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   117
    $(JDK_TOPDIR)/src/share/native/java/lang \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   118
    $(JDK_TOPDIR)/src/share/native/java/lang/ref \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   119
    $(JDK_TOPDIR)/src/share/native/java/lang/reflect \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   120
    $(JDK_TOPDIR)/src/share/native/java/io \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   121
    $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   122
    $(JDK_TOPDIR)/src/share/native/java/nio \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   123
    $(JDK_TOPDIR)/src/share/native/java/security \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   124
    $(JDK_TOPDIR)/src/share/native/common \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   125
    $(JDK_TOPDIR)/src/share/native/sun/misc \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   126
    $(JDK_TOPDIR)/src/share/native/sun/reflect \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   127
    $(JDK_TOPDIR)/src/share/native/java/util \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   128
    $(JDK_TOPDIR)/src/share/native/java/util/concurrent/atomic \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   129
    $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   130
    $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/util
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   131
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   132
ifneq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   133
  LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/util/locale/provider
13702
efd6a05935b2 7197849: Update new build-infra makefiles
ohair
parents: 13164
diff changeset
   134
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   135
  LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/util/locale/provider
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   136
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   137
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   138
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   139
  LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/provider \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   140
      $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/io
14231
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   141
endif
a0c23c1c010f 8000992: Update new build-infra makefiles
ohair
parents: 13702
diff changeset
   142
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   143
LIBJAVA_CFLAGS := $(foreach dir, $(LIBJAVA_SRC_DIRS), -I$(dir)) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   144
    -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   145
    -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   146
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   147
LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   148
    -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   149
    -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   150
     -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   151
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   152
ifneq (, $(JDK_UPDATE_VERSION))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   153
  LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   154
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   155
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   156
LIBJAVA_EXCLUDE_FILES := check_code.c check_format.c jspawnhelper.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   157
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   158
ifneq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   159
  LIBJAVA_EXCLUDE_FILES += java_props_macosx.c
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   160
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   161
  BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   162
  BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   163
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   164
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   165
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   166
  LIBJAVA_EXCLUDE_FILES += \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   167
      UNIXProcess_md.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   168
      UnixFileSystem_md.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   169
      FileSystemPreferences.c
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   170
else
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   171
  LIBJAVA_EXCLUDE_FILES += \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   172
      ProcessImpl_md.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   173
      WinNTFileSystem_md.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   174
      dirent_md.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   175
      WindowsPreferences.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   176
      sun/security/provider/WinCAPISeedGenerator.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   177
      sun/io/Win32ErrorMode.c
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   178
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   179
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   180
ifeq ($(OPENJDK_TARGET_OS), solaris)
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   181
  ifneq ($(OPENJDK_TARGET_CPU), x86_64)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   182
    LIBJAVA_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   183
  endif
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   184
endif
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   185
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   186
$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   187
    LIBRARY := java, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   188
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   189
    SRC := $(LIBJAVA_SRC_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   190
    EXCLUDES := fdlibm/src zip, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   191
    EXCLUDE_FILES := $(LIBJAVA_EXCLUDE_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   192
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   193
    OPTIMIZATION := HIGH, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   194
    CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   195
        $(LIBJAVA_CFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   196
    MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjava/mapfile-vers, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   197
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   198
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   199
    LDFLAGS_SUFFIX_posix := -ljvm -lverify, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   200
    LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   201
    LDFLAGS_SUFFIX_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   202
    LDFLAGS_SUFFIX_macosx := -L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   203
        -framework CoreFoundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   204
        -framework Foundation \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   205
        -framework Security -framework SystemConfiguration, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   206
    LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   207
        jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   208
        shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   209
        advapi32.lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   210
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   211
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   212
        -D "JDK_FNAME=java.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   213
        -D "JDK_INTERNAL_NAME=java" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   214
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   215
    REORDER := $(LIBJAVA_REORDER), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   216
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   217
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
13164
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   218
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   219
BUILD_LIBRARIES += $(BUILD_LIBJAVA)
72c5d01a857d 7181504: Update of latest build-infra Makefiles
erikj
parents: 12892
diff changeset
   220
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   221
$(BUILD_LIBJAVA): $(LIBJLI_BINARY)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   222
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   223
$(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   224
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   225
$(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
12317
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   226
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   227
##########################################################################################
9670c1610c53 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   228
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   229
BUILD_LIBZIP_EXCLUDES :=
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   230
ifeq ($(USE_EXTERNAL_LIBZ), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   231
  LIBZ := -lz
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   232
  LIBZIP_EXCLUDES += zlib-1.2.5
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   233
else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   234
  ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   235
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   236
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   237
BUILD_LIBZIP_REORDER :=
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   238
ifeq ($(OPENJDK_TARGET_OS), solaris)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   239
  ifneq ($(OPENJDK_TARGET_CPU), x86_64)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   240
    BUILD_LIBZIP_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   241
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   242
endif
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
ifeq ($(LIBZIP_CAN_USE_MMAP), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   245
  BUILD_LIBZIP_MMAP := -DUSE_MMAP
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   246
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   247
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   248
$(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   249
    LIBRARY := zip, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   250
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   251
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   252
    OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   253
    SRC := $(JDK_TOPDIR)/src/share/native/java/util/zip, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   254
    EXCLUDES := $(LIBZIP_EXCLUDES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   255
    CFLAGS := $(CFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   256
        $(ZLIB_CPPFLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   257
        -I$(JDK_TOPDIR)/src/share/native/java/io \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   258
        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   259
    CFLAGS_posix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   260
    MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libzip/mapfile-vers, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   261
    REORDER := $(BUILD_LIBZIP_REORDER), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   262
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   263
        $(call SET_SHARED_LIBRARY_ORIGIN) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   264
        $(EXPORT_ZIP_FUNCS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   265
    LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   266
        -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   267
        $(WIN_JAVA_LIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   268
    LDFLAGS_SUFFIX_linux := -ljvm -ljava $(LIBZ), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   269
    LDFLAGS_SUFFIX_solaris := -ljvm -ljava $(LIBZ) -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   270
    LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   271
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   272
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   273
        -D "JDK_FNAME=zip.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   274
        -D "JDK_INTERNAL_NAME=zip" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   275
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   276
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libzip, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   277
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   278
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   279
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   280
$(BUILD_LIBZIP): $(BUILD_LIBJAVA)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   281
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   282
BUILD_LIBRARIES += $(BUILD_LIBZIP)
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
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   285
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   286
$(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   287
    LIBRARY := unpack, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   288
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   289
    SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   290
    EXCLUDE_FILES := main.cpp, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   291
    LANG := C++, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   292
    OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   293
    CFLAGS := $(CXXFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   294
        -DNO_ZLIB -DUNPACK_JNI -DFULL, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   295
    CFLAGS_release := -DPRODUCT, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   296
    MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   297
    LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   298
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   299
    LDFLAGS_windows := -map:$(JDK_OUTPUTDIR)/objs/unpack.map -debug \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   300
        jvm.lib $(WIN_JAVA_LIB), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   301
    LDFLAGS_SUFFIX_posix := -ljvm $(LIBCXX) -ljava -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   302
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libunpack, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   303
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   304
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   305
        -D "JDK_FNAME=unpack.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   306
        -D "JDK_INTERNAL_NAME=unpack" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   307
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   308
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   309
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   310
$(BUILD_LIBUNPACK): $(BUILD_LIBJAVA)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   311
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   312
BUILD_LIBRARIES += $(BUILD_LIBUNPACK)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   313
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   314
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   315
  $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.map: $(BUILD_LIBUNPACK)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   316
	$(ECHO) Copying $(@F)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   317
	$(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.map, $<) $@
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
  $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.pdb: $(BUILD_LIBUNPACK)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   320
	$(ECHO) Copying $(@F)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   321
	$(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.pdb, $<) $@
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   322
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   323
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
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   326
BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   327
LIBJLI_CFLAGS := $(CFLAGS_JDKLIB) $(foreach dir, $(BUILD_LIBJLI_SRC_DIRS), -I$(dir))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   328
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   329
BUILD_LIBJLI_FILES := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   330
    java.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   331
    splashscreen_stubs.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   332
    parse_manifest.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   333
    version_comp.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   334
    wildcard.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   335
    jli_util.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   336
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   337
ifeq ($(JVM_VARIANT_ZERO), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   338
  ERGO_FAMILY := zero
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   339
else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   340
  ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   341
    ERGO_FAMILY := i586
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   342
  else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   343
    ERGO_FAMILY := $(OPENJDK_TARGET_CPU_ARCH)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   344
  endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   345
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   346
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   347
ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   348
  LIBJLI_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/bin
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   349
  BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/bin
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   350
  BUILD_LIBJLI_FILES += java_md_common.c java_md_macosx.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   351
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   352
  BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   353
  BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS := -x objective-c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   354
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   355
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   356
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   357
  BUILD_LIBJLI_FILES += java_md.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   358
      cmdtoargs.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   359
  # Staticically link with c runtime on windows.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   360
  LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   361
else ifneq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   362
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   363
  BUILD_LIBJLI_FILES += java_md_common.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   364
  BUILD_LIBJLI_FILES += java_md_solinux.c ergo.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   365
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   366
  ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
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
  # if the architecture specific ergo file exists then
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   369
  # use it, else use the generic definitions from ergo.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   370
  ifneq ($(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(ERGO_ARCH_FILE)), )
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   371
    BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   372
  else # !ERGO_ARCH_FILE
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   373
    LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   374
  endif # ERGO_ARCH_FILE
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   375
endif #WINDOWS
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   376
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   377
# Append defines depending on target platform
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   378
LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   379
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   380
ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   381
  LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   382
endif
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
ifneq ($(USE_EXTERNAL_LIBZ), true)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   385
  BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   386
  LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   387
  BUILD_LIBJLI_FILES += \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   388
      inflate.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   389
      inftrees.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   390
      inffast.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   391
      zadler32.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   392
      zcrc32.c \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   393
      zutil.c
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   394
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   395
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   396
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   397
  LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   398
else
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   399
  LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   400
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   401
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   402
$(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   403
    LIBRARY := jli, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   404
    OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   405
    SRC := $(BUILD_LIBJLI_SRC_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   406
    INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   407
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   408
    OPTIMIZATION := HIGH, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   409
    CFLAGS := $(LIBJLI_CFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   410
    MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjli/mapfile-vers, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   411
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   412
        $(call SET_SHARED_LIBRARY_ORIGIN), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   413
    LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   414
    LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   415
    LDFLAGS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   416
    LDFLAGS_SUFFIX_solaris := $(LIBZ) $(LIBDL) -lc, \
21605
d32edf24ffcb 8025198: Intermittent test failure: java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java
dholmes
parents: 20896
diff changeset
   417
    LDFLAGS_SUFFIX_linux := $(LIBZ) $(LIBDL) -lc -lpthread -lrt, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   418
    LDFLAGS_SUFFIX_macosx := $(LIBZ), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   419
    LDFLAGS_SUFFIX_windows := \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   420
        -export:JLI_Launch \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   421
        -export:JLI_ManifestIterate \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   422
        -export:JLI_SetTraceLauncher \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   423
        -export:JLI_ReportErrorMessage \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   424
        -export:JLI_ReportErrorMessageSys \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   425
        -export:JLI_ReportMessage \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   426
        -export:JLI_ReportExceptionDescription \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   427
        -export:JLI_MemAlloc \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   428
        -export:JLI_CmdToArgs \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   429
        -export:JLI_GetStdArgc \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   430
        -export:JLI_GetStdArgs \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   431
        advapi32.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   432
        comctl32.lib \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   433
        user32.lib, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   434
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   435
    RC_FLAGS := $(RC_FLAGS) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   436
        -D "JDK_FNAME=jli.dll" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   437
        -D "JDK_INTERNAL_NAME=jli" \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   438
        -D "JDK_FTYPE=0x2L", \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   439
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   440
    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   441
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   442
BUILD_LIBRARIES += $(BUILD_LIBJLI)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   443
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   444
# 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
   445
# 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
   446
# in doing it for all platform to reduce complexity.
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   447
ifeq ($(OPENJDK_TARGET_OS), windows)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   448
  $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   449
      STATIC_LIBRARY := jli_static, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   450
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   451
      SRC := $(BUILD_LIBJLI_SRC_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   452
      INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   453
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   454
      OPTIMIZATION := HIGH, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   455
      CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   456
      ARFLAGS := $(ARFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   457
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   458
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   459
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   460
  BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   461
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   462
else ifeq ($(OPENJDK_TARGET_OS), macosx)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   463
  #
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   464
  # On macosx they do partial (incremental) linking of libjli_static.a
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   465
  # code it here...rather than add support to NativeCompilation
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   466
  # as this is first time I see it
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   467
  $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   468
      LIBRARY := jli_static, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   469
      OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   470
      SRC := $(BUILD_LIBJLI_SRC_DIRS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   471
      INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   472
      LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   473
      OPTIMIZATION := HIGH, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   474
      CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   475
      LDFLAGS := -nostdlib -r, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   476
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   477
      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   478
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   479
  $(JDK_OUTPUTDIR)/objs/libjli_static.a: $(BUILD_LIBJLI_STATIC)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   480
	$(call install-file)
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   481
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   482
  BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   483
endif
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   484
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   485
##########################################################################################
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   486
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   487
$(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   488
    LIBRARY := npt, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   489
    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   490
    SRC := $(JDK_TOPDIR)/src/share/npt $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   491
    LANG := C, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   492
    OPTIMIZATION := LOW, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   493
    CFLAGS := $(CFLAGS_JDKLIB) \
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   494
        -I$(JDK_TOPDIR)/src/share/npt \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   495
        -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   496
    MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnpt/mapfile-vers, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   497
    LDFLAGS := $(LDFLAGS_JDKLIB) \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   498
        $(call SET_SHARED_LIBRARY_ORIGIN), \
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   499
    LDFLAGS_macosx := -liconv, \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   500
    LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   501
    LDFLAGS_SUFFIX_solaris := -lc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   502
    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   503
    RC_FLAGS := $(RC_FLAGS) \
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   504
        -D "JDK_FNAME=npt.dll" \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   505
        -D "JDK_INTERNAL_NAME=npt" \
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   506
        -D "JDK_FTYPE=0x2L", \
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   507
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnpt, \
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   508
    DEBUG_SYMBOLS := true))
20547
453837141fac 8001931: The new build system whitespace cleanup
ihse
parents: 20203
diff changeset
   509
20890
9d7cc1b4291b 8025715: Split CompileNativeLibraries.gmk
ihse
parents: 20547
diff changeset
   510
BUILD_LIBRARIES += $(BUILD_LIBNPT)