# HG changeset patch
# User lana
# Date 1389209807 28800
# Node ID ca4612164195c596e553560258561885cde02881
# Parent  ff1478785e43718146ffbce97e007f39c3bcaa32# Parent  53d74b77ee53fb8d43f2f84bda1d135e37a09899
Merge

diff -r ff1478785e43 -r ca4612164195 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Fri Jan 03 11:54:34 2014 -0800
+++ b/common/autoconf/generated-configure.sh	Wed Jan 08 11:36:47 2014 -0800
@@ -3865,7 +3865,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1384422786
+DATE_WHEN_GENERATED=1389186094
 
 ###############################################################################
 #
@@ -29625,7 +29625,7 @@
   fi
 
   CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
-  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"$RELEASE\"'"
+  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
 
   CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
       -I${JDK_OUTPUTDIR}/include \
diff -r ff1478785e43 -r ca4612164195 common/autoconf/toolchain.m4
--- a/common/autoconf/toolchain.m4	Fri Jan 03 11:54:34 2014 -0800
+++ b/common/autoconf/toolchain.m4	Wed Jan 08 11:36:47 2014 -0800
@@ -936,7 +936,7 @@
   fi
 
   CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
-  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"$RELEASE\"'"
+  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
 
   CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
       -I${JDK_OUTPUTDIR}/include \