8038655: Resolve autoconf merge issue of 8u5 and 8u20 jdk8u20-b10

Thu, 10 Apr 2014 15:25:51 -0700

author
asaha
date
Thu, 10 Apr 2014 15:25:51 -0700
changeset 1031
cc4ca2ff0afc
parent 1030
06b2c23e242d
child 1032
baa996fb9227

8038655: Resolve autoconf merge issue of 8u5 and 8u20
Reviewed-by: katleman

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Wed Apr 09 10:12:52 2014 -0700
     1.2 +++ b/common/autoconf/generated-configure.sh	Thu Apr 10 15:25:51 2014 -0700
     1.3 @@ -3868,7 +3868,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1396458209
     1.8 +DATE_WHEN_GENERATED=1397150809
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -6830,6 +6830,12 @@
    1.13        VAR_CPU_BITS=64
    1.14        VAR_CPU_ENDIAN=big
    1.15        ;;
    1.16 +    powerpc64le)
    1.17 +      VAR_CPU=ppc64
    1.18 +      VAR_CPU_ARCH=ppc
    1.19 +      VAR_CPU_BITS=64
    1.20 +      VAR_CPU_ENDIAN=little
    1.21 +      ;;
    1.22      s390)
    1.23        VAR_CPU=s390
    1.24        VAR_CPU_ARCH=s390
    1.25 @@ -6955,6 +6961,12 @@
    1.26        VAR_CPU_BITS=64
    1.27        VAR_CPU_ENDIAN=big
    1.28        ;;
    1.29 +    powerpc64le)
    1.30 +      VAR_CPU=ppc64
    1.31 +      VAR_CPU_ARCH=ppc
    1.32 +      VAR_CPU_BITS=64
    1.33 +      VAR_CPU_ENDIAN=little
    1.34 +      ;;
    1.35      s390)
    1.36        VAR_CPU=s390
    1.37        VAR_CPU_ARCH=s390

mercurial