Merge

Wed, 09 Apr 2014 10:12:52 -0700

author
asaha
date
Wed, 09 Apr 2014 10:12:52 -0700
changeset 1030
06b2c23e242d
parent 1029
a214741db29f
parent 988
d8ff32aa51b4
child 1031
cc4ca2ff0afc

Merge

.hgtags file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Apr 02 10:33:23 2014 -0700
     1.2 +++ b/.hgtags	Wed Apr 09 10:12:52 2014 -0700
     1.3 @@ -281,3 +281,4 @@
     1.4  ae6a3aec6aa29509a0fd5f53709889b99b1e27da jdk8u20-b06
     1.5  6403ef94cb0db32d9221a5e8f09f3664cd7744dc jdk8u20-b07
     1.6  b7750b6ee1578fd5b2b1f6758f905b332503d8ed jdk8u20-b08
     1.7 +d420eae635c42be98b166e1ce9c64fc0a8825529 jdk8u20-b09
     2.1 --- a/common/autoconf/build-aux/config.guess	Wed Apr 02 10:33:23 2014 -0700
     2.2 +++ b/common/autoconf/build-aux/config.guess	Wed Apr 09 10:12:52 2014 -0700
     2.3 @@ -76,4 +76,14 @@
     2.4    OUT=powerpc$KERNEL_BITMODE`echo $OUT | sed -e 's/[^-]*//'`
     2.5  fi
     2.6  
     2.7 +# Test and fix little endian PowerPC64.
     2.8 +# TODO: should be handled by autoconf-config.guess. 
     2.9 +if [ "x$OUT" = x ]; then
    2.10 +  if [ `uname -m` = ppc64le ]; then
    2.11 +    if [ `uname -s` = Linux ]; then
    2.12 +      OUT=powerpc64le-unknown-linux-gnu
    2.13 +    fi
    2.14 +  fi
    2.15 +fi
    2.16 +
    2.17  echo $OUT
     3.1 --- a/common/autoconf/platform.m4	Wed Apr 02 10:33:23 2014 -0700
     3.2 +++ b/common/autoconf/platform.m4	Wed Apr 09 10:12:52 2014 -0700
     3.3 @@ -60,6 +60,12 @@
     3.4        VAR_CPU_BITS=64
     3.5        VAR_CPU_ENDIAN=big
     3.6        ;;
     3.7 +    powerpc64le)
     3.8 +      VAR_CPU=ppc64
     3.9 +      VAR_CPU_ARCH=ppc
    3.10 +      VAR_CPU_BITS=64
    3.11 +      VAR_CPU_ENDIAN=little
    3.12 +      ;;
    3.13      s390)
    3.14        VAR_CPU=s390
    3.15        VAR_CPU_ARCH=s390
     4.1 --- a/make/Jprt.gmk	Wed Apr 02 10:33:23 2014 -0700
     4.2 +++ b/make/Jprt.gmk	Wed Apr 09 10:12:52 2014 -0700
     4.3 @@ -106,6 +106,9 @@
     4.4          ifdef ENABLE_SJAVAC
     4.5  	  @$(ECHO) " --enable-sjavac" >> $@.tmp
     4.6          endif
     4.7 +        ifdef JDK_UPDATE_VERSION
     4.8 +	  @$(ECHO) " --with-update-version=$(JDK_UPDATE_VERSION)" >> $@.tmp
     4.9 +        endif
    4.10          ifeq ($(HOTSPOT_AVAILABLE),false)
    4.11            ifdef ALT_JDK_IMPORT_PATH
    4.12  	    @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp

mercurial