/hg/icedtea6: Move patches/shark-llvm-2.9.patch to patches/openj...

[omajid at icedtea.classpath.org]

changeset 35c0f8ca88b6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=35c0f8ca88b6
author: Omair Majid <omajid at redhat.com>
date: Tue May 17 12:38:23 2011 -0400

	Move patches/shark-llvm-2.9.patch to patches/openjdk/ and add hg
	changeset information

	This patch was upstreamed a while back. Move it to a new location to
	reflect its current status.

	2011-05-17 Omair Majid <omajid at redhat.com>

	 * Makefile.am (ICEDTEA_PATCHES): Replace patches/shark-
	llvm-2.9.patch with
	patches/openjdk/7036220-shark_llvm_29_headers.patch.
	    * patches/shark-llvm-2.9.patch: Move to...
	    * patches/openjdk/7036220-shark_llvm_29_headers.patch: New file.
	Contains contents of patches/shark-llvm-2.9.patch as well as hg
	metadata.


diffstat:

 ChangeLog                                           |   9 ++++
 Makefile.am                                         |   2 +-
 patches/openjdk/7036220-shark_llvm_29_headers.patch |  43 +++++++++++++++++++++
 patches/shark-llvm-2.9.patch                        |  28 -------------
 4 files changed, 53 insertions(+), 29 deletions(-)

diffs (109 lines):

diff -r 19cc9d976c7a -r 35c0f8ca88b6 ChangeLog
--- a/ChangeLog	Tue May 17 12:19:36 2011 -0400
+++ b/ChangeLog	Tue May 17 12:38:23 2011 -0400
@@ -1,3 +1,12 @@
+2011-05-17  Omair Majid  <omajid at redhat.com>
+
+	* Makefile.am
+	(ICEDTEA_PATCHES): Replace patches/shark-llvm-2.9.patch with
+	patches/openjdk/7036220-shark_llvm_29_headers.patch.
+	* patches/shark-llvm-2.9.patch: Move to...
+	* patches/openjdk/7036220-shark_llvm_29_headers.patch: New file. Contains
+	contents of patches/shark-llvm-2.9.patch as well as hg metadata.
+
 2011-05-17  Omair Majid  <omajid at redhat.com>
 
 	* Makefile.am
diff -r 19cc9d976c7a -r 35c0f8ca88b6 Makefile.am
--- a/Makefile.am	Tue May 17 12:19:36 2011 -0400
+++ b/Makefile.am	Tue May 17 12:38:23 2011 -0400
@@ -333,7 +333,7 @@
 	patches/revert-6885123.patch \
 	patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \
 	patches/openjdk/7031385-gcc-register-allocation-fix.patch \
-	patches/shark-llvm-2.9.patch \
+	patches/openjdk/7036220-shark_llvm_29_headers.patch \
 	patches/openjdk/6986968-crash_on_xim_restart.patch \
 	patches/openjdk/7036754-stroker-nan.patch \
 	patches/openjdk/pgram-pipe-regression.patch \
diff -r 19cc9d976c7a -r 35c0f8ca88b6 patches/openjdk/7036220-shark_llvm_29_headers.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7036220-shark_llvm_29_headers.patch	Tue May 17 12:38:23 2011 -0400
@@ -0,0 +1,44 @@
+# HG changeset patch
+# User twisti
+# Date 1302771192 25200
+# Node ID 1fcd6e9c3965f4bf23f6a8f4fbb77fdf74de37a7
+# Parent  3a808be061ffc10da5647e50cc28252d70f21883
+7036220: Shark fails to find LLVM 2.9 System headers during build
+Reviewed-by: gbenson, twisti
+Contributed-by: Xerxes Ranby <xerxes at zafena.se>
+
+diff -r 3a808be061ff -r 1fcd6e9c3965 src/share/vm/shark/llvmHeaders.hpp
+--- openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp	Wed Apr 13 14:33:03 2011 -0700
++++ openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp	Thu Apr 14 01:53:12 2011 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+  * Copyright 2008, 2009, 2010 Red Hat, Inc.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+@@ -46,7 +46,11 @@
+ #include <llvm/ModuleProvider.h>
+ #endif
+ #include <llvm/Support/IRBuilder.h>
++#if SHARK_LLVM_VERSION >= 29
++#include <llvm/Support/Threading.h>
++#else
+ #include <llvm/System/Threading.h>
++#endif
+ #include <llvm/Target/TargetSelect.h>
+ #include <llvm/Type.h>
+ #include <llvm/ExecutionEngine/JITMemoryManager.h>
+@@ -55,8 +59,12 @@
+ #include <llvm/ExecutionEngine/JIT.h>
+ #include <llvm/ADT/StringMap.h>
+ #include <llvm/Support/Debug.h>
++#if SHARK_LLVM_VERSION >= 29
++#include <llvm/Support/Host.h>
++#else
+ #include <llvm/System/Host.h>
+ #endif
++#endif
+ 
+ #include <map>
+ 
diff -r 19cc9d976c7a -r 35c0f8ca88b6 patches/shark-llvm-2.9.patch
--- a/patches/shark-llvm-2.9.patch	Tue May 17 12:19:36 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-Index: openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp
-===================================================================
---- openjdk.orig/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-04-08 11:48:09.270716001 +0200
-+++ openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp	2011-04-08 11:49:54.714716002 +0200
-@@ -43,7 +43,11 @@
- #include <llvm/ModuleProvider.h>
- #endif
- #include <llvm/Support/IRBuilder.h>
-+#if SHARK_LLVM_VERSION >= 29
-+#include <llvm/Support/Threading.h>
-+#else
- #include <llvm/System/Threading.h>
-+#endif
- #include <llvm/Target/TargetSelect.h>
- #include <llvm/Type.h>
- #include <llvm/ExecutionEngine/JITMemoryManager.h>
-@@ -52,8 +56,12 @@
- #include <llvm/ExecutionEngine/JIT.h>
- #include <llvm/ADT/StringMap.h>
- #include <llvm/Support/Debug.h>
-+#if SHARK_LLVM_VERSION >= 29
-+#include <llvm/Support/Host.h>
-+#else
- #include <llvm/System/Host.h>
- #endif
-+#endif
- 
- #include <map>
-