rebase of the patches

debian/patches/clang-analyzer-force-version.diff

@@ -1,10 +1,10 @@
 # Force the version of clang in the analyzer
 # This was causing the static analyzer to fail silently if the clang & clang++ are
 # not installed
-Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan-build/libexec/ccc-analyzer
+Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/libexec/ccc-analyzer
 ===================================================================
---- llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416.orig/clang/tools/scan-build/libexec/ccc-analyzer
-+++ llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan-build/libexec/ccc-analyzer
+--- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/clang/tools/scan-build/libexec/ccc-analyzer
++++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/libexec/ccc-analyzer
 @@ -93,7 +93,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
    if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; }
  

debian/patches/clang-tidy-run-bin.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_16~++20220525112612+8919447c71ab/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+Index: llvm-toolchain-snapshot_17~++20220525112612+8919447c71ab/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20220525112612+8919447c71ab.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
-+++ llvm-toolchain-snapshot_16~++20220525112612+8919447c71ab/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+--- llvm-toolchain-snapshot_17~++20220525112612+8919447c71ab.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
++++ llvm-toolchain-snapshot_17~++20220525112612+8919447c71ab/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
 @@ -225,8 +225,10 @@ def main():
                        action='store_true', help='allow alpha checkers from '
                                                  'clang-analyzer.')

debian/patches/fix-scan-view-path.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_16~++20200326162000+4673699a470/clang/tools/scan-view/bin/scan-view
+Index: llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan-view/bin/scan-view
 ===================================================================
---- llvm-toolchain-snapshot_16~++20200326162000+4673699a470.orig/clang/tools/scan-view/bin/scan-view
-+++ llvm-toolchain-snapshot_16~++20200326162000+4673699a470/clang/tools/scan-view/bin/scan-view
+--- llvm-toolchain-snapshot_17~++20200326172000+4673699a470.orig/clang/tools/scan-view/bin/scan-view
++++ llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan-view/bin/scan-view
 @@ -28,6 +28,7 @@ kDefaultPort = 8181
  kMaxPortsToTry = 100
  

debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch

@@ -12,10 +12,10 @@ which could then break something else.
 
 This probably should have upstream bug but I couldn't find any existing report.
 
-Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
 ===================================================================
---- llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
-+++ llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+--- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
++++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
 @@ -34,6 +34,7 @@
  #include "lldb/Utility/StreamString.h"
  #include "llvm/ADT/SmallString.h"

debian/patches/openmp-fix-runtimes-build.diff

@@ -1,10 +1,17 @@
 include required runtimes as dependencies to openmp targets to make sure
 they are built first when included as part of a runtimes build since openmp
 can depend on them
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/llvm/runtimes/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/llvm/runtimes/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/llvm/runtimes/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/llvm/runtimes/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/llvm/runtimes/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/llvm/runtimes/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -231,6 +231,7 @@ function(runtime_default_target)
                                        -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED}
                                        -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR}
@@ -22,10 +29,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/llvm/runtimes/CM
      # We need to add the runtimes as a dependency because compiler-rt can be
      # built as part of runtimes and we need the profile runtime for PGO
      add_dependencies(clang-bootstrap-deps runtimes)
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -91,6 +91,28 @@ else()
    set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
  endif()
@@ -55,10 +69,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/CMakeList
  # Build host runtime library, after LIBOMPTARGET variables are set since they are needed
  # to enable time profiling support in the OpenMP runtime.
  add_subdirectory(runtime)
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/plugins/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/libomptarget/plugins/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma
        NO_INSTALL_RPATH
      )
@@ -68,10 +89,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptar
      # Install plugin under the lib destination folder.
      install(TARGETS "omptarget.rtl.${tmachine_libname}"
        LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -56,6 +56,8 @@ add_dependencies(omptarget.rtl.cuda ompt
  target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA")
  target_include_directories(omptarget.rtl.cuda PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
@@ -81,10 +109,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptar
  # Install plugin under the lib destination folder.
  install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}")
  set_target_properties(omptarget.rtl.cuda PROPERTIES 
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/src/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/libomptarget/src/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptarget/src/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/src/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/libomptarget/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/libomptarget/src/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -35,7 +35,9 @@ add_llvm_library(omptarget
    PRIVATE
    "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
@@ -96,10 +131,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/libomptar
  target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR})
  
  # libomptarget.so needs to be aware of where the plugins live as they
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/runtime/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/runtime/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -292,6 +292,10 @@ if(LIBOMP_STATS)
    set(LIBOMP_USE_STDCPPLIB TRUE)
  endif()
@@ -111,10 +153,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/C
  # Shared library can be switched to a static library
  set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL
    "Shared library instead of static library?")
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/src/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/runtime/src/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/src/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/src/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/runtime/src/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/runtime/src/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -140,6 +140,7 @@ set_source_files_properties(${LIBOMP_GNU
  if(NOT ${LIBOMP_USE_STDCPPLIB})
    set(LIBOMP_LINKER_LANGUAGE C)
@@ -132,10 +181,17 @@ Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/runtime/s
  # Get the library's location within the build tree for the unit tester
  if(NOT WIN32)
    get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY)
+<<<<<<< Updated upstream
 Index: llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/tools/archer/CMakeLists.txt
 ===================================================================
 --- llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b.orig/openmp/tools/archer/CMakeLists.txt
 +++ llvm-toolchain-snapshot_17~++20230203112846+a0cb7bab425b/openmp/tools/archer/CMakeLists.txt
+=======
+Index: llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/tools/archer/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5.orig/openmp/tools/archer/CMakeLists.txt
++++ llvm-toolchain-snapshot_17~++20230203111307+e2e6e7a6a3a5/openmp/tools/archer/CMakeLists.txt
+>>>>>>> Stashed changes
 @@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT)
    target_link_libraries(archer ${CMAKE_DL_LIBS})
    add_library(archer_static STATIC ompt-tsan.cpp)

debian/patches/python-clangpath.diff

@@ -2,11 +2,11 @@
  clang/bindings/python/clang/cindex.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/bindings/python/clang/cindex.py
+Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/bindings/python/clang/cindex.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416.orig/clang/bindings/python/clang/cindex.py
-+++ llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/bindings/python/clang/cindex.py
-@@ -4162,7 +4162,7 @@ class Config(object):
+--- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/clang/bindings/python/clang/cindex.py
++++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/bindings/python/clang/cindex.py
+@@ -4172,7 +4172,7 @@ class Config(object):
          elif name == 'Windows':
              file = 'libclang.dll'
          else:

debian/patches/scan-build-clang-path.diff

@@ -2,11 +2,11 @@
  clang/tools/scan-build/bin/scan-build |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan-build/bin/scan-build
+Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/bin/scan-build
 ===================================================================
---- llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416.orig/clang/tools/scan-build/bin/scan-build
-+++ llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan-build/bin/scan-build
-@@ -1686,7 +1686,7 @@ sub FindClang {
+--- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/clang/tools/scan-build/bin/scan-build
++++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/bin/scan-build
+@@ -1786,7 +1786,7 @@ sub FindClang {
    if (!defined $Options{AnalyzerDiscoveryMethod}) {
      $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
      if (!defined $Clang || ! -x $Clang) {

debian/patches/scan-build-py-fix-default-bin.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_16~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
+Index: llvm-toolchain-snapshot_17~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
 ===================================================================
---- llvm-toolchain-snapshot_16~++20210717105643+f95d26006e06.orig/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
-+++ llvm-toolchain-snapshot_16~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
+--- llvm-toolchain-snapshot_17~++20210717105643+f95d26006e06.orig/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
++++ llvm-toolchain-snapshot_17~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py
 @@ -266,7 +266,7 @@ def create_analyze_parser(from_build_com
          '--use-analyzer',
          metavar='<path>',

debian/patches/silent-MCJIIT-tests.diff

@@ -18,27 +18,27 @@
  test/Feature/load_module.ll                                             |    1 -
  17 files changed, 14 insertions(+), 17 deletions(-)
 
-Index: llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
+Index: llvm-toolchain-snapshot_17~++20230411103522+cd91992de838/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d.orig/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
-+++ llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
+--- llvm-toolchain-snapshot_17~++20230411103522+cd91992de838.orig/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
++++ llvm-toolchain-snapshot_17~++20230411103522+cd91992de838/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll
 @@ -1,6 +1,6 @@
  ; RUN: %lli -jit-kind=mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
  ; RUN:   -relocation-model=pic -code-model=small %s > /dev/null
 -; XFAIL: target={{(mips|mipsel)-.*}}, target={{(aarch64|arm).*}}, target={{(i686|i386).*}}
 +; XFAIL: *
  ; XFAIL: target={{.*-windows-(gnu|msvc)}}
+ ; REQUIRES: thread_support
  ; UNSUPPORTED: target=target=powerpc64-unknown-linux-gnu
- ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed
-Index: llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
+Index: llvm-toolchain-snapshot_17~++20230411103522+cd91992de838/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
 ===================================================================
---- llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d.orig/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
-+++ llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
+--- llvm-toolchain-snapshot_17~++20230411103522+cd91992de838.orig/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
++++ llvm-toolchain-snapshot_17~++20230411103522+cd91992de838/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll
 @@ -1,6 +1,6 @@
  ; RUN: %lli -jit-kind=mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \
  ; RUN:   -O0 -relocation-model=pic -code-model=small %s
 -; XFAIL: target={{(mips|mipsel)-.*}}, target={{(aarch64|arm).*}}, target={{(i686|i386).*}}
 +; XFAIL: *
  ; XFAIL: target={{.*-windows-(gnu|msvc)}}
+ ; REQUIRES: thread_support
  ; UNSUPPORTED: target=powerpc64-unknown-linux-gnu
- ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed