Adding upstream version 115.7.0esr.upstream/115.7.0esr

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 78 insertions, 0 deletions

diff --git a/build/build-clang/revert-llvmorg-14-init-14141-gd6d3000a2f6d.patch b/build/build-clang/revert-llvmorg-14-init-14141-gd6d3000a2f6d.patch
new file mode 100644
index 0000000000..5a8fb5e701
--- /dev/null
+++ b/build/build-clang/revert-llvmorg-14-init-14141-gd6d3000a2f6d.patch
@@ -0,0 +1,78 @@
+From e602ffe1785cef7f5502223e81345e6b9395fae1 Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh@glandium.org>
+Date: Fri, 11 Mar 2022 10:38:51 +0900
+Subject: [PATCH] Revert "[CMake][WinMsvc] Fix user passed compiler/linker
+ flags"
+
+This reverts commit d6d3000a2f6d88ac73e5d4da4005ceadec788a9a
+because of bustage building 32-bits compiler-rt for Windows.
+See https://reviews.llvm.org/D116709#3374131
+---
+ llvm/cmake/platforms/WinMsvc.cmake | 30 ++++++++++++++++++++++--------
+ 1 file changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/llvm/cmake/platforms/WinMsvc.cmake b/llvm/cmake/platforms/WinMsvc.cmake
+index d30701a31858..9a5078894182 100644
+--- a/llvm/cmake/platforms/WinMsvc.cmake
++++ b/llvm/cmake/platforms/WinMsvc.cmake
+@@ -84,7 +84,6 @@
+ # up a VFS overlay for the SDK headers and case-correcting symlinks for the
+ # libraries when running on a case-sensitive filesystem.
+ 
+-include_guard(GLOBAL)
+ 
+ # When configuring CMake with a toolchain file against a top-level CMakeLists.txt,
+ # it will actually run CMake many times, once for each small test program used to
+@@ -252,8 +251,6 @@ list(APPEND _CTF_NATIVE_DEFAULT "-DCMAKE_ASM_COMPILER=${LLVM_NATIVE_TOOLCHAIN}/b
+ list(APPEND _CTF_NATIVE_DEFAULT "-DCMAKE_C_COMPILER=${LLVM_NATIVE_TOOLCHAIN}/bin/clang")
+ list(APPEND _CTF_NATIVE_DEFAULT "-DCMAKE_CXX_COMPILER=${LLVM_NATIVE_TOOLCHAIN}/bin/clang++")
+ 
+-# These flags are used during build time. So if CFLAGS/CXXFLAGS/LDFLAGS is set
+-# for the target, makes sure these are unset during build time.
+ set(CROSS_TOOLCHAIN_FLAGS_NATIVE "${_CTF_NATIVE_DEFAULT}" CACHE STRING "")
+ 
+ set(COMPILE_FLAGS
+@@ -280,8 +277,18 @@ if(case_sensitive_filesystem)
+ endif()
+ 
+ string(REPLACE ";" " " COMPILE_FLAGS "${COMPILE_FLAGS}")
+-string(APPEND CMAKE_C_FLAGS_INIT " ${COMPILE_FLAGS}")
+-string(APPEND CMAKE_CXX_FLAGS_INIT " ${COMPILE_FLAGS}")
++
++# We need to preserve any flags that were passed in by the user. However, we
++# can't append to CMAKE_C_FLAGS and friends directly, because toolchain files
++# will be re-invoked on each reconfigure and therefore need to be idempotent.
++# The assignments to the _INITIAL cache variables don't use FORCE, so they'll
++# only be populated on the initial configure, and their values won't change
++# afterward.
++set(_CMAKE_C_FLAGS_INITIAL "${CMAKE_C_FLAGS}" CACHE STRING "")
++set(CMAKE_C_FLAGS "${_CMAKE_C_FLAGS_INITIAL} ${COMPILE_FLAGS}" CACHE STRING "" FORCE)
++
++set(_CMAKE_CXX_FLAGS_INITIAL "${CMAKE_CXX_FLAGS}" CACHE STRING "")
++set(CMAKE_CXX_FLAGS "${_CMAKE_CXX_FLAGS_INITIAL} ${COMPILE_FLAGS}" CACHE STRING "" FORCE)
+ 
+ set(LINK_FLAGS
+     # Prevent CMake from attempting to invoke mt.exe. It only recognizes the slashed form and not the dashed form.
+@@ -305,9 +312,16 @@ if(case_sensitive_filesystem)
+ endif()
+ 
+ string(REPLACE ";" " " LINK_FLAGS "${LINK_FLAGS}")
+-string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " ${LINK_FLAGS}")
+-string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " ${LINK_FLAGS}")
+-string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " ${LINK_FLAGS}")
++
++# See explanation for compiler flags above for the _INITIAL variables.
++set(_CMAKE_EXE_LINKER_FLAGS_INITIAL "${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "")
++set(CMAKE_EXE_LINKER_FLAGS "${_CMAKE_EXE_LINKER_FLAGS_INITIAL} ${LINK_FLAGS}" CACHE STRING "" FORCE)
++
++set(_CMAKE_MODULE_LINKER_FLAGS_INITIAL "${CMAKE_MODULE_LINKER_FLAGS}" CACHE STRING "")
++set(CMAKE_MODULE_LINKER_FLAGS "${_CMAKE_MODULE_LINKER_FLAGS_INITIAL} ${LINK_FLAGS}" CACHE STRING "" FORCE)
++
++set(_CMAKE_SHARED_LINKER_FLAGS_INITIAL "${CMAKE_SHARED_LINKER_FLAGS}" CACHE STRING "")
++set(CMAKE_SHARED_LINKER_FLAGS "${_CMAKE_SHARED_LINKER_FLAGS_INITIAL} ${LINK_FLAGS}" CACHE STRING "" FORCE)
+ 
+ # CMake populates these with a bunch of unnecessary libraries, which requires
+ # extra case-correcting symlinks and what not. Instead, let projects explicitly
+-- 
+2.35.0.1.g829a698654
+