llvm: Fix cfi erros for ARM seen with binutils 2.27

Signed-off-by: Khem Raj <raj.khem@gmail.com>

7 files changed, 163 insertions, 10 deletions

diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index 2971e9b..3b92d65 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -10,7 +10,7 @@ LLVM_GIT_PROTOCOL ?= "git"
 
 PV = "3.9.0"
 BRANCH = "release_39"
-SRCREV_llvm = "c39972a9b2a2cbfa5bca3e4e9f9a8ad6959c406d"
+SRCREV_llvm = "2c01070bc51ac2ac8f9cff5e564f3ae09126f47e"
 SRCREV_clang = "29427626008fc4322bb820814b3257981581e63d"
 SRCREV_compiler-rt = "85cd828f87c0800e698b8d62334b2e1270375307"
 SRCREV_cxxabi = "82bb4c89734b6157de4a2fc2b9228be6529337a8"
diff --git a/recipes-devtools/clang/clang/0001-llvm-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-com.patch b/recipes-devtools/clang/clang/0001-llvm-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-com.patch
index b659f24..c343ded 100644
--- a/recipes-devtools/clang/clang/0001-llvm-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-com.patch
+++ b/recipes-devtools/clang/clang/0001-llvm-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-com.patch
@@ -1,7 +1,7 @@
-From c69a4eba88cff26594193be9aca54f54733689e5 Mon Sep 17 00:00:00 2001
+From 2d4ae5fa80d95542ea4df12400c96f28ce2a4484 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 15 May 2015 12:13:17 -0700
-Subject: [PATCH 1/3] llvm: Remove CMAKE_CROSSCOMPILING so it can cross compile
+Subject: [PATCH 1/5] llvm: Remove CMAKE_CROSSCOMPILING so it can cross compile
 
 we already have llvm-config from clang-native
 
@@ -30,5 +30,5 @@ index d458771..2e0c634 100644
 -endif(CMAKE_CROSSCOMPILING)
 +endif(CMAKE_CROSSCOMPILING1)
 -- 
-2.9.0
+2.9.2
 
diff --git a/recipes-devtools/clang/clang/0002-llvm-Do-not-assume-linux-glibc.patch b/recipes-devtools/clang/clang/0002-llvm-Do-not-assume-linux-glibc.patch
index 94f79b0..9aaa5fd 100644
--- a/recipes-devtools/clang/clang/0002-llvm-Do-not-assume-linux-glibc.patch
+++ b/recipes-devtools/clang/clang/0002-llvm-Do-not-assume-linux-glibc.patch
@@ -1,7 +1,7 @@
-From 4a90b1c48b3aa8fe43a93e337def93bdbf82bf0f Mon Sep 17 00:00:00 2001
+From a478964d32e6521a68ef47464b26e50106dc943e Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 15 Mar 2016 05:26:47 +0000
-Subject: [PATCH 2/3] llvm: Do not assume linux == glibc
+Subject: [PATCH 2/5] llvm: Do not assume linux == glibc
 
 musl's implementation of std functions is different
 
@@ -24,5 +24,5 @@ index 9a7aeb5..e3b7fe2 100644
      EXPLICIT_SYMBOL(stderr);
      EXPLICIT_SYMBOL(stdout);
 -- 
-2.9.0
+2.9.2
 
diff --git a/recipes-devtools/clang/clang/0003-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/recipes-devtools/clang/clang/0003-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
index d1b2aff..f62251d 100644
--- a/recipes-devtools/clang/clang/0003-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
+++ b/recipes-devtools/clang/clang/0003-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
@@ -1,7 +1,7 @@
-From b01b39e5b7c7803783ab7bc00fb4e414189d4d10 Mon Sep 17 00:00:00 2001
+From 9992bf63b2fa53e87d80372f89b6be51678cf6e5 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 May 2016 00:33:20 +0000
-Subject: [PATCH 3/3] llvm: TargetLibraryInfo: Undefine libc functions if they
+Subject: [PATCH 3/5] llvm: TargetLibraryInfo: Undefine libc functions if they
  are macros
 
 musl defines some functions as macros and not inline functions
@@ -87,5 +87,5 @@ index b2a593d..327894c 100644
  TLI_DEFINE_STRING_INTERNAL("tmpfile64")
  /// int toascii(int c);
 -- 
-2.9.0
+2.9.2
 
diff --git a/recipes-devtools/clang/clang/0004-llvm-Fix-inconsistent-uses-of-.cfi_sections.patch b/recipes-devtools/clang/clang/0004-llvm-Fix-inconsistent-uses-of-.cfi_sections.patch
new file mode 100644
index 0000000..c77a8d2
--- /dev/null
+++ b/recipes-devtools/clang/clang/0004-llvm-Fix-inconsistent-uses-of-.cfi_sections.patch
@@ -0,0 +1,124 @@
+From 260b42499a218f18730b946f053890cc1641e4c3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 7 Aug 2016 22:48:44 -0700
+Subject: [PATCH 4/5] llvm:  Fix inconsistent uses of .cfi_sections
+
+Error: inconsistent uses of .cfi_sections
+
+From the 2.27 binutils assemblers. It seems that 2.27 doesn't like the
+
+.cfi_sections .debug_frame
+
+directive following previous .cfi directives. The assemblers seem to be happy if the .cfi_sections directive precedes any other .cfi directive. Is this a bug in binutils or LLVM? It looks as if a fix might be to move the generation of the .cfi_sections directive from endModule() to somewhere else (maybe a non-existant beginModule()?).
+
+As a work-around I modified DwarfCFIException.cpp and ARMException.cpp to send the .cfi_sections directive before the first function is processed. Seems to work.
+
+-Rich
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/CodeGen/AsmPrinter/ARMException.cpp      | 10 +++++++++-
+ lib/CodeGen/AsmPrinter/DwarfCFIException.cpp | 11 ++++++++++-
+ lib/CodeGen/AsmPrinter/DwarfException.h      |  4 ++++
+ 3 files changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/lib/CodeGen/AsmPrinter/ARMException.cpp b/lib/CodeGen/AsmPrinter/ARMException.cpp
+index 5294c98..8295326 100644
+--- a/lib/CodeGen/AsmPrinter/ARMException.cpp
++++ b/lib/CodeGen/AsmPrinter/ARMException.cpp
+@@ -34,7 +34,8 @@
+ #include "llvm/Target/TargetRegisterInfo.h"
+ using namespace llvm;
+ 
+-ARMException::ARMException(AsmPrinter *A) : DwarfCFIExceptionBase(A) {}
++ARMException::ARMException(AsmPrinter *A)
++    : DwarfCFIExceptionBase(A) {}
+ 
+ ARMException::~ARMException() {}
+ 
+@@ -46,8 +47,10 @@ ARMTargetStreamer &ARMException::getTargetStreamer() {
+ /// endModule - Emit all exception information that should come after the
+ /// content.
+ void ARMException::endModule() {
++#if RICH
+   if (shouldEmitCFI)
+     Asm->OutStreamer->EmitCFISections(false, true);
++#endif
+ }
+ 
+ void ARMException::beginFunction(const MachineFunction *MF) {
+@@ -59,6 +62,11 @@ void ARMException::beginFunction(const MachineFunction *MF) {
+          "non-EH CFI not yet supported in prologue with EHABI lowering");
+   if (MoveType == AsmPrinter::CFI_M_Debug) {
+     shouldEmitCFI = true;
++    // RICH:
++    if (cfiSectionsNeeded) {
++      Asm->OutStreamer->EmitCFISections(false, true);
++      cfiSectionsNeeded = false;
++    }
+     Asm->OutStreamer->EmitCFIStartProc(false);
+   }
+ }
+diff --git a/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp b/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
+index 2eae1b2..af4c081 100644
+--- a/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
++++ b/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
+@@ -39,7 +39,7 @@
+ using namespace llvm;
+ 
+ DwarfCFIExceptionBase::DwarfCFIExceptionBase(AsmPrinter *A)
+-    : EHStreamer(A), shouldEmitCFI(false) {}
++    : EHStreamer(A), shouldEmitCFI(false), cfiSectionsNeeded(true) {}
+ 
+ void DwarfCFIExceptionBase::markFunctionEnd() {
+   endFragment();
+@@ -70,8 +70,10 @@ void DwarfCFIException::endModule() {
+   if (!Asm->MAI->usesCFIForEH())
+     return;
+ 
++#if RICH
+   if (moveTypeModule == AsmPrinter::CFI_M_Debug)
+     Asm->OutStreamer->EmitCFISections(false, true);
++#endif
+ 
+   const TargetLoweringObjectFile &TLOF = Asm->getObjFileLowering();
+ 
+@@ -97,6 +99,13 @@ void DwarfCFIException::beginFunction(const MachineFunction *MF) {
+   shouldEmitMoves = shouldEmitPersonality = shouldEmitLSDA = false;
+   const Function *F = MF->getFunction();
+ 
++  // RICH: SjLj uses this pass and it doesn't need this info.
++  if (cfiSectionsNeeded && Asm->MAI->usesCFIForEH()) {
++    if (moveTypeModule == AsmPrinter::CFI_M_Debug)
++      Asm->OutStreamer->EmitCFISections(false, true);
++  }
++  cfiSectionsNeeded = false;
++
+   // If any landing pads survive, we need an EH table.
+   bool hasLandingPads = !MMI->getLandingPads().empty();
+ 
+diff --git a/lib/CodeGen/AsmPrinter/DwarfException.h b/lib/CodeGen/AsmPrinter/DwarfException.h
+index 8287f28..f150f4e 100644
+--- a/lib/CodeGen/AsmPrinter/DwarfException.h
++++ b/lib/CodeGen/AsmPrinter/DwarfException.h
+@@ -29,6 +29,9 @@ protected:
+   /// Per-function flag to indicate if frame CFI info should be emitted.
+   bool shouldEmitCFI;
+ 
++  /// Cleared if the .cfi_sections directive has been output.
++  bool cfiSectionsNeeded;
++
+   void markFunctionEnd() override;
+   void endFragment() override;
+ };
+@@ -46,6 +49,7 @@ class LLVM_LIBRARY_VISIBILITY DwarfCFIException : public DwarfCFIExceptionBase {
+   /// Per-function flag to indicate if frame moves info should be emitted.
+   bool shouldEmitMoves;
+ 
++
+   AsmPrinter::CFIMoveType moveTypeModule;
+ 
+ public:
+-- 
+2.9.2
+
diff --git a/recipes-devtools/clang/clang/0005-llvm-Fix-build-on-mips-ppc-disable-EH-table-support.patch b/recipes-devtools/clang/clang/0005-llvm-Fix-build-on-mips-ppc-disable-EH-table-support.patch
new file mode 100644
index 0000000..82e0bb2
--- /dev/null
+++ b/recipes-devtools/clang/clang/0005-llvm-Fix-build-on-mips-ppc-disable-EH-table-support.patch
@@ -0,0 +1,27 @@
+From 28df3d17ac3f7925aba87eb2dc191342c11e59ae Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 7 Aug 2016 22:52:09 -0700
+Subject: [PATCH 5/5] llvm: Fix build on mips/ppc disable EH table support
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp b/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
+index e39acc7..69e165e 100644
+--- a/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
++++ b/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
+@@ -34,7 +34,8 @@ RTDyldMemoryManager::~RTDyldMemoryManager() {}
+ 
+ // Determine whether we can register EH tables.
+ #if (defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__ia64__) && \
+-     !defined(__SEH__) && !defined(__USING_SJLJ_EXCEPTIONS__))
++     !defined(__SEH__) && !defined(__USING_SJLJ_EXCEPTIONS__)) && \
++     !defined(__mips__) && !defined(__ppc__)
+ #define HAVE_EHTABLE_SUPPORT 1
+ #else
+ #define HAVE_EHTABLE_SUPPORT 0
+-- 
+2.9.2
+
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index f2beb84..2c22ed4 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -18,6 +18,8 @@ SRC_URI = "${LLVM_GIT}/llvm.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};n
            file://0001-llvm-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-com.patch \
            file://0002-llvm-Do-not-assume-linux-glibc.patch \
            file://0003-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
+           file://0004-llvm-Fix-inconsistent-uses-of-.cfi_sections.patch \
+           file://0005-llvm-Fix-build-on-mips-ppc-disable-EH-table-support.patch \
            \
            file://0001-clang-driver-Use-lib-for-ldso-on-OE.patch;patchdir=tools/clang \
            file://0002-clang-Driver-tools.cpp-Add-lssp-and-lssp_nonshared-o.patch;patchdir=tools/clang \