changeset in /hg/icedtea: Shark merge.

[Andrew John Hughes]

changeset dd44934ab114 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dd44934ab114
description:
	Shark merge.

	2009-05-05 Xerxes R?nby <xerxes at zafena.se>

		* configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from
		SHARK_LLVM_VERSION.

diffstat:

2 files changed, 6 insertions(+)
ChangeLog    |    5 +++++
configure.ac |    1 +

diffs (23 lines):

diff -r 05e7319d1854 -r dd44934ab114 ChangeLog
--- a/ChangeLog	Fri May 01 05:17:26 2009 -0400
+++ b/ChangeLog	Tue May 19 16:19:49 2009 +0100
@@ -1,3 +1,8 @@ 2009-05-01  Gary Benson  <gbenson at redhat
+2009-05-05 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+	* configure.ac (LLVM_CFLAGS): Remove LLVM svn suffix from
+	SHARK_LLVM_VERSION.
+
 2009-05-01  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp: New file.
diff -r 05e7319d1854 -r dd44934ab114 configure.ac
--- a/configure.ac	Fri May 01 05:17:26 2009 -0400
+++ b/configure.ac	Tue May 19 16:19:49 2009 +0100
@@ -542,6 +542,7 @@ if test "x${SHARK_BUILD_TRUE}" = x; then
   LLVM_CFLAGS=`$LLVM_CONFIG --cflags $llvm_components | \
     sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \
     sed -e 's/-D_DEBUG//g'`
+  LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`"
   LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags $llvm_components`
   LLVM_LIBS=`$LLVM_CONFIG --libs $llvm_components`
 fi