Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/openjdk/jdk into feature/…
Browse files Browse the repository at this point in the history 
…af-location-accessors
  • Loading branch information
@liach
liach committed Feb 5, 2025
2 parents 5334df0 + b9b62a0 commit 27faa8b
Show file tree
Hide file tree
Showing 3,873 changed files with 44,717 additions and 31,007 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .github/actions/get-gtest/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ runs:
- name: 'Export path to where GTest is installed'
id: path-name
run: |
# Export the path
echo 'path=gtest' >> $GITHUB_OUTPUT
# Export the absolute path
echo "path=`pwd`/gtest" >> $GITHUB_OUTPUT
shell: bash
4 changes: 2 additions & 2 deletions .github/actions/get-jtreg/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ runs:
- name: 'Export path to where JTReg is installed'
id: path-name
run: |
# Export the path
echo 'path=jtreg/installed' >> $GITHUB_OUTPUT
# Export the absolute path
echo "path=`pwd`/jtreg/installed" >> $GITHUB_OUTPUT
shell: bash
13 changes: 7 additions & 6 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand All @@ -24,8 +24,9 @@
#

###
### This file is just a very small wrapper needed to run the real make/Init.gmk.
### It also performs some sanity checks on make.
### This file is just a very small wrapper which will include make/PreInit.gmk,
### where the real work is done. This wrapper also performs some sanity checks
### on make that must be done before we can include another file.
###

# The shell code below will be executed on /usr/bin/make on Solaris, but not in GNU Make.
Expand Down Expand Up @@ -58,7 +59,7 @@ ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))),)
else
makefile_path := $(lastword $(MAKEFILE_LIST))
endif
topdir := $(strip $(patsubst %/, %, $(dir $(makefile_path))))
TOPDIR := $(strip $(patsubst %/, %, $(dir $(makefile_path))))

# ... and then we can include the real makefile
include $(topdir)/make/Init.gmk
# ... and then we can include the real makefile to bootstrap the build
include $(TOPDIR)/make/PreInit.gmk
4 changes: 2 additions & 2 deletions bin/idea.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -99,7 +99,7 @@ if [ "$VERBOSE" = "true" ] ; then
echo "idea template dir: $IDEA_TEMPLATE"
fi

cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I $MAKE_DIR/.. idea MAKEOVERRIDES= OUT=$IDEA_OUTPUT/env.cfg MODULES="$*" $CONF_ARG || exit 1
cd $TOP ; make idea-gen-config ALLOW=IDEA_OUTPUT,MODULES IDEA_OUTPUT=$IDEA_OUTPUT MODULES="$*" $CONF_ARG || exit 1
cd $SCRIPT_DIR

. $IDEA_OUTPUT/env.cfg
Expand Down
8 changes: 4 additions & 4 deletions doc/hotspot-style.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,10 @@ <h3 id="source-files">Source Files</h3>
should be put in the .hpp file, and not in the .inline.hpp file. This
rule exists to resolve problems with circular dependencies between
.inline.hpp files.</p></li>
<li><p>All .cpp files include precompiled.hpp as the first include
line.</p></li>
<li><p>precompiled.hpp is just a build time optimization, so don't rely
on it to resolve include problems.</p></li>
<li><p>Some build configurations use precompiled headers to speed up the
build times. The precompiled headers are included in the precompiled.hpp
file. Note that precompiled.hpp is just a build time optimization, so
don't rely on it to resolve include problems.</p></li>
<li><p>Keep the include lines alphabetically sorted.</p></li>
<li><p>Put conditional inclusions (<code>#if ...</code>) at the end of
the include list.</p></li>
Expand Down
8 changes: 4 additions & 4 deletions doc/hotspot-style.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ the first include line. Declarations needed by other files should be put
in the .hpp file, and not in the .inline.hpp file. This rule exists to
resolve problems with circular dependencies between .inline.hpp files.

* All .cpp files include precompiled.hpp as the first include line.

* precompiled.hpp is just a build time optimization, so don't rely on
it to resolve include problems.
* Some build configurations use precompiled headers to speed up the
build times. The precompiled headers are included in the precompiled.hpp
file. Note that precompiled.hpp is just a build time optimization, so
don't rely on it to resolve include problems.

* Keep the include lines alphabetically sorted.

Expand Down
20 changes: 8 additions & 12 deletions make/Bundles.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand All @@ -23,10 +23,9 @@
# questions.
#

default: all
include MakeFileStart.gmk

include $(SPEC)
include MakeBase.gmk
################################################################################

include CopyFiles.gmk
include MakeIO.gmk
Expand All @@ -43,8 +42,6 @@ ifeq ($(call isBuildOs, windows), true)
TAR_IGNORE_EXIT_VALUE := || test "$$$$?" = "1"
endif

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, Bundles-pre.gmk))
################################################################################
# BUNDLE : Name of bundle to create
# FILES : Files in BASE_DIRS to add to bundle
Expand Down Expand Up @@ -502,11 +499,6 @@ endif

################################################################################

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, Bundles.gmk))

################################################################################

product-bundles: $(PRODUCT_TARGETS)
legacy-bundles: $(LEGACY_TARGETS)
test-bundles: $(TEST_TARGETS)
Expand All @@ -517,6 +509,10 @@ static-libs-bundles: $(STATIC_LIBS_TARGETS)
static-libs-graal-bundles: $(STATIC_LIBS_GRAAL_TARGETS)
jcov-bundles: $(JCOV_TARGETS)

.PHONY: all default product-bundles test-bundles \
.PHONY: product-bundles test-bundles \
docs-jdk-bundles docs-javase-bundles docs-reference-bundles \
static-libs-bundles static-libs-graal-bundles jcov-bundles

################################################################################

include MakeFileEnd.gmk
11 changes: 5 additions & 6 deletions make/CompileCommands.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand All @@ -23,10 +23,9 @@
# questions.
#

default: all
include MakeFileStart.gmk

include $(SPEC)
include MakeBase.gmk
################################################################################

# When FIXPATH is set, let it process the file to make sure all paths are usable
# by system native tools. The FIXPATH tool assumes arguments preceded by an @
Expand All @@ -50,6 +49,6 @@ $(OUTPUTDIR)/compile_commands.json: $(wildcard $(MAKESUPPORT_OUTPUTDIR)/compile-

TARGETS += $(OUTPUTDIR)/compile_commands.json

all: $(TARGETS)
################################################################################

.PHONY: all
include MakeFileEnd.gmk
30 changes: 14 additions & 16 deletions make/CompileDemos.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand All @@ -23,23 +23,17 @@
# questions.
#

include MakeFileStart.gmk

################################################################################
# Build demos for the JDK into $(SUPPORT_OUTPUTDIR)/demos/image.
################################################################################

default: all

include $(SPEC)
include MakeBase.gmk

include CopyFiles.gmk
include JavaCompilation.gmk
include TextFileProcessing.gmk
include ZipArchive.gmk

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, CompileDemos-pre.gmk))

# Prepare the find cache.
DEMO_SRC_DIRS += $(TOPDIR)/src/demo

Expand Down Expand Up @@ -132,12 +126,19 @@ define SetupBuildDemoBody
JARMAIN := $$($1_MAIN_CLASS), \
MANIFEST := $(DEMO_MANIFEST), \
EXTRA_MANIFEST_ATTR := $$($1_EXTRA_MANIFEST_ATTR), \
SRCZIP := $(SUPPORT_OUTPUTDIR)/demos/image/$$($1_DEMO_SUBDIR)/$1/src.zip, \
EXCLUDE_FILES := $$($1_EXCLUDE_FILES), \
DISABLED_WARNINGS := $$($1_DISABLED_WARNINGS), \
))

$1 += $$(BUILD_DEMO_$1)

$$(eval $$(call SetupZipArchive, ZIP_SRC_DEMO_$1, \
SRC := $$($1_MAIN_SRC) $$($1_EXTRA_SRC_DIR), \
ZIP := $(SUPPORT_OUTPUTDIR)/demos/image/$$($1_DEMO_SUBDIR)/$1/src.zip, \
EXCLUDE_FILES := $$($1_EXCLUDE_FILES), \
))

$1 += $$(ZIP_SRC_DEMO_$1)
endif

# Copy files. Sort is needed to remove duplicates.
Expand Down Expand Up @@ -257,11 +258,8 @@ ifneq ($(filter images, $(MAKECMDGOALS)), )
IMAGES_TARGETS := $(COPY_TO_TEST_IMAGE)
endif

################################################################################
# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, CompileDemos-post.gmk))

all: $(TARGETS)
images: $(IMAGES_TARGETS)

.PHONY: all
################################################################################

include MakeFileEnd.gmk
11 changes: 4 additions & 7 deletions make/CompileInterimLangtools.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand All @@ -23,11 +23,9 @@
# questions.
#

# This must be the first rule
default: all
include MakeFileStart.gmk

include $(SPEC)
include MakeBase.gmk
################################################################################

include CopyFiles.gmk
include JavaCompilation.gmk
Expand Down Expand Up @@ -148,5 +146,4 @@ TARGETS += $(BUILD_JAVAC_SERVER)

################################################################################


all: $(TARGETS)
include MakeFileEnd.gmk
25 changes: 15 additions & 10 deletions make/CompileJavaModules.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand All @@ -23,13 +23,12 @@
# questions.
#

# This must be the first rule
default: all
include MakeFileStart.gmk

################################################################################

include $(SPEC)
include MakeBase.gmk
include Modules.gmk
include JavaCompilation.gmk
include Modules.gmk

################################################################################
# If this is an imported module that has prebuilt classes, only compile
Expand Down Expand Up @@ -86,7 +85,15 @@ CreateHkTargets = \
################################################################################
# Include module specific build settings

-include Java.gmk
THIS_SNIPPET := modules/$(MODULE)/Java.gmk

ifneq ($(wildcard $(THIS_SNIPPET)), )
include MakeSnippetStart.gmk

include $(THIS_SNIPPET)

include MakeSnippetEnd.gmk
endif

################################################################################
# Setup the main compilation
Expand Down Expand Up @@ -148,6 +155,4 @@ endif

################################################################################

all: $(TARGETS)

.PHONY: all
include MakeFileEnd.gmk
12 changes: 5 additions & 7 deletions make/CompileModuleTools.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand All @@ -23,14 +23,12 @@
# questions.
#

default: all

include $(SPEC)
include MakeBase.gmk
include JavaCompilation.gmk
include MakeFileStart.gmk

################################################################################

include JavaCompilation.gmk

TOOLS_CLASSES_DIR := $(BUILDTOOLS_OUTPUTDIR)/tools_jigsaw_classes

# When using an external BUILDJDK, make it possible to shortcut building of
Expand Down Expand Up @@ -64,4 +62,4 @@ TARGETS += $(BUILD_JIGSAW_TOOLS)

################################################################################

all: $(TARGETS)
include MakeFileEnd.gmk
18 changes: 5 additions & 13 deletions make/CompileToolsHotspot.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand All @@ -23,19 +23,12 @@
# questions.
#

# This must be the first rule
default: all
include MakeFileStart.gmk

include $(SPEC)
include MakeBase.gmk
################################################################################

include JavaCompilation.gmk

TARGETS :=

# Hook to include the corresponding custom file, if present.
$(eval $(call IncludeCustomExtension, hotspot/CompileTools.gmk))

################################################################################
# Build tools needed for the JFR source code generation

Expand All @@ -51,7 +44,6 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_HOTSPOT, \

TARGETS += $(BUILD_TOOLS_HOTSPOT)

################################################################################

all: $(TARGETS)

.PHONY: all
include MakeFileEnd.gmk
Loading

0 comments on commit 27faa8b

Please sign in to comment.