git-for-windows · rimrul · Dec 27, 2023
diff --git a/mingw-w64-clang/0002-Fix-Findzstd-on-MINGW.patch b/mingw-w64-clang/0002-Fix-Findzstd-on-MINGW.patch
@@ -1,6 +1,6 @@
 --- a/cmake/modules/Findzstd.cmake
 +++ b/cmake/modules/Findzstd.cmake
-@@ -29,11 +29,11 @@
+@@ -29,14 +29,14 @@
  )
 
  if(zstd_FOUND)
@@ -13,4 +13,8 @@
 +    if(WIN32)
        # IMPORTED_LOCATION is the path to the DLL and IMPORTED_IMPLIB is the "library".
        get_filename_component(zstd_DIRNAME "${zstd_LIBRARY}" DIRECTORY)
-       string(REGEX REPLACE "${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}")
+-      string(REGEX REPLACE "${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}")
++      string(REGEX REPLACE "\\${CMAKE_INSTALL_LIBDIR}$" "${CMAKE_INSTALL_BINDIR}" zstd_DIRNAME "${zstd_DIRNAME}")
+       get_filename_component(zstd_BASENAME "${zstd_LIBRARY}" NAME)
+       string(REGEX REPLACE "\\${CMAKE_LINK_LIBRARY_SUFFIX}$" "${CMAKE_SHARED_LIBRARY_SUFFIX}" zstd_BASENAME "${zstd_BASENAME}")
+       set_target_properties(zstd::libzstd_shared PROPERTIES
diff --git a/mingw-w64-clang/0005-aarch64-unwind-seh.patch b/mingw-w64-clang/0005-aarch64-unwind-seh.patch
diff --git a/mingw-w64-clang/10b78cc8cea65e7e77d227af4027963f39402724.patch b/mingw-w64-clang/10b78cc8cea65e7e77d227af4027963f39402724.patch
@@ -0,0 +1,59 @@
+From 10b78cc8cea65e7e77d227af4027963f39402724 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
+Date: Fri, 15 Dec 2023 20:15:07 +0200
+Subject: [PATCH] [llvm-windres] Pass user preprocessor arguments before the
+ input filename (#75389)
+
+If passing the windres option --preprocessor, the default arguments "-E
+-xc -DRC_INVOKED" aren't passed. If these are passed explicitly by the
+user via --preprocessor-arg instead, we need to make sure that "-xc" is
+passed before the input filename, as this compiler/preprocessor option
+only has an effect on input files that follow it.
+
+This fixes one of the issues with llvm-windres observed in
+https://github.com/msys2/MINGW-packages/pull/19157.
+---
+ llvm/test/tools/llvm-rc/preproc.test         | 2 +-
+ llvm/test/tools/llvm-rc/windres-preproc.test | 2 +-
+ llvm/tools/llvm-rc/llvm-rc.cpp               | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/llvm/test/tools/llvm-rc/preproc.test b/llvm/test/tools/llvm-rc/preproc.test
+index f55e5434dce360b..7a6d8b3db036623 100644
+--- a/llvm/test/tools/llvm-rc/preproc.test
++++ b/llvm/test/tools/llvm-rc/preproc.test
+@@ -1,3 +1,3 @@
+ ; RUN: llvm-rc -### -i%p "-DFOO1=\"foo bar\"" -UFOO2 -D FOO3 -- %p/Inputs/empty.rc | FileCheck %s
+
+-; CHECK: {{^}} "clang" "--driver-mode=gcc" "-target" "{{.*}}-pc-windows-msvc-coff" "-E" "-xc" "-DRC_INVOKED" "{{.*}}empty.rc" "-o" "{{.*}}preproc-{{.*}}.rc" "-I" "{{.*}}" "-D" "FOO1=\"foo bar\"" "-U" "FOO2" "-D" "FOO3"{{$}}
++; CHECK: {{^}} "clang" "--driver-mode=gcc" "-target" "{{.*}}-pc-windows-msvc-coff" "-E" "-xc" "-DRC_INVOKED" "-I" "{{.*}}" "-D" "FOO1=\"foo bar\"" "-U" "FOO2" "-D" "FOO3" "{{.*}}empty.rc" "-o" "{{.*}}preproc-{{.*}}.rc"{{$}}
+diff --git a/llvm/test/tools/llvm-rc/windres-preproc.test b/llvm/test/tools/llvm-rc/windres-preproc.test
+index e55195b3a4d2802..42e83ba13021c27 100644
+--- a/llvm/test/tools/llvm-rc/windres-preproc.test
++++ b/llvm/test/tools/llvm-rc/windres-preproc.test
+@@ -5,6 +5,6 @@
+
+ ; RUN: llvm-windres -### --include-dir %p/incdir1 --include %p/incdir2 "-DFOO1=\\\"foo bar\\\"" -UFOO2 -D FOO3 --preprocessor-arg "-DFOO4=\\\"baz baz\\\"" -DFOO5=\"bar\" %p/Inputs/empty.rc %t.res | FileCheck %s --check-prefix=CHECK1
+ ; RUN: llvm-windres -### --include-dir %p/incdir1 --include %p/incdir2 "-DFOO1=\"foo bar\"" -UFOO2 -D FOO3 --preprocessor-arg "-DFOO4=\"baz baz\"" "-DFOO5=bar" %p/Inputs/empty.rc %t.res --use-temp-file | FileCheck %s --check-prefix=CHECK1
+-; CHECK1: {{^}} "clang" "--driver-mode=gcc" "-target" "{{.*}}-{{.*}}{{mingw32|windows-gnu}}" "-E" "-xc" "-DRC_INVOKED" "{{.*}}empty.rc" "-o" "{{.*}}preproc-{{.*}}.rc" "-I" "{{.*}}incdir1" "-I" "{{.*}}incdir2" "-D" "FOO1=\"foo bar\"" "-U" "FOO2" "-D" "FOO3" "-DFOO4=\"baz baz\"" "-D" "FOO5=bar"{{$}}
++; CHECK1: {{^}} "clang" "--driver-mode=gcc" "-target" "{{.*}}-{{.*}}{{mingw32|windows-gnu}}" "-E" "-xc" "-DRC_INVOKED" "-I" "{{.*}}incdir1" "-I" "{{.*}}incdir2" "-D" "FOO1=\"foo bar\"" "-U" "FOO2" "-D" "FOO3" "-DFOO4=\"baz baz\"" "-D" "FOO5=bar" "{{.*}}empty.rc" "-o" "{{.*}}preproc-{{.*}}.rc"{{$}}
+ ; RUN: llvm-windres -### --preprocessor "i686-w64-mingw32-gcc -E -DFOO=\\\"foo\\ bar\\\"" %p/Inputs/empty.rc %t.res | FileCheck %s --check-prefix=CHECK2
+ ; CHECK2: {{^}} "i686-w64-mingw32-gcc" "-E" "-DFOO=\"foo bar\"" "{{.*}}empty.rc" "-o" "{{.*}}preproc-{{.*}}.rc"{{$}}
+diff --git a/llvm/tools/llvm-rc/llvm-rc.cpp b/llvm/tools/llvm-rc/llvm-rc.cpp
+index b955347f2a8646e..43756971fc9ba08 100644
+--- a/llvm/tools/llvm-rc/llvm-rc.cpp
++++ b/llvm/tools/llvm-rc/llvm-rc.cpp
+@@ -253,11 +253,11 @@ void preprocess(StringRef Src, StringRef Dst, const RcOptions &Opts,
+     for (const auto &S : Opts.PreprocessCmd)
+       Args.push_back(S);
+   }
++  for (const auto &S : Opts.PreprocessArgs)
++    Args.push_back(S);
+   Args.push_back(Src);
+   Args.push_back("-o");
+   Args.push_back(Dst);
+-  for (const auto &S : Opts.PreprocessArgs)
+-    Args.push_back(S);
+   if (Opts.PrintCmdAndExit || Opts.BeVerbose) {
+     for (const auto &A : Args) {
+       outs() << " ";
diff --git a/mingw-w64-clang/1709e8c656de69f6d823a3ae6773bf815e373909.patch b/mingw-w64-clang/1709e8c656de69f6d823a3ae6773bf815e373909.patch
@@ -0,0 +1,91 @@
+From 1709e8c656de69f6d823a3ae6773bf815e373909 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
+Date: Fri, 15 Dec 2023 20:16:19 +0200
+Subject: [PATCH] [llvm-windres] Resolve the --preprocessor executable in $PATH
+ (#75390)
+
+The llvm::sys::ExecuteAndWait function doesn't resolve the file to be
+executed from $PATH - i.e. it is similar to execv(), not execvp().
+
+Due to this, specifying a --preprocessor argument to llvm-windres only
+worked if it specified an absolute path to the preprocessor executable.
+This was observed as one of the issues in
+https://github.com/msys2/MINGW-packages/pull/19157.
+
+Before d2fa6b694c2052cef1ddd507f6569bc84e3bbe35, this usage of
+--preprocessor seemed to work, because the first argument of Args[] was
+ignored and llvm-windres just executed the autodetected clang executable
+regardless.
+
+Also improve the error messages printed if preprocessing failed. (If the
+preprocessor executable was started but itself returned an error, we
+don't get any error string.)
+---
+ llvm/test/tools/llvm-rc/windres-preproc.test | 16 +++++++++++++++-
+ llvm/tools/llvm-rc/llvm-rc.cpp               | 17 +++++++++++++++--
+ 2 files changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/llvm/test/tools/llvm-rc/windres-preproc.test b/llvm/test/tools/llvm-rc/windres-preproc.test
+index 42e83ba13021c2..74e888614aa2b9 100644
+--- a/llvm/test/tools/llvm-rc/windres-preproc.test
++++ b/llvm/test/tools/llvm-rc/windres-preproc.test
+@@ -7,4 +7,18 @@
+ ; RUN: llvm-windres -### --include-dir %p/incdir1 --include %p/incdir2 "-DFOO1=\"foo bar\"" -UFOO2 -D FOO3 --preprocessor-arg "-DFOO4=\"baz baz\"" "-DFOO5=bar" %p/Inputs/empty.rc %t.res --use-temp-file | FileCheck %s --check-prefix=CHECK1
+ ; CHECK1: {{^}} "clang" "--driver-mode=gcc" "-target" "{{.*}}-{{.*}}{{mingw32|windows-gnu}}" "-E" "-xc" "-DRC_INVOKED" "-I" "{{.*}}incdir1" "-I" "{{.*}}incdir2" "-D" "FOO1=\"foo bar\"" "-U" "FOO2" "-D" "FOO3" "-DFOO4=\"baz baz\"" "-D" "FOO5=bar" "{{.*}}empty.rc" "-o" "{{.*}}preproc-{{.*}}.rc"{{$}}
+ ; RUN: llvm-windres -### --preprocessor "i686-w64-mingw32-gcc -E -DFOO=\\\"foo\\ bar\\\"" %p/Inputs/empty.rc %t.res | FileCheck %s --check-prefix=CHECK2
+-; CHECK2: {{^}} "i686-w64-mingw32-gcc" "-E" "-DFOO=\"foo bar\"" "{{.*}}empty.rc" "-o" "{{.*}}preproc-{{.*}}.rc"{{$}}
++; CHECK2: {{^}} "{{.*}}i686-w64-mingw32-gcc" "-E" "-DFOO=\"foo bar\"" "{{.*}}empty.rc" "-o" "{{.*}}preproc-{{.*}}.rc"{{$}}
++
++;; Test resolving the --preprocessor executable from PATH
++
++; RUN: rm -rf %t-bin/testbin
++; RUN: mkdir -p %t-bin/testbin
++; RUN: ln -s llvm-windres %t-bin/testbin/i686-w64-mingw32-gcc
++; RUN: env PATH=%t-bin/testbin llvm-windres -### --preprocessor i686-w64-mingw32-gcc --preprocessor-arg -E --preprocessor-arg -xc -DRC_INVOKED %p/Inputs/empty.rc %t.res | FileCheck %s --check-prefix=CHECK3
++; CHECK3: {{^}} "{{.*}}/testbin/i686-w64-mingw32-gcc" "-E" "-xc" "-D" "RC_INVOKED" "{{.*}}empty.rc" "-o" "{{.*}}preproc-{{.*}}.rc"{{$}}
++
++
++;; Test error messages when unable to execute the preprocessor.
++
++; RUN: not llvm-windres --preprocessor intentionally-missing-executable %p/Inputs/empty.rc %t.res 2>&1 | FileCheck %s --check-prefix=CHECK4
++; CHECK4: llvm-rc: Preprocessing failed: Executable "intentionally-missing-executable" doesn't exist!
+diff --git a/llvm/tools/llvm-rc/llvm-rc.cpp b/llvm/tools/llvm-rc/llvm-rc.cpp
+index 43756971fc9ba0..27fb0309e0ee54 100644
+--- a/llvm/tools/llvm-rc/llvm-rc.cpp
++++ b/llvm/tools/llvm-rc/llvm-rc.cpp
+@@ -248,10 +248,17 @@ void preprocess(StringRef Src, StringRef Dst, const RcOptions &Opts,
+   SmallVector<StringRef, 8> Args = {
+       Clang, "--driver-mode=gcc", "-target", Opts.Triple, "-E",
+       "-xc", "-DRC_INVOKED"};
++  std::string PreprocessorExecutable;
+   if (!Opts.PreprocessCmd.empty()) {
+     Args.clear();
+     for (const auto &S : Opts.PreprocessCmd)
+       Args.push_back(S);
++    if (!sys::fs::can_execute(Args[0])) {
++      if (auto P = sys::findProgramByName(Args[0])) {
++        PreprocessorExecutable = *P;
++        Args[0] = PreprocessorExecutable;
++      }
++    }
+   }
+   for (const auto &S : Opts.PreprocessArgs)
+     Args.push_back(S);
+@@ -269,9 +276,15 @@ void preprocess(StringRef Src, StringRef Dst, const RcOptions &Opts,
+   }
+   // The llvm Support classes don't handle reading from stdout of a child
+   // process; otherwise we could avoid using a temp file.
+-  int Res = sys::ExecuteAndWait(Args[0], Args);
++  std::string ErrMsg;
++  int Res =
++      sys::ExecuteAndWait(Args[0], Args, /*Env=*/std::nullopt, /*Redirects=*/{},
++                          /*SecondsToWait=*/0, /*MemoryLimit=*/0, &ErrMsg);
+   if (Res) {
+-    fatalError("llvm-rc: Preprocessing failed.");
++    if (!ErrMsg.empty())
++      fatalError("llvm-rc: Preprocessing failed: " + ErrMsg);
++    else
++      fatalError("llvm-rc: Preprocessing failed.");
+   }
+ }
+