8239799: Cross-compilation ARM32/AARCH clientvm builds fails after JDK-8239450

magicus · magicus · commit 290c21f06736 · 2020-02-28T09:53:18.000+01:00
Reviewed-by: erikj
diff --git a/make/autoconf/buildjdk-spec.gmk.in b/make/autoconf/buildjdk-spec.gmk.in
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2020, 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
@@ -96,6 +96,7 @@ BUILD_GTEST := false
 
 JVM_VARIANTS := server
 JVM_VARIANT_MAIN := server
+JVM_FEATURES_server := cds compiler1 compiler2 g1gc serialgc
 
 # Some users still set EXTRA_*FLAGS on the make command line. Must
 # make sure to override that when building buildjdk.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`#`
`5`	`5`	`# This code is free software; you can redistribute it and/or modify it`
`@@ -96,6 +96,7 @@ BUILD_GTEST := false`
`96`	`96`
`97`	`97`	`JVM_VARIANTS := server`
`98`	`98`	`JVM_VARIANT_MAIN := server`
	`99`	`+JVM_FEATURES_server := cds compiler1 compiler2 g1gc serialgc`
`99`	`100`
`100`	`101`	`# Some users still set EXTRA_*FLAGS on the make command line. Must`
`101`	`102`	`# make sure to override that when building buildjdk.`