diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/llvm/llvm-2.4 | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/llvm/llvm-2.4')
-rw-r--r-- | recipes/llvm/llvm-2.4/fix-build.patch | 79 | ||||
-rw-r--r-- | recipes/llvm/llvm-2.4/fix-static-initialization.patch | 60 |
2 files changed, 139 insertions, 0 deletions
diff --git a/recipes/llvm/llvm-2.4/fix-build.patch b/recipes/llvm/llvm-2.4/fix-build.patch new file mode 100644 index 0000000000..ed077affcd --- /dev/null +++ b/recipes/llvm/llvm-2.4/fix-build.patch @@ -0,0 +1,79 @@ +Index: llvm-2.4/Makefile.rules +=================================================================== +--- llvm-2.4.orig/Makefile.rules 2008-10-03 23:24:52.000000000 +0200 ++++ llvm-2.4/Makefile.rules 2009-01-24 09:59:20.000000000 +0100 +@@ -234,9 +234,10 @@ + EXTRA_OPTIONS += -fstrict-aliasing -Wstrict-aliasing + endif + +- CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) +- C.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) +- LD.Flags += $(OPTIMIZE_OPTION) ++# OE: Do not interfere with flags given by OE ++# CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) ++# C.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) ++# LD.Flags += $(OPTIMIZE_OPTION) + else + BuildMode := Debug + CXX.Flags += -g +@@ -309,11 +310,7 @@ + #-------------------------------------------------------------------- + TargetMode := + ifeq ($(LLVM_CROSS_COMPILING),1) +- ifeq ($(BUILD_COMPONENT),1) +- TargetMode := Build +- else +- TargetMode := Host +- endif ++ TargetMode := Host + BuildLLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/Build/bin + endif + +@@ -436,7 +433,7 @@ + ifdef EXAMPLE_TOOL + LD.Flags += -rpath $(ExmplDir) -export-dynamic + else +- LD.Flags += -rpath $(ToolDir) -export-dynamic ++ LD.Flags += -export-dynamic + endif + endif + +Index: llvm-2.4/lib/ExecutionEngine/JIT/JIT.cpp +=================================================================== +--- llvm-2.4.orig/lib/ExecutionEngine/JIT/JIT.cpp 2008-09-24 18:25:55.000000000 +0200 ++++ llvm-2.4/lib/ExecutionEngine/JIT/JIT.cpp 2009-01-23 15:10:03.000000000 +0100 +@@ -65,7 +65,7 @@ + } + + +-#if defined (__GNUC__) ++#if defined (__GNUC__) && ! defined (__ARM_EABI__) + + // libgcc defines the __register_frame function to dynamically register new + // dwarf frames for exception handling. This functionality is not portable +@@ -225,7 +225,7 @@ + } + + // Register routine for informing unwinding runtime about new EH frames +-#if defined(__GNUC__) ++#if defined(__GNUC__) && ! defined(__ARM_EABI__) + #if defined(__APPLE__) + struct LibgccObjectInfo* LOI = (struct LibgccObjectInfo*) + _keymgr_get_and_lock_processwide_ptr(KEYMGR_GCC3_DW2_OBJ_LIST); +Index: llvm-2.4/Makefile +=================================================================== +--- llvm-2.4.orig/Makefile 2008-10-03 00:56:44.000000000 +0200 ++++ llvm-2.4/Makefile 2009-01-23 15:10:33.000000000 +0100 +@@ -27,9 +27,9 @@ + + # When cross-compiling, there are some things (tablegen) that need to + # be build for the build system. +-ifeq ($(LLVM_CROSS_COMPILING),1) +- BUILD_TARGET_DIRS := lib/System lib/Support utils +-endif ++#ifeq ($(LLVM_CROSS_COMPILING),1) ++# BUILD_TARGET_DIRS := lib/System lib/Support utils ++#endif + + # llvm-gcc4 doesn't need runtime libs. llvm-gcc4 is the only supported one. + # FIXME: Remove runtime entirely once we have an understanding of where diff --git a/recipes/llvm/llvm-2.4/fix-static-initialization.patch b/recipes/llvm/llvm-2.4/fix-static-initialization.patch new file mode 100644 index 0000000000..a3ec2d6374 --- /dev/null +++ b/recipes/llvm/llvm-2.4/fix-static-initialization.patch @@ -0,0 +1,60 @@ +Index: llvm-2.4/include/llvm/System/DynamicLibrary.h +=================================================================== +--- llvm-2.4.orig/include/llvm/System/DynamicLibrary.h 2008-05-06 03:32:53.000000000 +0200 ++++ llvm-2.4/include/llvm/System/DynamicLibrary.h 2009-01-24 11:24:12.000000000 +0100 +@@ -16,6 +16,7 @@ + + #include "llvm/System/Path.h" + #include <string> ++#include <map> + + namespace llvm { + namespace sys { +@@ -90,6 +91,10 @@ + DynamicLibrary(const DynamicLibrary&); ///< Do not implement + DynamicLibrary& operator=(const DynamicLibrary&); ///< Do not implement + /// @} ++ ++ private: ++ static std::map<std::string, void *> &g_symbols(); ++ + }; + + } // End sys namespace +Index: llvm-2.4/lib/System/DynamicLibrary.cpp +=================================================================== +--- llvm-2.4.orig/lib/System/DynamicLibrary.cpp 2008-07-10 02:52:20.000000000 +0200 ++++ llvm-2.4/lib/System/DynamicLibrary.cpp 2009-01-24 11:27:42.000000000 +0100 +@@ -14,14 +14,18 @@ + #include "llvm/System/DynamicLibrary.h" + #include "llvm/Config/config.h" + #include <cstring> +-#include <map> + + // Collection of symbol name/value pairs to be searched prior to any libraries. +-static std::map<std::string, void *> g_symbols; ++std::map<std::string, void *> &llvm::sys::DynamicLibrary::g_symbols() { ++ static std::map<std::string, void *> *symbols ++ = new std::map<std::string, void *>(); ++ ++ return *symbols; ++} + + void llvm::sys::DynamicLibrary::AddSymbol(const char* symbolName, + void *symbolValue) { +- g_symbols[symbolName] = symbolValue; ++ g_symbols()[symbolName] = symbolValue; + } + + // It is not possible to use ltdl.c on VC++ builds as the terms of its LGPL +@@ -75,8 +79,8 @@ + // check_ltdl_initialization(); + + // First check symbols added via AddSymbol(). +- std::map<std::string, void *>::iterator I = g_symbols.find(symbolName); +- if (I != g_symbols.end()) ++ std::map<std::string, void *>::iterator I = g_symbols().find(symbolName); ++ if (I != g_symbols().end()) + return I->second; + + // Now search the libraries. |