Merge

.hgtags

@@ -245,6 +245,7 @@ cd3825b2983045784d6fc6d1729c799b08215752 jdk8-b120
 1e1f86d5d4e22c15a9bf9f1581acddb8c59abae2 jdk8-b121
 347009c5881668b1e44f64d56d4a96cb20a183fa jdk8-b122
 ff1478785e43718146ffbce97e007f39c3bcaa32 jdk8-b123
+790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b124
 c41935d79b8744af8b7b56cd4d4ab781027fb22e jdk8u5-b01
 6f3357d3dbf83c1ef0098bcb853e3aa3b26f4cb8 jdk8u5-b02
 794b4365b6884e9a15f0840792539f5821814127 jdk8u5-b03

common/autoconf/generated-configure.sh

@@ -3865,7 +3865,7 @@ fi
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1387198493
+DATE_WHEN_GENERATED=1390028922
 
 ###############################################################################
 #
@@ -29631,7 +29631,7 @@ fi
   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 \

common/autoconf/toolchain.m4

@@ -936,7 +936,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK],
   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 \