diff --git a/arm_suse_support.diff b/arm_suse_support.diff
index 7a2b003..bff9ebc 100644
--- a/arm_suse_support.diff
+++ b/arm_suse_support.diff
@@ -1,8 +1,8 @@
 Index: cfe-3.8.0.src/lib/Driver/ToolChains.cpp
 ===================================================================
---- cfe-3.8.0.src/lib/Driver/ToolChains.cpp
+--- cfe-3.8.0.src/lib/Driver/ToolChains.cpp.orig
 +++ cfe-3.8.0.src/lib/Driver/ToolChains.cpp
-@@ -1266,16 +1266,18 @@ bool Generic_GCC::GCCInstallationDetecto
+@@ -1418,7 +1418,7 @@ bool Generic_GCC::GCCInstallationDetecto
    static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
    static const char *const AArch64Triples[] = {
        "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-linux-android",
@@ -11,15 +11,13 @@ Index: cfe-3.8.0.src/lib/Driver/ToolChains.cpp
    static const char *const AArch64beLibDirs[] = {"/lib"};
    static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
                                                   "aarch64_be-linux-gnu"};
- 
-   static const char *const ARMLibDirs[] = {"/lib"};
+@@ -1427,7 +1427,9 @@ bool Generic_GCC::GCCInstallationDetecto
    static const char *const ARMTriples[] = {"arm-linux-gnueabi",
--                                           "arm-linux-androideabi"};
-+                                           "arm-linux-androideabi",
-+                                           "armv6hl-suse-linux-gnueabi"};
+                                            "arm-linux-androideabi"};
    static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
 -                                             "armv7hl-redhat-linux-gnueabi"};
 +                                             "armv7hl-redhat-linux-gnueabi",
++                                             "armv6hl-suse-linux-gnueabi",
 +                                             "armv7hl-suse-linux-gnueabi"};
    static const char *const ARMebLibDirs[] = {"/lib"};
    static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
diff --git a/assume-opensuse.patch b/assume-opensuse.patch
index 045f1b3..0aab27d 100644
--- a/assume-opensuse.patch
+++ b/assume-opensuse.patch
@@ -1,8 +1,8 @@
 Index: cfe-3.8.0.src/lib/Driver/ToolChains.cpp
 ===================================================================
---- cfe-3.8.0.src/lib/Driver/ToolChains.cpp
+--- cfe-3.8.0.src/lib/Driver/ToolChains.cpp.orig
 +++ cfe-3.8.0.src/lib/Driver/ToolChains.cpp
-@@ -3080,6 +3080,7 @@ static bool IsUbuntu(enum Distro Distro)
+@@ -3422,6 +3422,7 @@ static bool IsUbuntu(enum Distro Distro)
  }
  
  static Distro DetectDistro(const Driver &D, llvm::Triple::ArchType Arch) {
@@ -10,7 +10,7 @@ Index: cfe-3.8.0.src/lib/Driver/ToolChains.cpp
    llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
        llvm::MemoryBuffer::getFile("/etc/lsb-release");
    if (File) {
-@@ -3155,6 +3156,8 @@ static Distro DetectDistro(const Driver
+@@ -3498,6 +3499,8 @@ static Distro DetectDistro(const Driver
      return ArchLinux;
  
    return UnknownDistro;
diff --git a/default-to-i586.patch b/default-to-i586.patch
index aa142c2..f1f414f 100644
--- a/default-to-i586.patch
+++ b/default-to-i586.patch
@@ -1,8 +1,8 @@
 Index: cfe-3.8.0.src/lib/Driver/Tools.cpp
 ===================================================================
---- cfe-3.8.0.src/lib/Driver/Tools.cpp
+--- cfe-3.8.0.src/lib/Driver/Tools.cpp.orig
 +++ cfe-3.8.0.src/lib/Driver/Tools.cpp
-@@ -1322,8 +1322,8 @@ static const char *getX86TargetCPU(const
+@@ -1680,8 +1680,8 @@ static const char *getX86TargetCPU(const
    case llvm::Triple::Bitrig:
      return "i686";
    default:
diff --git a/llvm.changes b/llvm.changes
index bbcdc61..7190b9e 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -3,6 +3,12 @@ Mon Apr 11 08:45:56 UTC 2016 - idonmez@suse.com
 
 - Re-enable glibc-2.23 patch for Tumbleweed 
 
+-------------------------------------------------------------------
+Sun Apr 10 19:18:41 UTC 2016 - dmueller@suse.com
+
+- fix arm_suse_support.diff for armv6hl
+- adjust compile flags for llvm on armv6hl (fixes Mesa build)
+
 -------------------------------------------------------------------
 Mon Apr  4 17:53:14 UTC 2016 - idonmez@suse.com
 
diff --git a/llvm.spec b/llvm.spec
index 357a425..cbfd883 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -259,8 +259,8 @@ cmake -G "Ninja" \
 %endif
       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 %ifarch armv6hl
-      -DCMAKE_C_FLAGS="-target armv6hl-suse-linux-gnueabi -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \
-      -DCMAKE_CXX_FLAGS="-target armv6hl-suse-linux-gnueabi -mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \
+      -DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \
+      -DCMAKE_CXX_FLAGS="-mfloat-abi=hard -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp" \
 %endif
 %ifarch armv7hl
       -DCMAKE_C_FLAGS="-mfloat-abi=hard -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16" \
diff --git a/set-revision.patch b/set-revision.patch
index 4175be1..4712c45 100644
--- a/set-revision.patch
+++ b/set-revision.patch
@@ -1,8 +1,8 @@
 Index: cfe-3.8.0.src/lib/Basic/Version.cpp
 ===================================================================
---- cfe-3.8.0.src/lib/Basic/Version.cpp
+--- cfe-3.8.0.src/lib/Basic/Version.cpp.orig
 +++ cfe-3.8.0.src/lib/Basic/Version.cpp
-@@ -66,19 +66,11 @@ std::string getLLVMRepositoryPath() {
+@@ -72,19 +72,11 @@ std::string getLLVMRepositoryPath() {
  }
  
  std::string getClangRevision() {