[jdk11u-dev] RFR: 8218431: Improved platform checking in makefiles [v5]

Goetz Lindenmaier goetz at openjdk.org
Wed Feb 1 09:24:54 UTC 2023


> This is a quite big change, but it's all  mechanic edits.
> It replaces the tests for platforms. The old tests
> still work, so there is no problem in omitting some 
> of the adaptions.
> The new functionality added in Utels.gmk applied clean.
> 
> I resolved the following hunks:make/Images.gmk
> make/RunTests.gmk
> Simple resolve
> 
> make/TestImage.gmk
> Skipped, edited code not in 11.
> 
> make/common/NativeCompilation.gmk
> Two hunks did not apply.
> Skipped first one, code not in 11.
> Second was trivial.
> 
> make/copy/Copy-java.base.gmk
> First trivial.
> Second skipped. Two conditions checked magically :)
> Third skipped.
> 
> make/hotspot/gensrc/GensrcAdlc.gmk
> Trivial.
> 
> make/hotspot/ide/CreateVSProject.gmk
> Skipped, code not in 11.
> 
> make/hotspot/lib/CompileDtraceLibraries.gmk
> Trivial
> 
> make/hotspot/lib/CompileJvm.gmk
> Trivial.
> 
> make/launcher/LauncherCommon.gmk
> Omitted. Code not in 11.
> 
> make/lib/Awt2dLibraries.gmk
> Parts applied, parts of the patched code not in 11.
> Second and third hung to resolve were trivial.
> 
> make/lib/CoreLibraries.gmk
> Trival.
> 
> make/lib/Lib-java.base.gmk
> Code not in 11.
> 
> make/lib/Lib-jdk.hotspot.agent.gmk
> Trivial
> 
> make/test/JtregNativeJdk.gmk
> Trivial

Goetz Lindenmaier has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains eight commits:

 - Merge branch 'master' into goetz_backport_8218431
 - Add edits to NativeCompilation.gmk
 - Merge branch 'pr/1695' into goetz_backport_8218431
 - Merge branch 'openjdk:master' into goetz_backport_8217730
 - Merge branch 'openjdk:master' into goetz_backport_8218431
 - Backport 208c58c8621247023e39c98a7b81638c62daedec
 - Move differences between current 11 and the base of the orig change to Utils.gmk
 - Backport 16271669822c7500b60fc4da6268f682d0ba581c

-------------

Changes: https://git.openjdk.org/jdk11u-dev/pull/1702/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=1702&range=04
  Stats: 308 lines in 64 files changed: 83 ins; 7 del; 218 mod
  Patch: https://git.openjdk.org/jdk11u-dev/pull/1702.diff
  Fetch: git fetch https://git.openjdk.org/jdk11u-dev pull/1702/head:pull/1702

PR: https://git.openjdk.org/jdk11u-dev/pull/1702


More information about the jdk-updates-dev mailing list