Mercurial > hg > openjdk > aarch64-port
changeset 1448:09958adbb427
Merge
| author | asaha |
|---|---|
| date | Wed, 18 Mar 2015 18:09:23 -0700 |
| parents | 13831d1250e8 (current diff) 3dbe2c37d11e (diff) |
| children | fdc9d03bed70 |
| files | .hgtags |
| diffstat | 4 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Mar 17 11:59:08 2015 -0700 +++ b/.hgtags Wed Mar 18 18:09:23 2015 -0700 @@ -401,3 +401,6 @@ 2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02 590cc3ca1fec083de3543b18b0062651b597e376 jdk8u60-b03 d8d408861c2094c24e9757a67bf2941ed37ce01f jdk8u60-b04 +e532f3672f635bd83c673c349b7563db6dd470bb jdk8u60-b05 +74dbdbcb6aac9fd62f3599ad4e0a1f930b1e9ac1 jdk8u60-b06 +ea714a39e902fb8729f71f2d0f634855646e297d jdk8u60-b07
--- a/common/autoconf/generated-configure.sh Tue Mar 17 11:59:08 2015 -0700 +++ b/common/autoconf/generated-configure.sh Wed Mar 18 18:09:23 2015 -0700 @@ -3877,7 +3877,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1421450260 +DATE_WHEN_GENERATED=1425379745 ############################################################################### # @@ -7212,7 +7212,8 @@ # ZERO_ARCHDEF is used to enable architecture-specific code case "${OPENJDK_TARGET_CPU}" in - ppc*) ZERO_ARCHDEF=PPC ;; + ppc) ZERO_ARCHDEF=PPC32 ;; + ppc64) ZERO_ARCHDEF=PPC64 ;; s390*) ZERO_ARCHDEF=S390 ;; sparc*) ZERO_ARCHDEF=SPARC ;; x86_64*) ZERO_ARCHDEF=AMD64 ;;
--- a/common/autoconf/platform.m4 Tue Mar 17 11:59:08 2015 -0700 +++ b/common/autoconf/platform.m4 Wed Mar 18 18:09:23 2015 -0700 @@ -365,7 +365,8 @@ # ZERO_ARCHDEF is used to enable architecture-specific code case "${OPENJDK_TARGET_CPU}" in - ppc*) ZERO_ARCHDEF=PPC ;; + ppc) ZERO_ARCHDEF=PPC32 ;; + ppc64) ZERO_ARCHDEF=PPC64 ;; s390*) ZERO_ARCHDEF=S390 ;; sparc*) ZERO_ARCHDEF=SPARC ;; x86_64*) ZERO_ARCHDEF=AMD64 ;;
--- a/make/jprt.properties Tue Mar 17 11:59:08 2015 -0700 +++ b/make/jprt.properties Wed Mar 18 18:09:23 2015 -0700 @@ -29,7 +29,7 @@ # # The current release name -my.jdk.update.version=40 +my.jdk.update.version=60 jprt.tools.default.release=jdk8u${my.jdk.update.version} # Check if this is the equivalent of a hotspot push job