From a39d9629ddd66408aedabe1b6d20f75f220a5315 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Mon, 15 Aug 2016 16:14:59 +0200 Subject: [PATCH 1/3] 8069540: Remove universal binaries support from hotspot build Reviewed-by: tbell, dholmes, dcubed --- common/autoconf/spec.gmk.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index e4d41e81b43..c591a79d327 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -251,8 +251,6 @@ SUPPORT_HEADLESS:=@SUPPORT_HEADLESS@ # Legacy support USE_NEW_HOTSPOT_BUILD:=@USE_NEW_HOTSPOT_BUILD@ -MACOSX_UNIVERSAL=@MACOSX_UNIVERSAL@ - # JDK_OUTPUTDIR specifies where a working jvm is built. # You can run $(JDK_OUTPUTDIR)/bin/java # Though the layout of the contents of $(JDK_OUTPUTDIR) is not From 012327f7c163e534490259413ea1b7ea527123a9 Mon Sep 17 00:00:00 2001 From: Lana Steuck Date: Thu, 18 Aug 2016 21:01:21 +0000 Subject: [PATCH 2/3] Added tag jdk-9+132 for changeset cbba9772b2be --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 9c7560ce460..2ab754ea198 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -374,3 +374,4 @@ b30ae794d974d7dd3eb4e84203f70021823fa6c6 jdk-9+128 f5902d3841b82cac6e7716a20c24e8e916fb14a8 jdk-9+129 d94d54a3192fea79234c3ac55cd0b4052d45e954 jdk-9+130 8728756c2f70a79a90188f4019cfd6b9a275765c jdk-9+131 +a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132 From e49b61eacb55ee672d829132a9c65f9bde37bbec Mon Sep 17 00:00:00 2001 From: Tim Bell Date: Fri, 19 Aug 2016 07:54:03 -0700 Subject: [PATCH 3/3] 8164402: key word 'requires' appearing in comment causing a build failure Reviewed-by: erikj, dholmes --- make/common/Modules.gmk | 1 + 1 file changed, 1 insertion(+) diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk index ef77ffd5213..9f1482e0c64 100644 --- a/make/common/Modules.gmk +++ b/make/common/Modules.gmk @@ -229,6 +229,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \ sub(/public/, ""); \ sub(/\/\/.*/, ""); \ sub(/\/\*.*\*\//, ""); \ + gsub(/^ +\*.*/, ""); \ gsub(/ /, ""); \ printf(" %s", $$0) } \ END { printf("\n") }' $m \