Skip to content

Commit 1b46cb0

Browse files
authored
Merge pull request msys2#11087 from MehdiChinoune/llvm-14-update
clang: update to 14.0.0
2 parents 2ed2bd3 + 4de3e55 commit 1b46cb0

14 files changed

Lines changed: 164 additions & 701 deletions

mingw-w64-clang/0001-Use-posix-style-path-separators-with-MinGW.patch

Lines changed: 0 additions & 88 deletions
This file was deleted.

mingw-w64-clang/0002-Fix-GetHostTriple-for-mingw-w64-in-msys.patch

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,14 @@ diff --git a/cmake/modules/GetHostTriple.cmake b/cmake/modules/GetHostTriple.cma
1111
index 0cad1db4eff..47e9f986e15 100644
1212
--- a/cmake/modules/GetHostTriple.cmake
1313
+++ b/cmake/modules/GetHostTriple.cmake
14-
@@ -8,11 +8,11 @@
14+
@@ -16,7 +16,7 @@
1515
else()
1616
set( value "i686-pc-windows-msvc" )
1717
endif()
1818
- elseif( MINGW AND NOT MSYS )
1919
+ elseif( MINGW )
20-
if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
21-
set( value "x86_64-w64-windows-gnu" )
22-
else()
23-
- set( value "i686-pc-windows-gnu" )
24-
+ set( value "i686-w64-windows-gnu" )
25-
endif()
26-
elseif( CMAKE_SYSTEM_NAME MATCHES "OS390" )
27-
set( value "s390x-ibm-zos" )
20+
# CMake doesn't provide COMPILER_ARCHITECTURE_ID for Clang/GCC,
21+
# but it does for MSVC.
22+
if( CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "ARM.*" )
2823
2.13.3
2924

mingw-w64-clang/0003-CMake-try-creating-symlink-first-on-windows.patch

Lines changed: 0 additions & 46 deletions
This file was deleted.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
--- a/cmake/modules/LLVMInstallSymlink.cmake
2+
+++ b/cmake/modules/LLVMInstallSymlink.cmake
3+
@@ -6,17 +6,18 @@
4+
5+
function(install_symlink name target outdir)
6+
set(DESTDIR $ENV{DESTDIR})
7+
+ if(CMAKE_HOST_UNIX)
8+
+ set(LINK_OR_COPY create_symlink)
9+
+ else()
10+
+ set(LINK_OR_COPY copy)
11+
+ endif()
12+
+
13+
set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}")
14+
15+
message(STATUS "Creating ${name}")
16+
17+
execute_process(
18+
- COMMAND "${CMAKE_COMMAND}" -E create_symlink "${target}" "${name}"
19+
- WORKING_DIRECTORY "${bindir}" ERROR_VARIABLE has_err)
20+
- if(CMAKE_HOST_WIN32 AND has_err)
21+
- execute_process(
22+
- COMMAND "${CMAKE_COMMAND}" -E copy "${target}" "${name}"
23+
- WORKING_DIRECTORY "${bindir}")
24+
- endif()
25+
+ COMMAND "${CMAKE_COMMAND}" -E ${LINK_OR_COPY} "${target}" "${name}"
26+
+ WORKING_DIRECTORY "${bindir}")
27+
28+
endfunction()

mingw-w64-clang/0010-COFF-Move-section-name-encoding-into-BinaryFormat.patch

Lines changed: 0 additions & 178 deletions
This file was deleted.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- a/include/llvm/Config/config.h.cmake
2+
+++ b/include/llvm/Config/config.h.cmake
3+
@@ -50,9 +50,6 @@
4+
don't. */
5+
#cmakedefine01 HAVE_DECL_STRERROR_S
6+
7+
-/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */
8+
-#cmakedefine01 LLVM_ENABLE_DIA_SDK
9+
-
10+
/* Define to 1 if you have the <dlfcn.h> header file. */
11+
#cmakedefine HAVE_DLFCN_H ${HAVE_DLFCN_H}
12+
13+
--- a/include/llvm/Config/llvm-config.h.cmake
14+
+++ b/include/llvm/Config/llvm-config.h.cmake
15+
@@ -116,4 +116,7 @@
16+
* in non assert builds */
17+
#cmakedefine01 LLVM_UNREACHABLE_OPTIMIZE
18+
19+
+/* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */
20+
+#cmakedefine01 LLVM_ENABLE_DIA_SDK
21+
+
22+
#endif

0 commit comments

Comments
 (0)