Skip to content

Commit f1326ac

Browse files
amresh-sahuamresh-sahu
authored
Merge pull request #3 from openjdk/master
Update forked repo.
2 parents 31b9538 + 7ed46bd commit f1326ac

File tree

1,297 files changed

+31015
-15291
lines changed

Some content is hidden

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

1,297 files changed

+31015
-15291
lines changed

‎.github/workflows/submit.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -536,10 +536,6 @@ jobs:
536536
echo "cross_flags=
537537
--openjdk-target=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-flavor}}
538538
--with-sysroot=${HOME}/sysroot-${{ matrix.debian-arch }}/
539-
--with-toolchain-path=${HOME}/sysroot-${{ matrix.debian-arch }}/
540-
--with-freetype-lib=${HOME}/sysroot-${{ matrix.debian-arch }}/usr/lib/${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-flavor}}/
541-
--with-freetype-include=${HOME}/sysroot-${{ matrix.debian-arch }}/usr/include/freetype2/
542-
--x-libraries=${HOME}/sysroot-${{ matrix.debian-arch }}/usr/lib/${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-flavor}}/
543539
" >> $GITHUB_ENV
544540
if: matrix.debian-arch != ''
545541

‎doc/building.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ <h3 id="handling-reconfigurations">Handling Reconfigurations</h3>
849849
<p>If you update the repository and part of the configure script has changed, the build system will force you to re-run <code>configure</code>.</p>
850850
<p>Most of the time, you will be fine by running <code>configure</code> again with the same arguments as the last time, which can easily be performed by <code>make reconfigure</code>. To simplify this, you can use the <code>CONF_CHECK</code> make control variable, either as <code>make CONF_CHECK=auto</code>, or by setting an environment variable. For instance, if you add <code>export CONF_CHECK=auto</code> to your <code>.bashrc</code> file, <code>make</code> will always run <code>reconfigure</code> automatically whenever the configure script has changed.</p>
851851
<p>You can also use <code>CONF_CHECK=ignore</code> to skip the check for a needed configure update. This might speed up the build, but comes at the risk of an incorrect build result. This is only recommended if you know what you're doing.</p>
852-
<p>From time to time, you will also need to modify the command line to <code>configure</code> due to changes. Use <code>make print-configure</code> to show the command line used for your current configuration.</p>
852+
<p>From time to time, you will also need to modify the command line to <code>configure</code> due to changes. Use <code>make print-configuration</code> to show the command line used for your current configuration.</p>
853853
<h3 id="using-fine-grained-make-targets">Using Fine-Grained Make Targets</h3>
854854
<p>The default behavior for make is to create consistent and correct output, at the expense of build speed, if necessary.</p>
855855
<p>If you are prepared to take some risk of an incorrect build, and know enough of the system to understand how things build and interact, you can speed up the build process considerably by instructing make to only build a portion of the product.</p>

‎doc/building.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,8 +1556,8 @@ update. This might speed up the build, but comes at the risk of an incorrect
15561556
build result. This is only recommended if you know what you're doing.
15571557
15581558
From time to time, you will also need to modify the command line to `configure`
1559-
due to changes. Use `make print-configure` to show the command line used for
1560-
your current configuration.
1559+
due to changes. Use `make print-configuration` to show the command line used
1560+
for your current configuration.
15611561
15621562
### Using Fine-Grained Make Targets
15631563

‎make/CompileJavaModules.gmk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ CreateHkTargets = \
8686
################################################################################
8787
# Include module specific build settings
8888

89-
-include $(TOPDIR)/make/modules/$(MODULE)/Java.gmk
89+
-include Java.gmk
9090

9191
################################################################################
9292
# Setup the main compilation

‎make/Docs.gmk‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ JAVADOC_TAGS := \
9999
REFERENCE_TAGS := $(JAVADOC_TAGS)
100100

101101
# Which doclint checks to ignore
102-
JAVADOC_DISABLED_DOCLINT := accessibility html missing syntax reference
102+
JAVADOC_DISABLED_DOCLINT := missing
103103

104104
# The initial set of options for javadoc
105105
JAVADOC_OPTIONS := -use -keywords -notimestamp \
@@ -261,6 +261,7 @@ endef
261261
# SHORT_NAME - The short name of this documentation collection
262262
# LONG_NAME - The long name of this documentation collection
263263
# TARGET_DIR - Where to store the output
264+
# OTHER_VERSIONS - URL for other page listing versions
264265
#
265266
SetupApiDocsGeneration = $(NamedParamsMacroTemplate)
266267
define SetupApiDocsGenerationBody
@@ -297,10 +298,16 @@ define SetupApiDocsGenerationBody
297298
# Ignore the doclint warnings in the W3C DOM package
298299
$1_OPTIONS += -Xdoclint/package:-org.w3c.*
299300

301+
ifneq ($$($1_OTHER_VERSIONS), )
302+
$1_LINKED_SHORT_NAME = <a href="$$($1_OTHER_VERSIONS)">$$($1_SHORT_NAME)</a>
303+
else
304+
$1_LINKED_SHORT_NAME = $$($1_SHORT_NAME)
305+
endif
306+
300307
$1_DOC_TITLE := $$($1_LONG_NAME)<br>Version $$(VERSION_SPECIFICATION) API \
301308
Specification
302309
$1_WINDOW_TITLE := $$(subst &amp;,&,$$($1_SHORT_NAME))$$(DRAFT_MARKER_TITLE)
303-
$1_HEADER_TITLE := <div $$(HEADER_STYLE)><strong>$$($1_SHORT_NAME)</strong> \
310+
$1_HEADER_TITLE := <div $$(HEADER_STYLE)><strong>$$($1_LINKED_SHORT_NAME)</strong> \
304311
$$(DRAFT_MARKER_STR)</div>
305312

306313
$1_OPTIONS += -doctitle '$$($1_DOC_TITLE)'
@@ -438,6 +445,7 @@ $(eval $(call SetupApiDocsGeneration, JDK_API, \
438445
SHORT_NAME := $(JDK_SHORT_NAME), \
439446
LONG_NAME := $(JDK_LONG_NAME), \
440447
TARGET_DIR := $(DOCS_OUTPUTDIR)/api, \
448+
OTHER_VERSIONS := $(OTHER_JDK_VERSIONS_URL), \
441449
))
442450

443451
# Targets generated are returned in JDK_API_JAVADOC_TARGETS and

‎make/Main.gmk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES))
187187
define DeclareCompileJavaRecipe
188188
$1-java:
189189
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
190+
$(patsubst %,-I%/modules/$1,$(PHASE_MAKEDIRS)) \
190191
-f CompileJavaModules.gmk MODULE=$1)
191192
endef
192193

‎make/MainSupport.gmk‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,7 @@ define DeclareRecipeForModuleMakefile
150150
$2-$$($1_TARGET_SUFFIX):
151151
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
152152
-f ModuleWrapper.gmk -I $$(TOPDIR)/make/common/modules \
153-
$$(addprefix -I, $$(PHASE_MAKEDIRS) \
154-
$$(addsuffix /modules/$2, $$(PHASE_MAKEDIRS)) \
155-
) \
153+
$$(patsubst %,-I%/modules/$2,$$(PHASE_MAKEDIRS)) \
156154
MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX) $$($1_EXTRA_ARGS))
157155

158156
endef

‎make/autoconf/configure.ac‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST
248248
JDKOPT_EXCLUDE_TRANSLATIONS
249249
JDKOPT_ENABLE_DISABLE_MANPAGES
250250
JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE
251+
JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT
251252

252253
###############################################################################
253254
#

‎make/autoconf/jdk-options.m4‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2021, 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
@@ -585,6 +585,30 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE],
585585
AC_SUBST(BUILD_CDS_ARCHIVE)
586586
])
587587

588+
################################################################################
589+
#
590+
# Enable the alternative CDS core region alignment
591+
#
592+
AC_DEFUN([JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT],
593+
[
594+
UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: false,
595+
RESULT: ENABLE_COMPATIBLE_CDS_ALIGNMENT,
596+
DESC: [enable use alternative compatible cds core region alignment],
597+
DEFAULT_DESC: [disabled],
598+
CHECKING_MSG: [if compatible cds region alignment enabled],
599+
CHECK_AVAILABLE: [
600+
AC_MSG_CHECKING([if CDS archive is available])
601+
if test "x$BUILD_CDS_ARCHIVE" = "xfalse"; then
602+
AVAILABLE=false
603+
AC_MSG_RESULT([no (CDS is disabled)])
604+
else
605+
AVAILABLE=true
606+
AC_MSG_RESULT([yes])
607+
fi
608+
])
609+
AC_SUBST(ENABLE_COMPATIBLE_CDS_ALIGNMENT)
610+
])
611+
588612
################################################################################
589613
#
590614
# Disallow any output from containing absolute paths from the build system.

‎make/autoconf/lib-freetype.m4‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,16 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
192192
[$FREETYPE_BASE_DIR/lib], [well-known location])
193193
fi
194194
195+
if test "x$FOUND_FREETYPE" != "xyes" ; then
196+
LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include],
197+
[$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI], [well-known location])
198+
fi
199+
200+
if test "x$FOUND_FREETYPE" != "xyes" ; then
201+
LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include],
202+
[$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU_AUTOCONF-$OPENJDK_TARGET_OS-$OPENJDK_TARGET_ABI], [well-known location])
203+
fi
204+
195205
if test "x$FOUND_FREETYPE" != "xyes" ; then
196206
FREETYPE_BASE_DIR="$SYSROOT/usr/X11"
197207
LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include],

0 commit comments

Comments
 (0)