Merge

Wed, 08 Jan 2014 11:36:47 -0800

author
lana
date
Wed, 08 Jan 2014 11:36:47 -0800
changeset 929
ca4612164195
parent 922
ff1478785e43
parent 926
53d74b77ee53
child 930
b5e1dad69605

Merge

     1.1 --- a/common/autoconf/generated-configure.sh	Fri Jan 03 11:54:34 2014 -0800
     1.2 +++ b/common/autoconf/generated-configure.sh	Wed Jan 08 11:36:47 2014 -0800
     1.3 @@ -3865,7 +3865,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=1384422786
     1.8 +DATE_WHEN_GENERATED=1389186094
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -29625,7 +29625,7 @@
    1.13    fi
    1.14  
    1.15    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
    1.16 -  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"$RELEASE\"'"
    1.17 +  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
    1.18  
    1.19    CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
    1.20        -I${JDK_OUTPUTDIR}/include \
     2.1 --- a/common/autoconf/toolchain.m4	Fri Jan 03 11:54:34 2014 -0800
     2.2 +++ b/common/autoconf/toolchain.m4	Wed Jan 08 11:36:47 2014 -0800
     2.3 @@ -936,7 +936,7 @@
     2.4    fi
     2.5  
     2.6    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
     2.7 -  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"$RELEASE\"'"
     2.8 +  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
     2.9  
    2.10    CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
    2.11        -I${JDK_OUTPUTDIR}/include \

mercurial