Skip to content

Commit a8a496c

Browse files
RealCLangerRealCLanger
authored
Merge pull request #1648 from SAP/pr-jdk-23+19
Merge to tag jdk-23+19
2 parents 0be83ca + 706b421 commit a8a496c

File tree

520 files changed

+13566
-14521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

520 files changed

+13566
-14521
lines changed

‎make/Bundles.gmk

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,9 @@ default: all
2828
include $(SPEC)
2929
include MakeBase.gmk
3030

31+
include CopyFiles.gmk
32+
include MakeIO.gmk
33+
3134
PRODUCT_TARGETS :=
3235
LEGACY_TARGETS :=
3336
TEST_TARGETS :=

‎make/CompileDemos.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ default: all
3131

3232
include $(SPEC)
3333
include MakeBase.gmk
34+
35+
include CopyFiles.gmk
3436
include JavaCompilation.gmk
3537
include TextFileProcessing.gmk
3638
include ZipArchive.gmk

‎make/CompileInterimLangtools.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ default: all
2828

2929
include $(SPEC)
3030
include MakeBase.gmk
31+
32+
include CopyFiles.gmk
3133
include JavaCompilation.gmk
3234
include Modules.gmk
3335

‎make/CompileModuleTools.gmk

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JIGSAW_TOOLS, \
5353
build/tools/jigsaw, \
5454
COPY := .properties .html, \
5555
BIN := $(TOOLS_CLASSES_DIR), \
56-
DISABLED_WARNINGS := fallthrough this-escape, \
56+
DISABLED_WARNINGS := fallthrough, \
5757
JAVAC_FLAGS := \
5858
--add-modules jdk.jdeps \
5959
--add-exports java.base/jdk.internal.module=ALL-UNNAMED \

‎make/CompileToolsJdk.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ default: all
2727

2828
include $(SPEC)
2929
include MakeBase.gmk
30+
31+
include CopyFiles.gmk
3032
include JavaCompilation.gmk
3133
include TextFileProcessing.gmk
3234

‎make/CopyImportModules.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ default: all
3131
include $(SPEC)
3232
include MakeBase.gmk
3333

34+
include CopyFiles.gmk
35+
3436
LIBS_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_LIBS)))
3537
CMDS_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_CMDS)))
3638
CONF_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_CONF)))

‎make/CopyInterimTZDB.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ default: all
2828
include $(SPEC)
2929
include MakeBase.gmk
3030

31+
include CopyFiles.gmk
32+
3133
##########################################################################################
3234

3335
### TZDB tool needs files from java.time.zone package

‎make/CreateJmods.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ default: all
2727

2828
include $(SPEC)
2929
include MakeBase.gmk
30+
31+
include CopyFiles.gmk
3032
include Execute.gmk
3133
include Modules.gmk
3234

‎make/Docs.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ default: all
2626

2727
include $(SPEC)
2828
include MakeBase.gmk
29+
30+
include CopyFiles.gmk
2931
include Execute.gmk
3032
include Modules.gmk
3133
include ModuleTools.gmk

‎make/GenerateLinkOptData.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ default: all
3131

3232
include $(SPEC)
3333
include MakeBase.gmk
34+
35+
include CopyFiles.gmk
3436
include JavaCompilation.gmk
3537

3638
################################################################################

‎make/GraalBuilderImage.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ default: all
3131
include $(SPEC)
3232
include MakeBase.gmk
3333

34+
include CopyFiles.gmk
35+
3436
################################################################################
3537

3638
TARGETS :=

‎make/Images.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ default: all
2727

2828
include $(SPEC)
2929
include MakeBase.gmk
30+
31+
include CopyFiles.gmk
3032
include Execute.gmk
3133
include Modules.gmk
3234
include Utils.gmk

‎make/InitSupport.gmk

+25
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,31 @@ else # $(HAS_SPEC)=true
536536
endef
537537
endif
538538

539+
##############################################################################
540+
# Functions for timers
541+
##############################################################################
542+
543+
# Store the build times in this directory.
544+
BUILDTIMESDIR=$(OUTPUTDIR)/make-support/build-times
545+
546+
# Record starting time for build of a sub repository.
547+
define RecordStartTime
548+
$(DATE) '+%Y %m %d %H %M %S' | $(AWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$(strip $1) && \
549+
$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$(strip $1)_human_readable
550+
endef
551+
552+
# Record ending time and calculate the difference and store it in a
553+
# easy to read format. Handles builds that cross midnight. Expects
554+
# that a build will never take 24 hours or more.
555+
define RecordEndTime
556+
$(DATE) '+%Y %m %d %H %M %S' | $(AWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)
557+
$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)_human_readable
558+
$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$(strip $1)` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$(strip $1)` $1 | \
559+
$(AWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
560+
M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
561+
> $(BUILDTIMESDIR)/build_time_diff_$(strip $1)
562+
endef
563+
539564
define StartGlobalTimer
540565
$(RM) -r $(BUILDTIMESDIR) 2> /dev/null && \
541566
$(MKDIR) -p $(BUILDTIMESDIR) && \

‎make/JrtfsJar.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ default: all
2727

2828
include $(SPEC)
2929
include MakeBase.gmk
30+
31+
include CopyFiles.gmk
3032
include JavaCompilation.gmk
3133
include JarArchive.gmk
3234
include TextFileProcessing.gmk

‎make/MacBundles.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
include $(SPEC)
2727
include MakeBase.gmk
28+
29+
include CopyFiles.gmk
2830
include TextFileProcessing.gmk
2931

3032
default: bundles

‎make/ModuleWrapper.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ default: all
3535
include $(SPEC)
3636
include MakeBase.gmk
3737

38+
include CopyFiles.gmk
39+
3840
MODULE_SRC := $(TOPDIR)/src/$(MODULE)
3941

4042
# All makefiles should add the targets to be built to this variable.

‎make/RunTestsPrebuiltSpec.gmk

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -176,7 +176,3 @@ ULIMIT := ulimit
176176
ifeq ($(OPENJDK_BUILD_OS), windows)
177177
PATHTOOL := cygpath
178178
endif
179-
180-
################################################################################
181-
# Simple macros from spec.gmk.in
182-
SHARED_LIBRARY=$(LIBRARY_PREFIX)$1$(SHARED_LIBRARY_SUFFIX)

‎make/SourceRevision.gmk

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,16 @@ $(eval $(call IncludeCustomExtension, SourceRevision-pre.gmk))
4141

4242
STORED_SOURCE_REVISION := $(TOPDIR)/.src-rev
4343

44+
# Locate all sourcecode repositories included in the forest, as absolute paths
45+
FindAllReposAbs = \
46+
$(strip $(sort $(dir $(filter-out $(TOPDIR)/build/%, $(wildcard \
47+
$(addprefix $(TOPDIR)/, .git */.git */*/.git */*/*/.git */*/*/*/.git) \
48+
)))))
49+
50+
# Locate all sourcecode repositories included in the forest, as relative paths
51+
FindAllReposRel = \
52+
$(strip $(subst $(TOPDIR)/,.,$(patsubst $(TOPDIR)/%/, %, $(FindAllReposAbs))))
53+
4454
USE_SCM := false
4555
ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
4656
USE_SCM := true

‎make/StaticLibsImage.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ default: all
3030

3131
include $(SPEC)
3232
include MakeBase.gmk
33+
34+
include CopyFiles.gmk
3335
include Modules.gmk
3436

3537
ALL_MODULES = $(call FindAllModules)

‎make/autoconf/build-aux/autoconf-config.guess

+51-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
#
3-
# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,11 @@
2525
#
2626

2727
# Attempt to guess a canonical system name.
28-
# Copyright 1992-2022 Free Software Foundation, Inc.
28+
# Copyright 1992-2024 Free Software Foundation, Inc.
2929

3030
# shellcheck disable=SC2006,SC2268 # see below for rationale
3131

32-
timestamp='2022-09-17'
32+
timestamp='2024-01-01'
3333

3434
# This file is free software; you can redistribute it and/or modify it
3535
# under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@ me=`echo "$0" | sed -e 's,.*/,,'`
7272
usage="\
7373
Usage: $0 [OPTION]
7474
75-
Output the configuration name of the system \`$me' is run on.
75+
Output the configuration name of the system '$me' is run on.
7676
7777
Options:
7878
-h, --help print this help, then exit
@@ -85,13 +85,13 @@ version="\
8585
GNU config.guess ($timestamp)
8686
8787
Originally written by Per Bothner.
88-
Copyright 1992-2022 Free Software Foundation, Inc.
88+
Copyright 1992-2024 Free Software Foundation, Inc.
8989
9090
This is free software; see the source for copying conditions. There is NO
9191
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
9292

9393
help="
94-
Try \`$me --help' for more information."
94+
Try '$me --help' for more information."
9595

9696
# Parse command line
9797
while test $# -gt 0 ; do
@@ -127,8 +127,8 @@ GUESS=
127127
# temporary files to be created and, as you can see below, it is a
128128
# headache to deal with in a portable fashion.
129129

130-
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
131-
# use `HOST_CC' if defined, but it is deprecated.
130+
# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
131+
# use 'HOST_CC' if defined, but it is deprecated.
132132

133133
# Portable tmp directory creation inspired by the Autoconf team.
134134

@@ -180,20 +180,26 @@ Linux|GNU|GNU/*)
180180

181181
set_cc_for_build
182182
cat <<-EOF > "$dummy.c"
183+
#if defined(__ANDROID__)
184+
LIBC=android
185+
#else
183186
#include <features.h>
184187
#if defined(__UCLIBC__)
185188
LIBC=uclibc
186189
#elif defined(__dietlibc__)
187190
LIBC=dietlibc
188191
#elif defined(__GLIBC__)
189192
LIBC=gnu
193+
#elif defined(__LLVM_LIBC__)
194+
LIBC=llvm
190195
#else
191196
#include <stdarg.h>
192197
/* First heuristic to detect musl libc. */
193198
#ifdef __DEFINED_va_list
194199
LIBC=musl
195200
#endif
196201
#endif
202+
#endif
197203
EOF
198204
cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
199205
eval "$cc_set_libc"
@@ -484,7 +490,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
484490
UNAME_RELEASE=`uname -v`
485491
;;
486492
esac
487-
# Japanese Language versions have a version number like `4.1.3-JL'.
493+
# Japanese Language versions have a version number like '4.1.3-JL'.
488494
SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
489495
GUESS=sparc-sun-sunos$SUN_REL
490496
;;
@@ -929,7 +935,7 @@ EOF
929935
fi
930936
;;
931937
*:FreeBSD:*:*)
932-
UNAME_PROCESSOR=`/usr/bin/uname -p`
938+
UNAME_PROCESSOR=`uname -p`
933939
case $UNAME_PROCESSOR in
934940
amd64)
935941
UNAME_PROCESSOR=x86_64 ;;
@@ -1001,7 +1007,27 @@ EOF
10011007
GUESS=$UNAME_MACHINE-unknown-minix
10021008
;;
10031009
aarch64:Linux:*:*)
1004-
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
1010+
set_cc_for_build
1011+
CPU=$UNAME_MACHINE
1012+
LIBCABI=$LIBC
1013+
if test "$CC_FOR_BUILD" != no_compiler_found; then
1014+
ABI=64
1015+
sed 's/^ //' << EOF > "$dummy.c"
1016+
#ifdef __ARM_EABI__
1017+
#ifdef __ARM_PCS_VFP
1018+
ABI=eabihf
1019+
#else
1020+
ABI=eabi
1021+
#endif
1022+
#endif
1023+
EOF
1024+
cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
1025+
eval "$cc_set_abi"
1026+
case $ABI in
1027+
eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
1028+
esac
1029+
fi
1030+
GUESS=$CPU-unknown-linux-$LIBCABI
10051031
;;
10061032
aarch64_be:Linux:*:*)
10071033
UNAME_MACHINE=aarch64_be
@@ -1067,6 +1093,15 @@ EOF
10671093
k1om:Linux:*:*)
10681094
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
10691095
;;
1096+
kvx:Linux:*:*)
1097+
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
1098+
;;
1099+
kvx:cos:*:*)
1100+
GUESS=$UNAME_MACHINE-unknown-cos
1101+
;;
1102+
kvx:mbr:*:*)
1103+
GUESS=$UNAME_MACHINE-unknown-mbr
1104+
;;
10701105
loongarch32:Linux:*:* | loongarch64:Linux:*:*)
10711106
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
10721107
;;
@@ -1222,7 +1257,7 @@ EOF
12221257
GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
12231258
;;
12241259
i*86:OS/2:*:*)
1225-
# If we were able to find `uname', then EMX Unix compatibility
1260+
# If we were able to find 'uname', then EMX Unix compatibility
12261261
# is probably installed.
12271262
GUESS=$UNAME_MACHINE-pc-os2-emx
12281263
;;
@@ -1363,7 +1398,7 @@ EOF
13631398
GUESS=ns32k-sni-sysv
13641399
fi
13651400
;;
1366-
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1401+
PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
13671402
# says <[email protected]>
13681403
GUESS=i586-unisys-sysv4
13691404
;;
@@ -1585,6 +1620,9 @@ EOF
15851620
*:Unleashed:*:*)
15861621
GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
15871622
;;
1623+
*:Ironclad:*:*)
1624+
GUESS=$UNAME_MACHINE-unknown-ironclad
1625+
;;
15881626
esac
15891627

15901628
# Do we have a guess based on uname results?

0 commit comments

Comments
 (0)