/hg/icedtea6: Check for shared LLVM library.

[doko at icedtea.classpath.org]

changeset 617eb9a6b993 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=617eb9a6b993
author: doko at ubuntu.com
date: Sun Apr 04 23:13:18 2010 +0200

	Check for shared LLVM library.

	llvm-2.7 offers the option to build a shared LLVM library,
	unfortunately llvm-config --libs still returns the list of the
	static libraries. The function to check for is randomly choosen.
	Maybe there are better candidates, or check for functions for the
	required components.

	2010-04-04 Matthias Klose <doko at ubuntu.com>

	 * configure.ac: Check for shared LLVM library.


diffstat:

2 files changed, 16 insertions(+), 1 deletion(-)
ChangeLog    |    4 ++++
configure.ac |   13 ++++++++++++-

diffs (57 lines):

diff -r 3e6dd786e038 -r 617eb9a6b993 ChangeLog
--- a/ChangeLog	Thu Apr 01 13:29:04 2010 +0200
+++ b/ChangeLog	Sun Apr 04 23:13:18 2010 +0200
@@ -1,3 +1,7 @@ 2010-04-01  Xerxes RÃ¥nby  <xerxes at zafen
+2010-04-04  Matthias Klose  <doko at ubuntu.com>
+
+	* configure.ac: Check for shared LLVM library.
+
 2010-04-01  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	* ports/hotspot/tools/mkbc.c (main):
diff -r 3e6dd786e038 -r 617eb9a6b993 configure.ac
--- a/configure.ac	Thu Apr 01 13:29:04 2010 +0200
+++ b/configure.ac	Sun Apr 04 23:13:18 2010 +0200
@@ -440,6 +440,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
 if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then
   FIND_TOOL([LLVM_CONFIG], [llvm-config])
   llvm_components="jit engine nativecodegen"
+  LLVM_VERSION="`$LLVM_CONFIG --version | sed 's/svn.*//'`"
   dnl LLVM_CFLAGS
   LLVM_CFLAGS=
   for flag in $($LLVM_CONFIG --cxxflags $llvm_components); do
@@ -452,6 +453,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
       fi
     fi
   done
+  LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`echo $LLVM_VERSION | sed 's/\.//'`"
   dnl LLVM_LDFLAGS
   LLVM_LDFLAGS=
   for flag in $($LLVM_CONFIG --ldflags $llvm_components); do
@@ -463,8 +465,17 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
     fi
   done
   dnl LLVM_LIBS
+  LIBS_SAVED=$LIBS
+  LDFLAGS_SAVED=$LDFLAGS
+  LDFLAGS=$LLVM_LDFLAGS
+  AC_CHECK_LIB(LLVM-$LLVM_VERSION, LLVMGetNextInstruction,LLVM_SHARED_LIB=" -lLLVM-$LLVM_VERSION")
+  LIBS=$LIBS_SAVED
+  LDFLAGS=$LDFLAGS_SAVED
   LLVM_LIBS=
   for flag in $($LLVM_CONFIG --libs $llvm_components); do
+    if test "x$LLVM_SHARED_LIB" != x && echo "$flag" | grep -q '^-lLLVM'; then
+      continue
+    fi
     if echo "$flag" | grep -q '^-l'; then
       if test "x$LLVM_LIBS" != "x"; then
         LLVM_LIBS="$LLVM_LIBS "
@@ -472,7 +483,7 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
       LLVM_LIBS="$LLVM_LIBS$flag"
     fi
   done
-  LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`"
+  LLVM_LIBS="$LLVM_LIBS$LLVM_SHARED_LIB"
 fi
 AC_SUBST(LLVM_CFLAGS)
 AC_SUBST(LLVM_LDFLAGS)