From xerxes at zafena.se  Mon Feb  1 02:10:43 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Mon, 01 Feb 2010 11:10:43 +0100
Subject: RFC: [patch] Update shark for LLVM r94686 API change.
Message-ID: <4B66A8A3.8050905@zafena.se>

The attached updates Shark for LLVM r94686 API change.
The use of llvm context module_providers have been removed to fix some
subtile performance related LLVM JIT bugs
(http://llvm.org/bugs/show_bug.cgi?id=5737 and
http://llvm.org/bugs/show_bug.cgi?id=5735).
http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20100125/095204.html

Ok to commit?

Xerxes

2010-02-01  Xerxes R?nby  <xerxes at zafena.se>

    * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
    (SharkCompiler::SharkCompiler): Use sharkContext::module
    instead of sharkContext::module_provider when using LLVM 2.7
    to handle LLVM r94686 API change.
    * ports/hotspot/src/share/vm/shark/sharkContext.hpp
    (sharkContext::module): Made public when using LLVM 2.7.
    (sharkContext::module_provider): Undefine when using LLVM 2.7.
    * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
    (llvm/ModuleProvider.h): Undefine when using LLVM 2.7.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: r94686.patch
Type: text/x-patch
Size: 2567 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/zero-dev/attachments/20100201/48f9e473/attachment.bin 

From gbenson at redhat.com  Mon Feb  1 03:03:43 2010
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 1 Feb 2010 11:03:43 +0000
Subject: RFC: [patch] Update shark for LLVM r94686 API change.
In-Reply-To: <4B66A8A3.8050905@zafena.se>
References: <4B66A8A3.8050905@zafena.se>
Message-ID: <20100201110342.GB4231@redhat.com>

Xerxes R?nby wrote:
> The attached updates Shark for LLVM r94686 API change.
> The use of llvm context module_providers have been removed to fix some
> subtile performance related LLVM JIT bugs
> (http://llvm.org/bugs/show_bug.cgi?id=5737 and
> http://llvm.org/bugs/show_bug.cgi?id=5735).
> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20100125/095204.html
> 
> Ok to commit?

In sharkContext.hpp, don't bother having separate identical module()
functions, just make it public if that's what's necessary.

Otherwise, yes :)

Cheers,
Gary

> Index: icedtea6-shark/ports/hotspot/src/share/vm/shark/sharkContext.hpp
> ===================================================================
> --- icedtea6-shark.orig/ports/hotspot/src/share/vm/shark/sharkContext.hpp	2010-01-31 10:15:27.000000000 +0100
> +++ icedtea6-shark/ports/hotspot/src/share/vm/shark/sharkContext.hpp	2010-01-31 10:35:39.000000000 +0100
> @@ -36,11 +36,13 @@
>   private:
>    llvm::Module* _module;
>  
> +#if SHARK_LLVM_VERSION < 27
>   private:
>    llvm::Module* module() const
>    {
>      return _module;
>    }
> +#endif
>  
>    // Get this thread's SharkContext
>   public:
> @@ -51,10 +53,17 @@
>  
>    // Module accessors
>   public:
> +#if SHARK_LLVM_VERSION >= 27
> +  llvm::Module* module() const
> +  {
> +    return _module;
> +  }
> +#else
>    llvm::ModuleProvider* module_provider() const
>    {
>      return new llvm::ExistingModuleProvider(module());
>    }
> +#endif
>    void add_function(llvm::Function* function) const
>    {
>      module()->getFunctionList().push_back(function);


-- 
http://gbenson.net/

From xerxes at zafena.se  Mon Feb  1 03:34:10 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Mon, 01 Feb 2010 12:34:10 +0100
Subject: RFC: [patch] Update shark for LLVM r94686 API change.
In-Reply-To: <20100201110342.GB4231@redhat.com>
References: <4B66A8A3.8050905@zafena.se> <20100201110342.GB4231@redhat.com>
Message-ID: <4B66BC32.7050204@zafena.se>

Gary Benson wrote:
> Xerxes R?nby wrote:
>   
>> The attached updates Shark for LLVM r94686 API change.
>> The use of llvm context module_providers have been removed to fix some
>> subtile performance related LLVM JIT bugs
>> (http://llvm.org/bugs/show_bug.cgi?id=5737 and
>> http://llvm.org/bugs/show_bug.cgi?id=5735).
>> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20100125/095204.html
>>
>> Ok to commit?
>>     
>
> In sharkContext.hpp, don't bother having separate identical module()
> functions, just make it public if that's what's necessary.
>
> Otherwise, yes :)
>
> Cheers,
> Gary
>
>   
Ok, changed as suggested and committed to:
http://icedtea.classpath.org/hg/icedtea6/rev/22be2c99a89b

Cheers,
Xerxes


From xerxes at zafena.se  Wed Feb  3 16:04:06 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Thu, 04 Feb 2010 01:04:06 +0100
Subject: RFC: [patch] Shark host CPU capabilities autotuner.
Message-ID: <4B6A0EF6.80309@zafena.se>

Hi!

The attached patch adds a host CPU features autotuner for Shark by using
new API's found in llvm 2.7.

    * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp :
    (SharkCompiler::SharkCompiler): Implement host CPU feature
    autotuner using LLVM 2.7 APIs.
    * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp :
    Define llvm/ADT/StringMap.h and llvm/System/Host.h
    depending on LLVM version.
    Allways define llvm/Support/CommandLine.h.

This patch will become more and more usefull over time when
llvm/System/Host.cpp gets filled with actual host detection code for
various targets.

Cheers
Xerxes


-------------- next part --------------
A non-text attachment was scrubbed...
Name: autotune_llvm_jit.patch
Type: text/x-patch
Size: 1892 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/zero-dev/attachments/20100204/aee0f30b/attachment.bin 

From gbenson at redhat.com  Fri Feb 12 05:30:08 2010
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 12 Feb 2010 13:30:08 +0000
Subject: Strip stupid LLVM options
Message-ID: <20100212133008.GC724@redhat.com>

Hi all,

Unlike other *-config scripts, llvm-config does not restrict itself to
include paths and libraries to link.  Instead, it passes all kinds of
options that mess up the HotSpot build: -O3, -Wall, -pedantic, etc.
Previously we have stripped out the worst offenders, but things keep
slipping through.  This patch changes to a whitelist approach, so only
the options we explicitly allow get through.

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r 748156804502 -r fc600c234771 ChangeLog
--- a/ChangeLog	Tue Feb 09 09:15:27 2010 +0000
+++ b/ChangeLog	Fri Feb 12 13:24:25 2010 +0000
@@ -1,3 +1,7 @@
+2010-02-12  Gary Benson  <gbenson at redhat.com>
+
+	* configure.ac: Strip stupid options that llvm-config supplies.
+
 2010-02-09  Edward Nevill <ed at camswl.com>
 
 	* cppInterpreter_arm.S / thumb2.cpp
diff -r 748156804502 -r fc600c234771 configure.ac
--- a/configure.ac	Tue Feb 09 09:15:27 2010 +0000
+++ b/configure.ac	Fri Feb 12 13:24:25 2010 +0000
@@ -432,12 +432,39 @@
 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_CFLAGS=`$LLVM_CONFIG --cxxflags $llvm_components | \
-    sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \
-    sed -e 's/-pedantic//g' | sed -e 's/-D_DEBUG//g'`
+  dnl LLVM_CFLAGS
+  LLVM_CFLAGS=
+  for flag in $($LLVM_CONFIG --cxxflags $llvm_components); do
+    if echo "$flag" | grep -q '^-[[ID]]'; then
+      if test "$flag" != "-D_DEBUG"; then
+        if test "x$LLVM_CFLAGS" != "x"; then
+          LLVM_CFLAGS="$LLVM_CFLAGS "
+        fi
+        LLVM_CFLAGS="$LLVM_CFLAGS$flag"
+      fi
+    fi
+  done
+  dnl LLVM_LDFLAGS
+  LLVM_LDFLAGS=
+  for flag in $($LLVM_CONFIG --ldflags $llvm_components); do
+    if echo "$flag" | grep -q '^-L'; then
+      if test "x$LLVM_LDFLAGS" != "x"; then
+        LLVM_LDFLAGS="$LLVM_LDFLAGS "
+      fi
+      LLVM_LDFLAGS="$LLVM_LDFLAGS$flag"
+    fi
+  done
+  dnl LLVM_LIBS
+  LLVM_LIBS=
+  for flag in $($LLVM_CONFIG --libs $llvm_components); do
+    if echo "$flag" | grep -q '^-l'; then
+      if test "x$LLVM_LIBS" != "x"; then
+        LLVM_LIBS="$LLVM_LIBS "
+      fi
+      LLVM_LIBS="$LLVM_LIBS$flag"
+    fi
+  done
   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
 AC_SUBST(LLVM_CFLAGS)
 AC_SUBST(LLVM_LDFLAGS)

From xerxes at zafena.se  Fri Feb 19 06:25:49 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Fri, 19 Feb 2010 15:25:49 +0100
Subject: RFC: [patch] Update shark for LLVM r95390 API change.
Message-ID: <4B7E9F6D.3080102@zafena.se>

The attached patch makes shark build and run using llvm 2.7 svn r95390.
http://llvm.org/viewvc/llvm-project?view=rev&revision=95390

The LLVM change-set r95390 pawed the way to make LLVM a dynamic library
wich are quite cool and in order to do so it moved the implicitly used
--march, --mcpu, and --mattr functionality from JIT/TargetSelect.cpp to
lli.cpp to prevent a clutch with llc.
These changes made it necessary for Shark to explicitly define that it
makes use of --mcpu and --mattr, in a similar spirit like lli, for the
cpu autotuner.
Shark also needs to explicitly set these options during the creation of
the LLVM execution engine.
For some reason shark also needs to include the JIT.h header for the JIT
ctors to be linked in at all.

    * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
    (MCPU): Explicitly defined for use by LLVM command line parser.
    (MAttrs): Likewise.
    (SharkCompiler::SharkCompiler): Create the JIT using LLVM EngineBuilder
    in order to explicitly set MCPU and MAttrs when using LLVM 2.7.
    * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
    Include llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the
    JIT are linked in.

OK to push?

Cheers
Xerxes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: r95390.patch
Type: text/x-patch
Size: 2074 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/zero-dev/attachments/20100219/a946d4dc/attachment.bin 

From gbenson at redhat.com  Fri Feb 19 06:31:34 2010
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 19 Feb 2010 14:31:34 +0000
Subject: RFC: [patch] Update shark for LLVM r95390 API change.
In-Reply-To: <4B7E9F6D.3080102@zafena.se>
References: <4B7E9F6D.3080102@zafena.se>
Message-ID: <20100219143134.GA3445@redhat.com>

Xerxes R?nby wrote:
> The attached patch makes shark build and run using llvm 2.7 svn r95390.
> http://llvm.org/viewvc/llvm-project?view=rev&revision=95390
> 
> The LLVM change-set r95390 pawed the way to make LLVM a dynamic library
> wich are quite cool and in order to do so it moved the implicitly used
> --march, --mcpu, and --mattr functionality from JIT/TargetSelect.cpp to
> lli.cpp to prevent a clutch with llc.
> These changes made it necessary for Shark to explicitly define that it
> makes use of --mcpu and --mattr, in a similar spirit like lli, for the
> cpu autotuner.
> Shark also needs to explicitly set these options during the creation of
> the LLVM execution engine.
> For some reason shark also needs to include the JIT.h header for the JIT
> ctors to be linked in at all.
> 
>     * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
>     (MCPU): Explicitly defined for use by LLVM command line parser.
>     (MAttrs): Likewise.
>     (SharkCompiler::SharkCompiler): Create the JIT using LLVM EngineBuilder
>     in order to explicitly set MCPU and MAttrs when using LLVM 2.7.
>     * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
>     Include llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the
>     JIT are linked in.
> 
> OK to push?

Sure.

Cheers,
Gary

-- 
http://gbenson.net/

From gbenson at redhat.com  Tue Feb 23 09:40:11 2010
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 23 Feb 2010 17:40:11 +0000
Subject: Shark tidy ups
Message-ID: <20100223174011.GC3358@redhat.com>

Hi all,

The three commits I just made reformat Shark to match upstream
HotSpot.  There are no code changes, just whitespace and moved
braces.

Cheers,
Gary

-- 
http://gbenson.net/

From xerxes at zafena.se  Fri Feb 26 06:47:43 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Fri, 26 Feb 2010 15:47:43 +0100
Subject: RFC [patch] Fix Shark NDEBUG build
Message-ID: <4B87DF0F.6030602@zafena.se>

When building shark against a LLVM release build this can occour:
g++ -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DIA32
-DZERO_LIBARCH=\"i386\" -DPRODUCT -I. -I../generated/adfiles
-I../generated/jvmtifiles
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/asm
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/c1
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/ci
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/classfile
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/code -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/compiler
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/g1
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/parNew
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/shared
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_interface
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/interpreter
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/memory
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/oops -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/prims
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/runtime
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/services
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/utilities
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/cpu/zero/vm
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/os/linux/vm
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/os_cpu/linux_zero/vm
-I../generated -DHOTSPOT_RELEASE_VERSION="\"14.0-b16\""
-DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"xerxes\""
-DHOTSPOT_LIB_ARCH=\"i386\" -DJRE_RELEASE_VERSION="\"1.6.0_17-b17\""
-DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea6
1.7+r398a7f03255b\"" -DDISTRIBUTION_ID="\"Built on Ubuntu lucid
(development branch) (Fri Feb 26 15:26:43 CET 2010)\"" -DSHARK 
-I/usr/local/include -DNDEBUG -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
-D__STDC_CONSTANT_MACROS -DSHARK_LLVM_VERSION=27 -fpic -fno-rtti
-fno-exceptions -D_REENTRANT -fcheck-new -m32 -pipe -g -O3
-fno-strict-aliasing -DVM_LITTLE_ENDIAN -Werror -Wpointer-arith
-Wsign-compare    -c -o sharkContext.o
/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkContext.cpp

/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:
In member function 'void
SharkCompiler::generate_native_code(SharkEntry*, llvm::Function*, const
char*)':
/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:254:
error: expected unqualified-id before ';' token
/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:255:
error: 'DebugFlag' is not a member of 'llvm'
/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:258:
error: expected unqualified-id before ';' token
/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:259:
error: 'DebugFlag' is not a member of 'llvm'

The attached patch fixes this issue:

    * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
    (SharkCompiler::generate_native_code): Undefine debug code for
NDEBUG builds

Ok to push?
Ok to push to icedtea6-1.7 release branch?
Cheers
Xerxes


-------------- next part --------------
A non-text attachment was scrubbed...
Name: shark_ndebug.patch
Type: text/x-diff
Size: 847 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/zero-dev/attachments/20100226/d6678c28/attachment.bin 

From gnu_andrew at member.fsf.org  Fri Feb 26 06:56:54 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 26 Feb 2010 14:56:54 +0000
Subject: RFC [patch] Fix Shark NDEBUG build
In-Reply-To: <4B87DF0F.6030602@zafena.se>
References: <4B87DF0F.6030602@zafena.se>
Message-ID: <17c6771e1002260656o3313144dw5f0a9780ab3f9857@mail.gmail.com>

On 26 February 2010 14:47, Xerxes R?nby <xerxes at zafena.se> wrote:
> When building shark against a LLVM release build this can occour:
> g++ -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DIA32
> -DZERO_LIBARCH=\"i386\" -DPRODUCT -I. -I../generated/adfiles
> -I../generated/jvmtifiles
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/asm
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/c1
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/ci
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/classfile
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/code -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/compiler
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/g1
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/parNew
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/shared
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_interface
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/interpreter
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/memory
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/oops -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/prims
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/runtime
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/services
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/utilities
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/cpu/zero/vm
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/os/linux/vm
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/os_cpu/linux_zero/vm
> -I../generated -DHOTSPOT_RELEASE_VERSION="\"14.0-b16\""
> -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"xerxes\""
> -DHOTSPOT_LIB_ARCH=\"i386\" -DJRE_RELEASE_VERSION="\"1.6.0_17-b17\""
> -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea6
> 1.7+r398a7f03255b\"" -DDISTRIBUTION_ID="\"Built on Ubuntu lucid
> (development branch) (Fri Feb 26 15:26:43 CET 2010)\"" -DSHARK
> -I/usr/local/include -DNDEBUG -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
> -D__STDC_CONSTANT_MACROS -DSHARK_LLVM_VERSION=27 -fpic -fno-rtti
> -fno-exceptions -D_REENTRANT -fcheck-new -m32 -pipe -g -O3
> -fno-strict-aliasing -DVM_LITTLE_ENDIAN -Werror -Wpointer-arith
> -Wsign-compare ? ?-c -o sharkContext.o
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkContext.cpp
>
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:
> In member function 'void
> SharkCompiler::generate_native_code(SharkEntry*, llvm::Function*, const
> char*)':
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:254:
> error: expected unqualified-id before ';' token
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:255:
> error: 'DebugFlag' is not a member of 'llvm'
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:258:
> error: expected unqualified-id before ';' token
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:259:
> error: 'DebugFlag' is not a member of 'llvm'
>
> The attached patch fixes this issue:
>
> ? ?* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
> ? ?(SharkCompiler::generate_native_code): Undefine debug code for
> NDEBUG builds
>
> Ok to push?
> Ok to push to icedtea6-1.7 release branch?
> Cheers
> Xerxes
>
>
>

Yes and yes.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8

From xerxes at zafena.se  Fri Feb 26 07:30:03 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Fri, 26 Feb 2010 16:30:03 +0100
Subject: RFInclusion into Icedtea6 1.7.1 Thumb2 JIT and ARM ASM bugfixes
Message-ID: <4B87E8FB.2090404@zafena.se>

Hi i suggest that we should add the ARM Thumb2 JIT and ARM ASM bugfixes
into the Icedtea6 1.7.1 release

http://icedtea.classpath.org/hg/icedtea6/rev/748156804502 - Make Thumb2
JIT the default build
http://icedtea.classpath.org/hg/icedtea6/rev/ba5d4644582d - Several bug
fixes to compiling methods with exception handlers
http://icedtea.classpath.org/hg/icedtea6/rev/ab2479dd2f87 - Various bug
fixes
http://icedtea.classpath.org/hg/icedtea6/rev/59e6d2d51c8e - Add
ports/hotspot/src/cpu/zero/vm/thumb2.cpp missed out in last commit
http://icedtea.classpath.org/hg/icedtea6/rev/b227a81ef16c - Added Thumb2
JIT + general tidying up
http://icedtea.classpath.org/hg/icedtea6/rev/be36bffde64d - Fix build
for hs16. Add implementation of is_allocatable

Ok to merge into Icedtea6 1.7.1?

Icedtea6 1.7 contains one fix that cant be found in the Icedtea6 trunk
http://icedtea.classpath.org/hg/release/icedtea6-1.7/rev/06d8ceaf70ff
Would this changeset cause any issues?
Should this changeset be transplanted to the Icedtea6 main branch?

Cheers
Xerxes

From gnu_andrew at member.fsf.org  Fri Feb 26 08:32:48 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 26 Feb 2010 16:32:48 +0000
Subject: RFInclusion into Icedtea6 1.7.1 Thumb2 JIT and ARM ASM bugfixes
In-Reply-To: <4B87E8FB.2090404@zafena.se>
References: <4B87E8FB.2090404@zafena.se>
Message-ID: <17c6771e1002260832i514f12dcl22a88bbfd3d39a06@mail.gmail.com>

On 26 February 2010 15:30, Xerxes R?nby <xerxes at zafena.se> wrote:
> Hi i suggest that we should add the ARM Thumb2 JIT and ARM ASM bugfixes
> into the Icedtea6 1.7.1 release
>
> http://icedtea.classpath.org/hg/icedtea6/rev/748156804502 - Make Thumb2
> JIT the default build
> http://icedtea.classpath.org/hg/icedtea6/rev/ba5d4644582d - Several bug
> fixes to compiling methods with exception handlers
> http://icedtea.classpath.org/hg/icedtea6/rev/ab2479dd2f87 - Various bug
> fixes
> http://icedtea.classpath.org/hg/icedtea6/rev/59e6d2d51c8e - Add
> ports/hotspot/src/cpu/zero/vm/thumb2.cpp missed out in last commit
> http://icedtea.classpath.org/hg/icedtea6/rev/b227a81ef16c - Added Thumb2
> JIT + general tidying up
> http://icedtea.classpath.org/hg/icedtea6/rev/be36bffde64d - Fix build
> for hs16. Add implementation of is_allocatable
>
> Ok to merge into Icedtea6 1.7.1?
>
> Icedtea6 1.7 contains one fix that cant be found in the Icedtea6 trunk
> http://icedtea.classpath.org/hg/release/icedtea6-1.7/rev/06d8ceaf70ff
> Would this changeset cause any issues?
> Should this changeset be transplanted to the Icedtea6 main branch?
>
> Cheers
> Xerxes
>

I think we should let this soak on trunk and release it in 1.8 rather
than trying to backport it.  The minor releases are only for bug
fixes.

Thanks,
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8