* debian/patches/{0003-Debian-version-info-and-bugreport.patch,

0044-soname.diff,23-strlcpy_strlcat_warning_removed.diff,
  26-set-correct-float-abi.diff,atomic_library_[12].diff,
  fix-clang-path-and-build.diff,fix-lldb-server-build,lldb-libname.diff,
  lldb-soname.diff,mips-fpxx-enable.diff,removeduplicatedeclaration.diff}:
  Refreshed.
* debian/patches/{silent-gold-utils,kfreebsd-support}.diff: Updated.

debian/changelog

@@ -1,3 +1,15 @@
+llvm-toolchain-snapshot (1:4.0~svn285794-1~exp0.1) UNRELEASED; urgency=medium
+
+  * debian/patches/{0003-Debian-version-info-and-bugreport.patch,
+    0044-soname.diff,23-strlcpy_strlcat_warning_removed.diff,
+    26-set-correct-float-abi.diff,atomic_library_[12].diff,
+    fix-clang-path-and-build.diff,fix-lldb-server-build,lldb-libname.diff,
+    lldb-soname.diff,mips-fpxx-enable.diff,removeduplicatedeclaration.diff}:
+    Refreshed.
+  * debian/patches/{silent-gold-utils,kfreebsd-support}.diff: Updated.
+
+ -- Kai Wasserbäch <curan@debian.org>  Wed, 02 Nov 2016 18:12:12 +0100
+
 llvm-toolchain-snapshot (1:4.0~svn282142-1~exp1) experimental; urgency=medium
 
   * The libstdc++-6-dev & libobjc-6-dev are only install with clang-X.Y

debian/patches/0003-Debian-version-info-and-bugreport.patch

@@ -4,7 +4,7 @@
 
 --- a/lib/Support/CommandLine.cpp
 +++ b/lib/Support/CommandLine.cpp
-@@ -2029,6 +2029,10 @@ public:
+@@ -2046,6 +2046,10 @@ public:
      OS << " " << LLVM_VERSION_INFO;
  #endif
      OS << "\n  ";

debian/patches/0044-soname.diff

@@ -1,19 +1,10 @@
-Index: llvm-toolchain-snapshot_3.9~svn274438/tools/llvm-shlib/CMakeLists.txt
+---
-===================================================================
+ clang/tools/libclang/CMakeLists.txt |    2 +-
---- llvm-toolchain-snapshot_3.9~svn274438.orig/tools/llvm-shlib/CMakeLists.txt
+ tools/llvm-shlib/CMakeLists.txt     |    1 +
-+++ llvm-toolchain-snapshot_3.9~svn274438/tools/llvm-shlib/CMakeLists.txt
+ 2 files changed, 2 insertions(+), 1 deletion(-)
-@@ -37,6 +37,7 @@ if(LLVM_DYLIB_EXPORTED_SYMBOL_FILE)
- endif()
 
- add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
+--- a/clang/tools/libclang/CMakeLists.txt
-+set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
++++ b/clang/tools/libclang/CMakeLists.txt
- 
- list(REMOVE_DUPLICATES LIB_NAMES)
- if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf"
-Index: llvm-toolchain-snapshot_3.9~svn274438/clang/tools/libclang/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_3.9~svn274438.orig/clang/tools/libclang/CMakeLists.txt
-+++ llvm-toolchain-snapshot_3.9~svn274438/clang/tools/libclang/CMakeLists.txt
 @@ -83,7 +83,7 @@ else()
    set(output_name "clang")
  endif()
@@ -23,3 +14,13 @@ Index: llvm-toolchain-snapshot_3.9~svn274438/clang/tools/libclang/CMakeLists.txt
    OUTPUT_NAME ${output_name}
    ${SOURCES}
    DEPENDS clang-headers
+--- a/tools/llvm-shlib/CMakeLists.txt
++++ b/tools/llvm-shlib/CMakeLists.txt
+@@ -35,6 +35,7 @@ if(LLVM_DYLIB_EXPORTED_SYMBOL_FILE)
+ endif()
+ 
+ add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
++set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
+ 
+ list(REMOVE_DUPLICATES LIB_NAMES)
+ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR MINGW) # FIXME: It should be "GNU ld for elf"

debian/patches/23-strlcpy_strlcat_warning_removed.diff

@@ -20,7 +20,7 @@
  BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF")
  BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF")
  BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF")
-@@ -873,8 +873,8 @@ LIBBUILTIN(getcontext, "iK*",     "fj",
+@@ -874,8 +874,8 @@ LIBBUILTIN(getcontext, "iK*",     "fj",
  LIBBUILTIN(_longjmp, "vJi",       "fr",    "setjmp.h", ALL_GNU_LANGUAGES)
  LIBBUILTIN(siglongjmp, "vSJi",    "fr",    "setjmp.h", ALL_GNU_LANGUAGES)
  // non-standard but very common
@@ -33,7 +33,7 @@
  // long double objc_msgSend_fpret(id self, SEL op, ...) 
 --- a/clang/lib/AST/Decl.cpp
 +++ b/clang/lib/AST/Decl.cpp
-@@ -3454,13 +3454,13 @@ unsigned FunctionDecl::getMemoryFunction
+@@ -3455,13 +3455,13 @@ unsigned FunctionDecl::getMemoryFunction
    case Builtin::BImemmove:
      return Builtin::BImemmove;
  
@@ -55,7 +55,7 @@
    case Builtin::BImemcmp:
 --- a/clang/lib/Sema/SemaChecking.cpp
 +++ b/clang/lib/Sema/SemaChecking.cpp
-@@ -971,8 +971,8 @@ Sema::CheckBuiltinFunctionCall(FunctionD
+@@ -975,8 +975,8 @@ Sema::CheckBuiltinFunctionCall(FunctionD
    case Builtin::BI__builtin___memcpy_chk:
    case Builtin::BI__builtin___memmove_chk:
    case Builtin::BI__builtin___memset_chk:
@@ -66,7 +66,7 @@
    case Builtin::BI__builtin___strncat_chk:
    case Builtin::BI__builtin___strncpy_chk:
    case Builtin::BI__builtin___stpncpy_chk:
-@@ -2552,9 +2552,10 @@ bool Sema::CheckFunctionCall(FunctionDec
+@@ -2512,9 +2512,10 @@ bool Sema::CheckFunctionCall(FunctionDec
      return false;
  
    // Handle memory setting and copying functions.

debian/patches/26-set-correct-float-abi.diff

@@ -24,7 +24,7 @@ Last-Update: <YYYY-MM-DD>
 
 --- a/clang/lib/Driver/Tools.cpp
 +++ b/clang/lib/Driver/Tools.cpp
-@@ -839,7 +839,7 @@ arm::FloatABI arm::getARMFloatABI(const
+@@ -973,7 +973,7 @@ arm::FloatABI arm::getARMFloatABI(const
        case llvm::Triple::MuslEABI:
        case llvm::Triple::EABI:
          // EABI is always AAPCS, and if it was not marked 'hard', it's softfp

debian/patches/atomic_library_1.diff

@@ -5,7 +5,7 @@
 
 --- a/clang/lib/Basic/Targets.cpp
 +++ b/clang/lib/Basic/Targets.cpp
-@@ -4391,6 +4391,20 @@ protected:
+@@ -4414,6 +4414,20 @@ protected:
      Builder.defineMacro("__ELF__");
    }
  

debian/patches/atomic_library_2.diff

@@ -5,7 +5,7 @@
 
 --- a/clang/lib/Basic/Targets.cpp
 +++ b/clang/lib/Basic/Targets.cpp
-@@ -4400,9 +4400,23 @@ protected:
+@@ -4423,9 +4423,23 @@ protected:
      if (T.getOS() != llvm::Triple::Linux)
       return false;
      StringRef ArchName = T.getArchName();

debian/patches/fix-clang-path-and-build.diff

@@ -4,12 +4,12 @@
 
 --- a/clang/lib/Driver/ToolChains.cpp
 +++ b/clang/lib/Driver/ToolChains.cpp
-@@ -3447,6 +3447,8 @@ void Haiku::AddClangCXXStdlibIncludeArgs
+@@ -2842,6 +2842,8 @@ void Generic_GCC::AddClangCXXStdlibInclu
        DriverArgs.hasArg(options::OPT_nostdincxx))
      return;
  
 +  addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
 +
    switch (GetCXXStdlibType(DriverArgs)) {
-   case ToolChain::CST_Libcxx:
+   case ToolChain::CST_Libcxx: {
-     addSystemInclude(DriverArgs, CC1Args,
+     std::string Path = findLibCxxIncludePath();

debian/patches/fix-lldb-server-build

@@ -5,7 +5,7 @@
 
 --- a/cmake/modules/AddLLVM.cmake
 +++ b/cmake/modules/AddLLVM.cmake
-@@ -498,7 +498,7 @@ function(llvm_add_library name)
+@@ -501,7 +501,7 @@ function(llvm_add_library name)
      # On DLL platforms symbols are imported from the tool by linking against it.
      set(llvm_libs ${ARG_PLUGIN_TOOL})
    elseif (DEFINED LLVM_LINK_COMPONENTS OR DEFINED ARG_LINK_COMPONENTS)

debian/patches/kfreebsd-support.diff

@@ -72,12 +72,12 @@
      return eOSType
 --- a/tools/llvm-shlib/CMakeLists.txt
 +++ b/tools/llvm-shlib/CMakeLists.txt
-@@ -40,7 +40,7 @@ add_llvm_library(LLVM SHARED DISABLE_LLV
+@@ -38,7 +38,7 @@ add_llvm_library(LLVM SHARED DISABLE_LLV
  set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
  
  list(REMOVE_DUPLICATES LIB_NAMES)
--if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf"
+-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR MINGW) # FIXME: It should be "GNU ld for elf"
-+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "GNU" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "kFreeBSD") # FIXME: It should be "GNU ld for elf"
++if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR MINGW OR "${CMAKE_SYSTEM_NAME}" STREQUAL "GNU" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "kFreeBSD") # FIXME: It should be "GNU ld for elf"
    # GNU ld doesn't resolve symbols in the version script.
    set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")

debian/patches/lldb-libname.diff

@@ -1,7 +1,9 @@
-Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/scripts/Python/finishSwigPythonLLDB.py
+---
-===================================================================
+ lldb/scripts/Python/finishSwigPythonLLDB.py |    2 +-
---- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/scripts/Python/finishSwigPythonLLDB.py
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+++ llvm-toolchain-snapshot_4.0~svn280802/lldb/scripts/Python/finishSwigPythonLLDB.py
+
+--- a/lldb/scripts/Python/finishSwigPythonLLDB.py
++++ b/lldb/scripts/Python/finishSwigPythonLLDB.py
 @@ -443,7 +443,7 @@ def make_symlink_liblldb(
              if eOSType == utilsOsType.EnumOsType.Darwin:
                  strLibFileExtn = ".dylib"

debian/patches/lldb-soname.diff

@@ -27,7 +27,7 @@
    )
  
  if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
-@@ -122,11 +127,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
+@@ -119,11 +124,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
    if (MSVC AND NOT LLDB_DISABLE_PYTHON)
      target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY})
    endif()

debian/patches/mips-fpxx-enable.diff

@@ -4,7 +4,7 @@
 
 --- a/clang/lib/Driver/Tools.cpp
 +++ b/clang/lib/Driver/Tools.cpp
-@@ -7616,11 +7616,6 @@ bool mips::isFP64ADefault(const llvm::Tr
+@@ -7876,11 +7876,6 @@ bool mips::isFP64ADefault(const llvm::Tr
  
  bool mips::isFPXXDefault(const llvm::Triple &Triple, StringRef CPUName,
                           StringRef ABIName, mips::FloatABI FloatABI) {

debian/patches/removeduplicatedeclaration.diff

@@ -4,7 +4,7 @@
 
 --- a/clang/lib/Basic/Targets.cpp
 +++ b/clang/lib/Basic/Targets.cpp
-@@ -4391,33 +4391,6 @@ protected:
+@@ -4414,33 +4414,6 @@ protected:
      Builder.defineMacro("__ELF__");
    }
  

debian/patches/silent-gold-utils.diff

@@ -1,82 +1,32 @@
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/pr19901_thinlto.ll
+---
-===================================================================
+ test/tools/gold/X86/common_thinlto.ll             |    1 +
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/pr19901_thinlto.ll
+ test/tools/gold/X86/emit-llvm.ll                  |    2 ++
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/pr19901_thinlto.ll
+ test/tools/gold/X86/parallel.ll                   |    1 +
-@@ -4,6 +4,7 @@
+ test/tools/gold/X86/pr19901_thinlto.ll            |    1 +
- ; RUN:     --plugin-opt=thinlto \
+ test/tools/gold/X86/slp-vectorize.ll              |    1 +
- ; RUN:     -shared -m elf_x86_64 -o %t.so %t2.o %t.o
+ test/tools/gold/X86/strip_names.ll                |    1 +
- ; RUN: llvm-readobj -t %t.so | FileCheck %s
+ test/tools/gold/X86/thinlto.ll                    |    2 ++
-+; XFAIL: i686, i386
+ test/tools/gold/X86/thinlto_archive.ll            |    1 +
+ test/tools/gold/X86/thinlto_internalize.ll        |    2 ++
+ test/tools/gold/X86/thinlto_linkonceresolution.ll |    2 ++
+ test/tools/gold/X86/thinlto_weak_resolution.ll    |    3 ++-
+ test/tools/gold/X86/type-merge2.ll                |    2 +-
+ test/tools/gold/X86/vectorize.ll                  |    1 +
+ test/tools/gold/X86/visibility.ll                 |    1 +
+ 14 files changed, 19 insertions(+), 2 deletions(-)
 
- ; CHECK:       Symbol {
+--- a/test/tools/gold/X86/common_thinlto.ll
- ; CHECK:         Name: f
++++ b/test/tools/gold/X86/common_thinlto.ll
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto.ll
+@@ -17,6 +17,7 @@
-===================================================================
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/thinlto.ll
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto.ll
-@@ -115,6 +115,8 @@
- ; COMBINED-NEXT: <COMBINED_ENTRY abbrevid={{[0-9]+}} op0={{1|2}} op1={{-3706093650706652785|-5300342847281564238}}
- ; COMBINED-NEXT: </VALUE_SYMTAB
  
-+; XFAIL: i686, i386
+ ; RUN: llvm-nm %t3 | FileCheck %s --check-prefix=NM
-+
+ ; NM: bar
- declare void @g(...)
++; XFAIL: *
  
- define void @f() {
+ source_filename = "common1.c"
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_archive.ll
+ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-===================================================================
+--- a/test/tools/gold/X86/emit-llvm.ll
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/thinlto_archive.ll
++++ b/test/tools/gold/X86/emit-llvm.ll
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_archive.ll
-@@ -14,6 +14,7 @@
- ; RUN:    --plugin-opt=jobs=1 \
- ; RUN:    -shared %t.o %t.a -o %t4 2>&1 | FileCheck %s
- ; RUN: llvm-nm %t4 | FileCheck %s --check-prefix=NM
-+; XFAIL: i686, i386
- 
- ; CHECK-DAG: Import g
- declare void @g(...)
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_internalize.ll
-===================================================================
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/thinlto_internalize.ll
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_internalize.ll
-@@ -14,6 +14,8 @@
- ; h() should be internalized after promotion, and eliminated after inlining
- ; CHECK-NOT: @h.llvm.
- 
-+; XFAIL: i686, i386
-+
- target triple = "x86_64-unknown-linux-gnu"
- define i32 @g() {
-   call void @f()
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_linkonceresolution.ll
-===================================================================
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/thinlto_linkonceresolution.ll
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_linkonceresolution.ll
-@@ -23,6 +23,8 @@
- ; OPT-NOT: @f()
- ; OPT2: define weak_odr hidden void @f()
- 
-+; XFAIL: i686, i386
-+
- target triple = "x86_64-unknown-linux-gnu"
- define i32 @g() {
-   call void @f()
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_weak_resolution.ll
-===================================================================
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/thinlto_weak_resolution.ll
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/thinlto_weak_resolution.ll
-@@ -24,6 +24,7 @@
- ; OPT2-NOT: @
- 
- ; RUN: llvm-dis %t.o.4.opt.bc -o - | FileCheck --check-prefix=OPT %s
-+; XFAIL: i686, i386
- 
- target triple = "x86_64-unknown-linux-gnu"
- 
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/emit-llvm.ll
-===================================================================
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/emit-llvm.ll
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/emit-llvm.ll
 @@ -21,6 +21,8 @@
  ; RUN: not test -a %t4.o
  
@@ -86,10 +36,8 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/emit-llvm.ll
  
  target triple = "x86_64-unknown-linux-gnu"
  
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/parallel.ll
+--- a/test/tools/gold/X86/parallel.ll
-===================================================================
++++ b/test/tools/gold/X86/parallel.ll
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/parallel.ll
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/parallel.ll
 @@ -5,6 +5,7 @@
  ; RUN: llvm-dis %t.1.5.precodegen.bc -o - | FileCheck --check-prefix=CHECK-BC1 %s
  ; RUN: llvm-nm %t.o0 | FileCheck --check-prefix=CHECK0 %s
@@ -98,10 +46,18 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/parallel.ll
  
  target triple = "x86_64-unknown-linux-gnu"
  
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/slp-vectorize.ll
+--- a/test/tools/gold/X86/pr19901_thinlto.ll
-===================================================================
++++ b/test/tools/gold/X86/pr19901_thinlto.ll
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/slp-vectorize.ll
+@@ -4,6 +4,7 @@
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/slp-vectorize.ll
+ ; RUN:     --plugin-opt=thinlto \
+ ; RUN:     -shared -m elf_x86_64 -o %t.so %t2.o %t.o
+ ; RUN: llvm-readobj -t %t.so | FileCheck %s
++; XFAIL: i686, i386
+ 
+ ; CHECK:       Symbol {
+ ; CHECK:         Name: f
+--- a/test/tools/gold/X86/slp-vectorize.ll
++++ b/test/tools/gold/X86/slp-vectorize.ll
 @@ -7,6 +7,7 @@
  
  ; test that the vectorizer is run.
@@ -110,10 +66,8 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/slp-vectorize.l
  
  target triple = "x86_64-unknown-linux-gnu"
  
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/strip_names.ll
+--- a/test/tools/gold/X86/strip_names.ll
-===================================================================
++++ b/test/tools/gold/X86/strip_names.ll
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/strip_names.ll
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/strip_names.ll
 @@ -23,6 +23,7 @@
  ; NONAME:  %2 = load i32, i32* @GlobalValueName
  ; NONAME:  %3 = add i32 %0, %2
@@ -122,10 +76,63 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/strip_names.ll
  
  @GlobalValueName = global i32 0
  
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/type-merge2.ll
+--- a/test/tools/gold/X86/thinlto.ll
-===================================================================
++++ b/test/tools/gold/X86/thinlto.ll
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/type-merge2.ll
+@@ -115,6 +115,8 @@
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/type-merge2.ll
+ ; COMBINED-NEXT: <COMBINED_ENTRY abbrevid={{[0-9]+}} op0={{1|2}} op1={{-3706093650706652785|-5300342847281564238}}
+ ; COMBINED-NEXT: </VALUE_SYMTAB
+ 
++; XFAIL: i686, i386
++
+ declare void @g(...)
+ 
+ define void @f() {
+--- a/test/tools/gold/X86/thinlto_archive.ll
++++ b/test/tools/gold/X86/thinlto_archive.ll
+@@ -14,6 +14,7 @@
+ ; RUN:    --plugin-opt=jobs=1 \
+ ; RUN:    -shared %t.o %t.a -o %t4 2>&1 | FileCheck %s
+ ; RUN: llvm-nm %t4 | FileCheck %s --check-prefix=NM
++; XFAIL: i686, i386
+ 
+ ; CHECK-DAG: Import g
+ declare void @g(...)
+--- a/test/tools/gold/X86/thinlto_internalize.ll
++++ b/test/tools/gold/X86/thinlto_internalize.ll
+@@ -14,6 +14,8 @@
+ ; h() should be internalized after promotion, and eliminated after inlining
+ ; CHECK-NOT: @h.llvm.
+ 
++; XFAIL: i686, i386
++
+ target triple = "x86_64-unknown-linux-gnu"
+ define i32 @g() {
+   call void @f()
+--- a/test/tools/gold/X86/thinlto_linkonceresolution.ll
++++ b/test/tools/gold/X86/thinlto_linkonceresolution.ll
+@@ -23,6 +23,8 @@
+ ; OPT-NOT: @f()
+ ; OPT2: define weak_odr hidden void @f()
+ 
++; XFAIL: i686, i386
++
+ target triple = "x86_64-unknown-linux-gnu"
+ define i32 @g() {
+   call void @f()
+--- a/test/tools/gold/X86/thinlto_weak_resolution.ll
++++ b/test/tools/gold/X86/thinlto_weak_resolution.ll
+@@ -24,7 +24,8 @@
+ ; OPT2-NOT: @
+ 
+ ; RUN: llvm-dis %t.o.3.import.bc -o - | FileCheck --check-prefix=IMPORT %s
+-; RUN llvm-dis %t2.o.3.import.bc -o - | FileCheck --check-prefix=IMPORT2 %s
++; RUN: llvm-dis %t2.o.3.import.bc -o - | FileCheck --check-prefix=IMPORT2 %s
++; XFAIL: i686, i386
+ 
+ target triple = "x86_64-unknown-linux-gnu"
+ 
+--- a/test/tools/gold/X86/type-merge2.ll
++++ b/test/tools/gold/X86/type-merge2.ll
 @@ -4,7 +4,7 @@
  ; RUN:    --plugin-opt=save-temps \
  ; RUN:    -shared %t.o %t2.o -o %t3.o
@@ -135,10 +142,8 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/type-merge2.ll
  %zed = type { i8 }
  define void @foo()  {
    call void @bar(%zed* null)
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/vectorize.ll
+--- a/test/tools/gold/X86/vectorize.ll
-===================================================================
++++ b/test/tools/gold/X86/vectorize.ll
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/vectorize.ll
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/vectorize.ll
 @@ -7,6 +7,7 @@
  
  ; test that the vectorizer is run.
@@ -147,10 +152,8 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/vectorize.ll
  
  target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
  target triple = "x86_64-unknown-linux-gnu"
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/visibility.ll
+--- a/test/tools/gold/X86/visibility.ll
-===================================================================
++++ b/test/tools/gold/X86/visibility.ll
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/visibility.ll
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/visibility.ll
 @@ -15,6 +15,7 @@
  ; CHECK-NEXT: Other [
  ; CHECK-NEXT:   STV_PROTECTED
@@ -159,15 +162,3 @@ Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/visibility.ll
  
  ; IR: define void @foo
  
-Index: llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/common_thinlto.ll
-===================================================================
---- llvm-toolchain-snapshot_4.0~svn279363.orig/test/tools/gold/X86/common_thinlto.ll
-+++ llvm-toolchain-snapshot_4.0~svn279363/test/tools/gold/X86/common_thinlto.ll
-@@ -17,6 +17,7 @@
- 
- ; RUN: llvm-nm %t3 | FileCheck %s --check-prefix=NM
- ; NM: bar
-+; XFAIL: *
- 
- source_filename = "common1.c"
- target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"