Revert "Remove dependence on <ciso646>"

[JDevlieghere]

Reverts #73273

[llvmbot]

@llvm/pr-subscribers-llvm-support

Author: Jonas Devlieghere (JDevlieghere)

Changes

Reverts llvm/llvm-project#73273

---

Full diff: https://github.com/llvm/llvm-project/pull/126399.diff

1 Files Affected:

• (modified) llvm/include/llvm/Support/Threading.h (-1)

diff --git a/llvm/include/llvm/Support/Threading.h b/llvm/include/llvm/Support/Threading.h
index 9972f4ad31dadb5..01e26ad9b858ea3 100644
--- a/llvm/include/llvm/Support/Threading.h
+++ b/llvm/include/llvm/Support/Threading.h
@@ -19,7 +19,6 @@
 #include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX
 #include "llvm/Support/Compiler.h"
 #include <optional>
-#include <version>
 
 #if defined(_MSC_VER)
 // MSVC's call_once implementation worked since VS 2015, which is the minimum

[llvm-ci]

LLVM Buildbot has detected a new failure on builder openmp-s390x-linux running on systemz-1 while building llvm at step 6 "test-openmp".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/88/builds/7799

Here is the relevant piece of the build log for the reference

Step 6 (test-openmp) failure: test (failure)
******************** TEST 'libomp :: tasking/issue-94260-2.c' FAILED ********************
Exit Code: -11

Command Output (stdout):
--
# RUN: at line 1
/home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.build/./bin/clang -fopenmp   -I /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.build/runtimes/runtimes-bins/openmp/runtime/src -I /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.src/openmp/runtime/test -L /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.build/runtimes/runtimes-bins/openmp/runtime/src  -fno-omit-frame-pointer -mbackchain -I /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.src/openmp/runtime/test/ompt /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.src/openmp/runtime/test/tasking/issue-94260-2.c -o /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.build/runtimes/runtimes-bins/openmp/runtime/test/tasking/Output/issue-94260-2.c.tmp -lm -latomic && /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.build/runtimes/runtimes-bins/openmp/runtime/test/tasking/Output/issue-94260-2.c.tmp
# executed command: /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.build/./bin/clang -fopenmp -I /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.build/runtimes/runtimes-bins/openmp/runtime/src -I /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.src/openmp/runtime/test -L /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.build/runtimes/runtimes-bins/openmp/runtime/src -fno-omit-frame-pointer -mbackchain -I /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.src/openmp/runtime/test/ompt /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.src/openmp/runtime/test/tasking/issue-94260-2.c -o /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.build/runtimes/runtimes-bins/openmp/runtime/test/tasking/Output/issue-94260-2.c.tmp -lm -latomic
# executed command: /home/uweigand/sandbox/buildbot/openmp-s390x-linux/llvm.build/runtimes/runtimes-bins/openmp/runtime/test/tasking/Output/issue-94260-2.c.tmp
# note: command had no output on stdout or stderr
# error: command failed with exit status: -11

--

********************

[llvm-ci]

LLVM Buildbot has detected a new failure on builder llvm-clang-x86_64-darwin running on doug-worker-3 while building llvm at step 6 "test-build-unified-tree-check-all".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/23/builds/7414

Here is the relevant piece of the build log for the reference

Step 6 (test-build-unified-tree-check-all) failure: test (failure)
******************** TEST 'Clang :: Driver/offload-Xarch.c' FAILED ********************
Exit Code: 1

Command Output (stderr):
--
RUN: at line 1: /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang --target=x86_64-unknown-linux-gnu -x cuda /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c -Xarch_nvptx64 -O3 -S -nogpulib -nogpuinc -### 2>&1 | /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=O3ONCE /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang --target=x86_64-unknown-linux-gnu -x cuda /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c -Xarch_nvptx64 -O3 -S -nogpulib -nogpuinc -###
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=O3ONCE /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
RUN: at line 2: /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -x cuda /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c -Xarch_device -O3 -S -nogpulib -nogpuinc -### 2>&1 | /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=O3ONCE /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -x cuda /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c -Xarch_device -O3 -S -nogpulib -nogpuinc -###
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=O3ONCE /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
RUN: at line 3: /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -x hip /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c -Xarch_amdgcn -O3 -S -nogpulib -nogpuinc -### 2>&1 | /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=O3ONCE /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -x hip /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c -Xarch_amdgcn -O3 -S -nogpulib -nogpuinc -###
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=O3ONCE /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
RUN: at line 4: /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -fopenmp=libomp -fopenmp-targets=amdgcn-amd-amdhsa -nogpulib -nogpuinc    -Xarch_amdgcn -march=gfx90a -Xarch_amdgcn -O3 -S -### /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c 2>&1  | /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=O3ONCE /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -fopenmp=libomp -fopenmp-targets=amdgcn-amd-amdhsa -nogpulib -nogpuinc -Xarch_amdgcn -march=gfx90a -Xarch_amdgcn -O3 -S -### /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=O3ONCE /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
RUN: at line 7: /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -fopenmp=libomp -fopenmp-targets=nvptx64-nvidia-cuda -nogpulib -nogpuinc    -Xarch_nvptx64 -march=sm_52 -Xarch_nvptx64 -O3 -S -### /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c 2>&1  | /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=O3ONCE /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -fopenmp=libomp -fopenmp-targets=nvptx64-nvidia-cuda -nogpulib -nogpuinc -Xarch_nvptx64 -march=sm_52 -Xarch_nvptx64 -O3 -S -### /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=O3ONCE /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
RUN: at line 13: /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -fopenmp=libomp -fopenmp-targets=nvptx64-nvidia-cuda,amdgcn-amd-amdhsa -nogpulib    --target=x86_64-unknown-linux-gnu -Xopenmp-target=nvptx64-nvidia-cuda --offload-arch=sm_52,sm_60 -nogpuinc    -Xopenmp-target=amdgcn-amd-amdhsa --offload-arch=gfx90a,gfx1030 -ccc-print-bindings -### /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c 2>&1  | /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=OPENMP /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -fopenmp=libomp -fopenmp-targets=nvptx64-nvidia-cuda,amdgcn-amd-amdhsa -nogpulib --target=x86_64-unknown-linux-gnu -Xopenmp-target=nvptx64-nvidia-cuda --offload-arch=sm_52,sm_60 -nogpuinc -Xopenmp-target=amdgcn-amd-amdhsa --offload-arch=gfx90a,gfx1030 -ccc-print-bindings -### /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=OPENMP /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
RUN: at line 29: /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -x cuda /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c --offload-arch=sm_52,sm_60 -Xarch_sm_52 -O3 -Xarch_sm_60 -O0    --target=x86_64-unknown-linux-gnu -Xarch_host -O3 -S -nogpulib -nogpuinc -### 2>&1  | /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=CUDA /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -x cuda /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c --offload-arch=sm_52,sm_60 -Xarch_sm_52 -O3 -Xarch_sm_60 -O0 --target=x86_64-unknown-linux-gnu -Xarch_host -O3 -S -nogpulib -nogpuinc -###
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=CUDA /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
RUN: at line 37: /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -fopenmp=libomp --offload-arch=gfx90a -nogpulib -nogpuinc    --target=x86_64-unknown-linux-gnu -Xarch_amdgcn -Wl,-lfoo -### /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c 2>&1  | /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=LIBS /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang -fopenmp=libomp --offload-arch=gfx90a -nogpulib -nogpuinc --target=x86_64-unknown-linux-gnu -Xarch_amdgcn -Wl,-lfoo -### /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
+ /Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/FileCheck -check-prefix=LIBS /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c
/Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c:43:10: error: LIBS: expected string not found in input
// LIBS: "--device-linker=amdgcn-amd-amdhsa=-lfoo"
         ^
<stdin>:1:1: note: scanning from here
clang version 21.0.0git (https://github.com/llvm/llvm-project.git 7c60725fcf1038f6c84df396496cf52d67ab5b43)
^
<stdin>:6:1365: note: possible intended match here
 "/Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/bin/clang-21" "-cc1" "-triple" "x86_64-unknown-linux-gnu" "-emit-llvm-bc" "-emit-llvm-uselists" "-dumpdir" "a-" "-disable-free" "-clear-ast-before-backend" "-main-file-name" "offload-Xarch.c" "-mrelocation-model" "pic" "-pic-level" "2" "-pic-is-pie" "-mframe-pointer=all" "-fmath-errno" "-ffp-contract=on" "-fno-rounding-math" "-mconstructor-aliases" "-funwind-tables=2" "-target-cpu" "x86-64" "-tune-cpu" "generic" "-debugger-tuning=gdb" "-fdebug-compilation-dir=/Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/tools/clang/test/Driver" "-target-linker-version" "1053.12" "-fcoverage-compilation-dir=/Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/tools/clang/test/Driver" "-resource-dir" "/Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/lib/clang/21" "-internal-isystem" "/Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/lib/clang/21/include" "-internal-isystem" "/usr/local/include" "-internal-externc-isystem" "/include" "-internal-externc-isystem" "/usr/include" "-internal-isystem" "/Volumes/RAMDisk/buildbot-root/x86_64-darwin/build/lib/clang/21/include" "-internal-isystem" "/usr/local/include" "-internal-externc-isystem" "/include" "-internal-externc-isystem" "/usr/include" "-ferror-limit" "19" "-fopenmp" "-nogpulib" "-fgnuc-version=4.2.1" "-fskip-odr-check-in-gmf" "-disable-llvm-passes" "-fopenmp-targets=amdgcn-amd-amdhsa" "-faddrsig" "-D__GCC_HAVE_DWARF2_CFI_ASM=1" "-o" "/var/folders/dh/qpq6gp912dd8pr2b150rqlyw0000gp/T/lit-tmp-ut0x2fyd/offload-Xarch-427fa9.bc" "-x" "c" "/Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c"
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ^

Input file: <stdin>
Check file: /Volumes/RAMDisk/buildbot-root/x86_64-darwin/llvm-project/clang/test/Driver/offload-Xarch.c

-dump-input=help explains the following input dump.

Input was:
<<<<<<
            1: clang version 21.0.0git (https://github.com/llvm/llvm-project.git 7c60725fcf1038f6c84df396496cf52d67ab5b43) 
check:43'0     X~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error: no match found
            2: Target: x86_64-unknown-linux-gnu 
check:43'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...