From f9ce17774e8445c34ff2d00d050c0beb09468d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Sat, 19 Jan 2019 01:05:18 +0200
Subject: [PATCH] Switch i686 exception handling back to dwarf

The code generation bug in llvm has been fixed now.
---
 wrappers/clang-target-wrapper.c  | 6 +-----
 wrappers/clang-target-wrapper.sh | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/wrappers/clang-target-wrapper.c b/wrappers/clang-target-wrapper.c
index 0bebadc..8f633a7 100644
--- a/wrappers/clang-target-wrapper.c
+++ b/wrappers/clang-target-wrapper.c
@@ -283,11 +283,7 @@ int _tmain(int argc, TCHAR* argv[]) {
         exec_argv[arg++] = _T("--driver-mode=g++");
 
     if (!_tcscmp(arch, _T("i686"))) {
-        // Dwarf is the default for i686, but there are a few issues with
-        // dwarf unwinding in code generated for i686, see
-        // https://bugs.llvm.org/show_bug.cgi?id=40012 and
-        // https://bugs.llvm.org/show_bug.cgi?id=40322.
-        exec_argv[arg++] = _T("-fsjlj-exceptions");
+        // Dwarf is the default for i686.
     } else if (!_tcscmp(arch, _T("x86_64"))) {
         // SEH is the default here.
     } else if (!_tcscmp(arch, _T("armv7"))) {
diff --git a/wrappers/clang-target-wrapper.sh b/wrappers/clang-target-wrapper.sh
index 6db9330..1bcde91 100755
--- a/wrappers/clang-target-wrapper.sh
+++ b/wrappers/clang-target-wrapper.sh
@@ -37,11 +37,7 @@ clang++|g++|c++)
 esac
 case $ARCH in
 i686)
-    # Dwarf is the default for i686, but there are a few issues with
-    # dwarf unwinding in code generated for i686, see
-    # https://bugs.llvm.org/show_bug.cgi?id=40012 and
-    # https://bugs.llvm.org/show_bug.cgi?id=40322.
-    FLAGS="$FLAGS -fsjlj-exceptions"
+    # Dwarf is the default for i686.
     ;;
 x86_64)
     # SEH is the default here.