Skip to content

Commit 0680efc

Browse files
authored
Merge pull request #115 from rimrul/mingw-w64-clang-18.1.2
clang: update to 18.1.6
2 parents 7930f56 + 062f600 commit 0680efc

12 files changed

+157
-200
lines changed

mingw-w64-clang/0002-Fix-Findzstd-on-MINGW.patch

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

mingw-w64-clang/0005-aarch64-unwind-seh.patch

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

mingw-w64-clang/0001-Fix-GetHostTriple-for-mingw-w64-in-msys.patch renamed to mingw-w64-llvm/0001-Fix-GetHostTriple-for-mingw-w64-in-msys.patch

File renamed without changes.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
--- a/cmake/modules/Findzstd.cmake
2+
+++ b/cmake/modules/Findzstd.cmake
3+
@@ -16,6 +16,8 @@
4+
set(zstd_STATIC_LIBRARY_SUFFIX "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$")
5+
endif()
6+
7+
+find_package(zstd CONFIG QUIET)
8+
+if(NOT zstd_FOUND)
9+
find_path(zstd_INCLUDE_DIR NAMES zstd.h)
10+
find_library(zstd_LIBRARY NAMES zstd zstd_static)
11+
find_library(zstd_STATIC_LIBRARY NAMES
12+
@@ -27,16 +29,17 @@
13+
zstd DEFAULT_MSG
14+
zstd_LIBRARY zstd_INCLUDE_DIR
15+
)
16+
+endif()
17+
18+
if(zstd_FOUND)
19+
- if(zstd_LIBRARY MATCHES "${zstd_STATIC_LIBRARY_SUFFIX}$")
20+
+ if(zstd_LIBRARY MATCHES "${zstd_STATIC_LIBRARY_SUFFIX}$" AND NOT MINGW)
21+
set(zstd_STATIC_LIBRARY "${zstd_LIBRARY}")
22+
elseif (NOT TARGET zstd::libzstd_shared)
23+
add_library(zstd::libzstd_shared SHARED IMPORTED)
24+
- if(MSVC)
25+
+ if(WIN32)
26+
# IMPORTED_LOCATION is the path to the DLL and IMPORTED_IMPLIB is the "library".
27+
get_filename_component(zstd_DIRNAME "${zstd_LIBRARY}" DIRECTORY)
28+
- string(REGEX REPLACE "${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}")
29+
+ string(REGEX REPLACE "\\${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}")
30+
get_filename_component(zstd_BASENAME "${zstd_LIBRARY}" NAME)
31+
string(REGEX REPLACE "\\${CMAKE_LINK_LIBRARY_SUFFIX}$" "${CMAKE_SHARED_LIBRARY_SUFFIX}" zstd_BASENAME "${zstd_BASENAME}")
32+
set_target_properties(zstd::libzstd_shared PROPERTIES

mingw-w64-clang/0003-add-pthread-as-system-lib-for-mingw.patch renamed to mingw-w64-llvm/0003-add-pthread-as-system-lib-for-mingw.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt
1111
index 0a8e3897cce..de9cda5dda3 100644
1212
--- a/lib/Support/CMakeLists.txt
1313
+++ b/lib/Support/CMakeLists.txt
14-
@@ -6,6 +6,9 @@ set(system_libs)
14+
@@ -41,6 +41,9 @@ set(system_libs)
1515
# libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc.
1616
# advapi32 required for CryptAcquireContextW in lib/Support/Windows/Path.inc.
17-
set(system_libs ${system_libs} psapi shell32 ole32 uuid advapi32)
17+
set(system_libs ${system_libs} psapi shell32 ole32 uuid advapi32 ws2_32)
1818
+ if( MINGW )
1919
+ set(system_libs ${system_libs} pthread)
2020
+ endif()
File renamed without changes.
File renamed without changes.

mingw-w64-clang/0102-Rename-flang-new-flang-experimental-exec-to-flang.patch renamed to mingw-w64-llvm/0102-Rename-flang-new-flang-experimental-exec-to-flang.patch

File renamed without changes.

mingw-w64-clang/0303-ignore-new-bfd-options.patch renamed to mingw-w64-llvm/0303-ignore-new-bfd-options.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
--- a/MinGW/Options.td
22
+++ b/MinGW/Options.td
3-
@@ -165,6 +165,8 @@ def alias_undefined_u: JoinedOrSeparate<["-"], "u">, Alias<undefined>;
3+
@@ -223,6 +223,8 @@ def alias_undefined_u: JoinedOrSeparate<["-"], "u">, Alias<undefined>;
4+
// Ignored options
45
def: Joined<["-"], "O">;
56
def: F<"as-needed">;
6-
def: F<"build-id">;
77
+def: F<"default-image-base-high">;
88
+def: F<"default-image-base-low">;
99
def: F<"disable-auto-image-base">;

0 commit comments

Comments
 (0)