/hg/icedtea6: Fix build failure caused by hs20 only LLVM 2.9 fix.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon May 30 11:21:55 PDT 2011
changeset e191909a7c6e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e191909a7c6e
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon May 30 19:21:44 2011 +0100
Fix build failure caused by hs20 only LLVM 2.9 fix.
2011-05-30 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/7036220-shark_llvm_29_headers.patch:
Moved to...
* Makefile.am: Only apply 7036220 to hs20.
* patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch:
...here.
diffstat:
ChangeLog | 8 ++
Makefile.am | 4 +-
patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch | 43 ++++++++++++++++
patches/openjdk/7036220-shark_llvm_29_headers.patch | 43 ----------------
4 files changed, 53 insertions(+), 45 deletions(-)
diffs (132 lines):
diff -r 0034f5cfd96a -r e191909a7c6e ChangeLog
--- a/ChangeLog Sat May 28 12:37:23 2011 +0200
+++ b/ChangeLog Mon May 30 19:21:44 2011 +0100
@@ -1,3 +1,11 @@
+2011-05-30 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/7036220-shark_llvm_29_headers.patch:
+ Moved to...
+ * Makefile.am: Only apply 7036220 to hs20.
+ * patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch:
+ ...here.
+
2011-05-28 Matthias Klose <doko at ubuntu.com>
* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Filter-out --with-javac.
diff -r 0034f5cfd96a -r e191909a7c6e Makefile.am
--- a/Makefile.am Sat May 28 12:37:23 2011 +0200
+++ b/Makefile.am Mon May 30 19:21:44 2011 +0100
@@ -333,7 +333,6 @@
patches/revert-6885123.patch \
patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \
patches/openjdk/7031385-gcc-register-allocation-fix.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 \
@@ -347,7 +346,8 @@
patches/pr639-broken_shark_build.patch \
patches/hotspot/$(HSBUILD)/powerpc-stacksize.patch \
patches/jtreg-remove-test-6987555.patch \
- patches/jtreg-remove-test-6991596.patch
+ patches/jtreg-remove-test-6991596.patch \
+ patches/hotspot/$(HSBUILD)/7036220-shark_llvm_29_headers.patch
else
ICEDTEA_PATCHES += \
patches/hotspot/$(HSBUILD)/no-precompiled-headers.patch \
diff -r 0034f5cfd96a -r e191909a7c6e patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch Mon May 30 19:21:44 2011 +0100
@@ -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 0034f5cfd96a -r e191909a7c6e patches/openjdk/7036220-shark_llvm_29_headers.patch
--- a/patches/openjdk/7036220-shark_llvm_29_headers.patch Sat May 28 12:37:23 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-# 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>
-
More information about the distro-pkg-dev
mailing list