parent
e7230472d9
commit
abecedd736
GPG Key ID:
1EC08A25C9DB2503
@ -1,44 +1,35 @@
|
||||
6863d946ee58b4b461aeffa29be9ea9d88dc7cbe SOURCES/swift-format.zip
|
||||
1bac0a81f60cfe052c5581ac9686f07cf1b80d0e SOURCES/corelibs-foundation.tar.gz
|
||||
de44919bb1c585ff2a7e3f8cd76412f58a4f2f87 SOURCES/swift-argument-parser.tar.gz
|
||||
63f25f19e42916ed4e6cba0ace7a9b5ce0f36340 SOURCES/swift-tools-support-core.tar.gz
|
||||
c8eb1ca2a24b7d009c16f00e445d823c84563b36 SOURCES/swift-certificates.tar.gz
|
||||
a98e74d4a1549431f69bdaadd2c00c7b63a35496 SOURCES/swift-foundation-icu.zip
|
||||
fa5e159f8a475d12c062179346bbbc5f1594d875 SOURCES/cmark.tar.gz
|
||||
7eaae0a62561c638d2e7da2526d88be4b72f2ed2 SOURCES/corelibs-foundation.tar.gz
|
||||
8bc934d80ecbd17949799f2ab44167852521374b SOURCES/swift-argument-parser.tar.gz
|
||||
1013e557f5dcda3e7cc8584f64892d3d092760bc SOURCES/swift-tools-support-core.tar.gz
|
||||
fcc10cdd3d4899b6e2750cf5a2eed80b5cc358d3 SOURCES/cmark.tar.gz
|
||||
a3e1626cad4c16dfeeb7858eecf9695881a2bfb1 SOURCES/swift-nio-ssl.tar.gz
|
||||
42f0fc014f8f5f74aa34df5b10435219764470da SOURCES/swift-system.tar.gz
|
||||
c8e8f166d8a796f68a9c86d27c9638cceb488735 SOURCES/swift-system.tar.gz
|
||||
938723cdfc7a6f7c8f84c83b9a2cecdf1e5e1ad3 SOURCES/ninja.tar.gz
|
||||
41d35cce01be048b5cd395154c57cf365e334216 SOURCES/swift-collections.tar.gz
|
||||
3843d1306e02ee8b33315cc32478a94b17e9e881 SOURCES/zlib13.zip
|
||||
aa1b3452bef5235fa745fc2ee0e07cac2464ec96 SOURCES/swift-integration-tests.tar.gz
|
||||
161869d6346bac79495fe3532978236557c832c0 SOURCES/llvm-project.tar.gz
|
||||
79ef3b1e65cd467ec27353ecfff91aeae2cfbfe8 SOURCES/corelibs-libdispatch.tar.gz
|
||||
ea8cbb4d371fe2a0f6609a6d63f1a742780cba24 SOURCES/swift-testing.tar.gz
|
||||
c345d6ae9692ec2b506040fce742918126ecf534 SOURCES/swift-llvm-bindings.zip
|
||||
53337a463a0ca37973e9b6ca154539332d54ecc1 SOURCES/swift-asn1.tar.gz
|
||||
cc52e147d3557947f3938d07227c9bc32a36ba18 SOURCES/swift-xcode-playground-support.tar.gz
|
||||
e20b12f480914fe05976605800fa78bd20f2f9d1 SOURCES/swift-docc-render-artifact.tar.gz
|
||||
f766142416071abf75605203c77d417abc499472 SOURCES/swift-stress-tester.tar.gz
|
||||
05f0246c247515b4de78603a0b784bab864c108c SOURCES/icu.zip
|
||||
d8817dd867e82734f7ed5517899b4f794c951745 SOURCES/cmake.tar.gz
|
||||
8678e3510c88ef1de4d8c2940fa8ddad8f4eb084 SOURCES/wasi-sdk.tar.gz
|
||||
8ee33f463d74d7d270751cbfc64a260496589883 SOURCES/swift-experimental-string-processing.tar.gz
|
||||
6798485353a95b920e1c7b10a43a199afc56e12f SOURCES/swift-markdown.tar.gz
|
||||
2c5998cea26f8f4cfa0d391320302117a853ad56 SOURCES/swift-collections.tar.gz
|
||||
f74089ccfbda40de91f2a3ce489f6dc7f9eb711e SOURCES/swift-integration-tests.tar.gz
|
||||
3dc8cf6b3a090a17842025ecd8ff3737f0265e9c SOURCES/llvm-project.tar.gz
|
||||
d155767a4caaa79bb841e481819bc706a6cdf868 SOURCES/corelibs-libdispatch.tar.gz
|
||||
34a0cbd269c439ba5a6a8845e41e884849b82361 SOURCES/icu.tar.gz
|
||||
baba316bf2f40a5ba6549939468ee5ff9d6b4150 SOURCES/swift-xcode-playground-support.tar.gz
|
||||
0f97bf2725c19157c16c9c07ed0896a612a821c1 SOURCES/swift-docc-render-artifact.tar.gz
|
||||
66f623787c2ad7ec89a5f467b78094707deb21d7 SOURCES/swift-stress-tester.tar.gz
|
||||
fa00fdaa53b2e4aaaba0f2401bcaa59a3d759ba5 SOURCES/cmake.tar.gz
|
||||
e5258176f7202dc7bd334a561adc6374aa2ab41c SOURCES/swift-experimental-string-processing.tar.gz
|
||||
80f08568ba67e8255c7763971f125ef640865de3 SOURCES/swift-markdown.tar.gz
|
||||
ff3109e3a813275eccc6b01b64ddb371514704c9 SOURCES/swift-nio.tar.gz
|
||||
d9dde98ca27203370068ea7b88980e35f072a466 SOURCES/swift.tar.gz
|
||||
29f8767a7829327b11a553ae46667068fd36fa9e SOURCES/yams.tar.gz
|
||||
b94a5aa675847d77f4505b9dd6bc36d8ef77238b SOURCES/swift-docc.tar.gz
|
||||
ed438a2c2a7181dbac45eb803485b1db86249686 SOURCES/corelibs-xctest.tar.gz
|
||||
572b7eff938d207a280eb350e20dfda8313e48ac SOURCES/swift-syntax.tar.gz
|
||||
75db4619bca88faf3e1a990a3d775f06ec85e61a SOURCES/indexstore-db.tar.gz
|
||||
a9a38ae51bc399c2234186f1518967806afeb774 SOURCES/swift-driver.tar.gz
|
||||
16e33542ea6f469a23d89520295a6bfaa8b85597 SOURCES/swift-numerics.tar.gz
|
||||
b41e721e20e4b06ef8c369e41404de9b348c36fc SOURCES/swift-crypto.tar.gz
|
||||
3c501918cfcebe96e2b1f13b6c2a6069c62d9839 SOURCES/swift-docc-symbolkit.tar.gz
|
||||
6b11f795023f544d2879c5e0c95bdda0e99f3c61 SOURCES/swift-atomics.tar.gz
|
||||
6d0d5912f15c8121d8fbff5fb6eadd374f7cb9e8 SOURCES/swift-foundation.zip
|
||||
2d414e9304207ce995ba7a97b93a0f9927ec2365 SOURCES/sourcekit-lsp.tar.gz
|
||||
80cde70dea69623c4d59c8791fd30aabb600f1af SOURCES/llbuild.tar.gz
|
||||
34e35e2b41e5ffe7fdd73adcad2d1e389d6fb9bb SOURCES/wasm.tar.gz
|
||||
3e308306eec5c70d372542ff2252bd5c295c3b89 SOURCES/package-manager.tar.gz
|
||||
938f9247a63981648453cfd0801f89bdfa0c05b2 SOURCES/swift-lmdb.tar.gz
|
||||
04f5fac3c4b9a671ecd0117e638faba7dcd8711e SOURCES/swift.tar.gz
|
||||
790ea44f909a42735ec5ccfdb2bf82f611b5496a SOURCES/yams.tar.gz
|
||||
2775c2609392446241c9479e20189bba8bd21881 SOURCES/swift-docc.tar.gz
|
||||
84b09051abaec6b120e379544e9c4c5aa92f3048 SOURCES/corelibs-xctest.tar.gz
|
||||
2c8ce5eb1e0a0c083254b9867cd118dc5fd43d3e SOURCES/swift-syntax.tar.gz
|
||||
c8da0ed80080cbf44f0d50ceb7b1af4ad27015d4 SOURCES/swift-format.tar.gz
|
||||
e1b52820f0f87c88e0696eaf886f25ffd520d740 SOURCES/indexstore-db.tar.gz
|
||||
6e944f9b0585881d3f9d41823bc4707733e82c0a SOURCES/swift-driver.tar.gz
|
||||
f3e2473e35025d99f885a1d72aff8527aaa4c3bf SOURCES/swift-numerics.tar.gz
|
||||
e4fd467b67de218a02928a9b187ee705c1c81238 SOURCES/swift-crypto.tar.gz
|
||||
0d6a4008a55701ab303aa7fc94d83186696a803b SOURCES/swift-docc-symbolkit.tar.gz
|
||||
5903a7bcd420e1fa5a60b68e98dd7635d36683ec SOURCES/swift-atomics.tar.gz
|
||||
89739d019053eb4d0ab46f94922b3a36c8424661 SOURCES/sourcekit-lsp.tar.gz
|
||||
20ff30878e1da8c80c52256bc220ec615d5f824c SOURCES/llbuild.tar.gz
|
||||
50554e95742746a39aad8a147e262991ecf9dd6a SOURCES/package-manager.tar.gz
|
||||
c36a2b249f102606a62b4bd6401e799331235cbe SOURCES/swift-lmdb.tar.gz
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
diff --color -Naur llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
|
||||
--- llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp 2024-06-21 17:13:30.216450095 -0500
|
||||
+++ llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp 2024-06-21 17:17:12.418191122 -0500
|
||||
@@ -76,7 +76,7 @@
|
||||
#elif PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 7
|
||||
return _Py_Finalizing != nullptr;
|
||||
#else
|
||||
- return _Py_IsFinalizing();
|
||||
+ return Py_IsFinalizing();
|
||||
#endif
|
||||
}
|
||||
|
||||
diff --color -Naur llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
||||
--- llvm-project-orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp 2024-06-21 17:13:30.217450161 -0500
|
||||
+++ llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp 2024-06-21 17:18:29.299291469 -0500
|
||||
@@ -201,16 +201,6 @@
|
||||
return;
|
||||
#endif
|
||||
|
||||
- if (PyEval_ThreadsInitialized()) {
|
||||
- Log *log = GetLog(LLDBLog::Script);
|
||||
-
|
||||
- m_was_already_initialized = true;
|
||||
- m_gil_state = PyGILState_Ensure();
|
||||
- LLDB_LOGV(log, "Ensured PyGILState. Previous state = {0}locked\n",
|
||||
- m_gil_state == PyGILState_UNLOCKED ? "un" : "");
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
// InitThreads acquires the GIL if it hasn't been called before.
|
||||
PyEval_InitThreads();
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
--- swift/utils/build-presets.ini.orig 2024-12-18 16:04:59.478543323 -0600
|
||||
+++ swift/utils/build-presets.ini 2024-12-18 16:07:08.704085878 -0600
|
||||
@@ -857,7 +857,7 @@
|
||||
mixin_linux_installation
|
||||
build-subdir=buildbot_linux
|
||||
lldb
|
||||
-release
|
||||
+debug
|
||||
test
|
||||
validation-test
|
||||
long-test
|
||||
@ -0,0 +1,39 @@
|
||||
diff --color -Naur swift-corelibs-libdispatch-orig/src/apply.c swift-corelibs-libdispatch/src/apply.c
|
||||
--- swift-corelibs-libdispatch-orig/src/apply.c 2022-10-01 10:48:05.000000000 -0500
|
||||
+++ swift-corelibs-libdispatch/src/apply.c 2024-12-17 14:56:01.110477562 -0600
|
||||
@@ -20,6 +20,9 @@
|
||||
|
||||
#include "internal.h"
|
||||
|
||||
+#pragma GCC diagnostic push
|
||||
+#pragma GCC diagnostic ignored "-Wcast-function-type-mismatch"
|
||||
+
|
||||
typedef void (*dispatch_apply_function_t)(void *, size_t);
|
||||
static char const * const _dispatch_apply_key = "apply";
|
||||
|
||||
@@ -366,3 +369,6 @@
|
||||
(dispatch_apply_function_t)_dispatch_Block_invoke(work));
|
||||
}
|
||||
#endif
|
||||
+
|
||||
+#pragma GCC diagnostic pop
|
||||
+
|
||||
diff --color -Naur swift-corelibs-libdispatch-orig/src/data.c swift-corelibs-libdispatch/src/data.c
|
||||
--- swift-corelibs-libdispatch-orig/src/data.c 2022-10-01 10:48:05.000000000 -0500
|
||||
+++ swift-corelibs-libdispatch/src/data.c 2024-12-17 14:57:39.514903781 -0600
|
||||
@@ -20,6 +20,9 @@
|
||||
|
||||
#include "internal.h"
|
||||
|
||||
+#pragma GCC diagnostic push
|
||||
+#pragma GCC diagnostic ignored "-Wcast-function-type-mismatch"
|
||||
+
|
||||
/*
|
||||
* Dispatch data objects are dispatch objects with standard retain/release
|
||||
* memory management. A dispatch data object either points to a number of other
|
||||
@@ -738,3 +741,5 @@
|
||||
return mep;
|
||||
}
|
||||
#endif // HAVE_MACH
|
||||
+
|
||||
+#pragma GCC diagnostic pop
|
||||
@ -1,11 +0,0 @@
|
||||
--- swift/utils/build-script-impl.orig 2024-06-25 09:36:26.767949217 -0500
|
||||
+++ swift/utils/build-script-impl 2024-06-25 09:36:46.207322186 -0500
|
||||
@@ -2243,7 +2243,7 @@
|
||||
-DLLDB_ENABLE_CURSES=ON
|
||||
-DLLDB_ENABLE_LIBEDIT=ON
|
||||
-DLLDB_ENABLE_PYTHON=ON
|
||||
- -DLLDB_ENABLE_LZMA=OFF
|
||||
+ -DLLDB_ENABLE_LZMA=ON
|
||||
-DLLDB_ENABLE_LUA=OFF
|
||||
-DLLDB_INCLUDE_TESTS:BOOL="${should_configure_tests}"
|
||||
-DLLDB_TEST_LIBCXX_ROOT_DIR:STRING="${libcxx_build_dir}"
|
||||
@ -0,0 +1,11 @@
|
||||
--- swift/utils/build-script-impl.orig 2022-04-12 11:12:59.832022240 -0500
|
||||
+++ swift/utils/build-script-impl 2022-04-12 11:13:19.694223857 -0500
|
||||
@@ -2272,7 +2272,7 @@
|
||||
-DLLDB_ENABLE_CURSES=ON
|
||||
-DLLDB_ENABLE_LIBEDIT=ON
|
||||
-DLLDB_ENABLE_PYTHON=ON
|
||||
- -DLLDB_ENABLE_LZMA=OFF
|
||||
+ -DLLDB_ENABLE_LZMA=ON
|
||||
-DLLDB_ENABLE_LUA=OFF
|
||||
-DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY})
|
||||
-DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}"
|
||||
@ -0,0 +1,40 @@
|
||||
--- swift-tools-support-core/Sources/TSCBasic/FileSystem.swift.orig 2024-06-07 15:57:58.282574272 -0500
|
||||
+++ swift-tools-support-core/Sources/TSCBasic/FileSystem.swift 2024-06-07 16:00:41.442339293 -0500
|
||||
@@ -425,19 +425,19 @@
|
||||
if fp == nil {
|
||||
throw FileSystemError(errno: errno, path)
|
||||
}
|
||||
- defer { fclose(fp) }
|
||||
+ defer { fclose(fp!) }
|
||||
|
||||
// Read the data one block at a time.
|
||||
let data = BufferedOutputByteStream()
|
||||
var tmpBuffer = [UInt8](repeating: 0, count: 1 << 12)
|
||||
while true {
|
||||
- let n = fread(&tmpBuffer, 1, tmpBuffer.count, fp)
|
||||
+ let n = fread(&tmpBuffer, 1, tmpBuffer.count, fp!)
|
||||
if n < 0 {
|
||||
if errno == EINTR { continue }
|
||||
throw FileSystemError(.ioError(code: errno), path)
|
||||
}
|
||||
if n == 0 {
|
||||
- let errno = ferror(fp)
|
||||
+ let errno = ferror(fp!)
|
||||
if errno != 0 {
|
||||
throw FileSystemError(.ioError(code: errno), path)
|
||||
}
|
||||
@@ -455,12 +455,12 @@
|
||||
if fp == nil {
|
||||
throw FileSystemError(errno: errno, path)
|
||||
}
|
||||
- defer { fclose(fp) }
|
||||
+ defer { fclose(fp!) }
|
||||
|
||||
// Write the data in one chunk.
|
||||
var contents = bytes.contents
|
||||
while true {
|
||||
- let n = fwrite(&contents, 1, contents.count, fp)
|
||||
+ let n = fwrite(&contents, 1, contents.count, fp!)
|
||||
if n < 0 {
|
||||
if errno == EINTR { continue }
|
||||
throw FileSystemError(.ioError(code: errno), path)
|
||||
@ -0,0 +1,15 @@
|
||||
--- llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp.orig 2022-08-03 19:13:51.591055629 -0500
|
||||
+++ llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp 2022-08-03 19:13:56.112348435 -0500
|
||||
@@ -73,7 +73,11 @@
|
||||
#include <sys/vt.h>
|
||||
#include <linux/cdrom.h>
|
||||
#include <linux/fd.h>
|
||||
-#include <linux/fs.h>
|
||||
+//#include <linux/fs.h>
|
||||
+#define FS_IOC_GETFLAGS _IOR('f', 1, long)
|
||||
+#define FS_IOC_SETFLAGS _IOW('f', 2, long)
|
||||
+#define FS_IOC_GETVERSION _IOR('v', 1, long)
|
||||
+#define FS_IOC_SETVERSION _IOW('v', 2, long)
|
||||
#include <linux/hdreg.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/ioctl.h>
|
||||
@ -1,18 +0,0 @@
|
||||
--- swift-corelibs-foundation/Sources/CoreFoundation/internalInclude/CoreFoundation_Prefix.h.orig 2024-07-31 10:29:42.005997906 -0500
|
||||
+++ swift-corelibs-foundation/Sources/CoreFoundation/internalInclude/CoreFoundation_Prefix.h 2024-07-31 10:31:06.147568761 -0500
|
||||
@@ -200,6 +200,7 @@
|
||||
#endif
|
||||
|
||||
#if !TARGET_OS_MAC
|
||||
+#if 0
|
||||
#if !HAVE_STRLCPY
|
||||
CF_INLINE size_t
|
||||
strlcpy(char * dst, const char * src, size_t maxlen) {
|
||||
@@ -229,6 +230,7 @@
|
||||
return dstlen + srclen;
|
||||
}
|
||||
#endif
|
||||
+#endif // XYZZY - We do have them in Fedora
|
||||
#endif // !TARGET_OS_MAC
|
||||
|
||||
#if TARGET_OS_WIN32
|
||||
@ -1,11 +0,0 @@
|
||||
--- cmark/CMakeLists.txt.orig 2024-06-11 14:38:17.531997089 -0500
|
||||
+++ cmark/CMakeLists.txt 2024-06-11 14:38:24.161433974 -0500
|
||||
@@ -22,6 +22,8 @@
|
||||
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR YES)
|
||||
|
||||
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
+
|
||||
option(CMARK_FUZZ_QUADRATIC "Build quadratic fuzzing harness" OFF)
|
||||
option(CMARK_LIB_FUZZER "Build libFuzzer fuzzing harness" OFF)
|
||||
option(CMARK_THREADING "Add locks around static accesses" OFF)
|
||||
@ -0,0 +1,27 @@
|
||||
diff --color -Naur swift-corelibs-foundation-orig/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h
|
||||
--- swift-corelibs-foundation-orig/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-07-06 10:02:48.000000000 -0500
|
||||
+++ swift-corelibs-foundation/CoreFoundation/Base.subproj/CoreFoundation_Prefix.h 2023-08-16 12:53:42.332226574 -0500
|
||||
@@ -189,7 +189,7 @@
|
||||
#define CF_RETAIN_BALANCED_ELSEWHERE(obj, identified_location) do { } while (0)
|
||||
#endif
|
||||
|
||||
-#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN) || TARGET_OS_WIN32
|
||||
+#if (TARGET_OS_LINUX && !TARGET_OS_ANDROID && !TARGET_OS_CYGWIN && !ALREADY_HAVE_STRL_FUNCS) || TARGET_OS_WIN32
|
||||
CF_INLINE size_t
|
||||
strlcpy(char * dst, const char * src, size_t maxlen) {
|
||||
const size_t srclen = strlen(src);
|
||||
diff --color -Naur swift-corelibs-foundation-orig/CoreFoundation/CMakeLists.txt swift-corelibs-foundation/CoreFoundation/CMakeLists.txt
|
||||
--- swift-corelibs-foundation-orig/CoreFoundation/CMakeLists.txt 2023-07-06 10:02:48.000000000 -0500
|
||||
+++ swift-corelibs-foundation/CoreFoundation/CMakeLists.txt 2023-08-16 12:53:44.851386844 -0500
|
||||
@@ -80,6 +80,11 @@
|
||||
add_compile_definitions($<$<COMPILE_LANGUAGE:C>:HAVE_SCHED_GETAFFINITY>)
|
||||
endif()
|
||||
endif()
|
||||
+ # XYZZY
|
||||
+ check_symbol_exists(strlcpy "string.h" HAVE_NEW_GLIBC)
|
||||
+ if(HAVE_NEW_GLIBC)
|
||||
+ add_compile_definitions($<$<COMPILE_LANGUAGE:C>:ALREADY_HAVE_STRL_FUNCS>)
|
||||
+ endif()
|
||||
endif()
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL Windows)
|
||||
# NOTE(compnerd) we only support building with the dynamic CRT as using the
|
||||
@ -0,0 +1,11 @@
|
||||
--- swift/utils/build-presets.ini.orig 2023-02-06 19:59:52.297617075 -0600
|
||||
+++ swift/utils/build-presets.ini 2023-02-06 20:00:17.131186971 -0600
|
||||
@@ -834,7 +834,7 @@
|
||||
# Executes the lit tests for the installable package that is created
|
||||
# Assumes the swift-integration-tests repo is checked out
|
||||
|
||||
-test-installable-package
|
||||
+#test-installable-package
|
||||
|
||||
# Build the benchmarks against the toolchain.
|
||||
toolchain-benchmarks
|
||||
@ -1,83 +0,0 @@
|
||||
diff --color -Naur llvm-project/clang/utils/creduce-clang-crash.py llvm-project/clang/utils/creduce-clang-crash.py
|
||||
--- llvm-project/clang/utils/creduce-clang-crash.py 2024-06-13 19:54:42.303016942 -0500
|
||||
+++ llvm-project/clang/utils/creduce-clang-crash.py 2024-06-13 19:57:15.922473813 -0500
|
||||
@@ -15,7 +15,6 @@
|
||||
import stat
|
||||
import sys
|
||||
import subprocess
|
||||
-import pipes
|
||||
import shlex
|
||||
import tempfile
|
||||
import shutil
|
||||
@@ -61,7 +60,7 @@
|
||||
|
||||
|
||||
def quote_cmd(cmd):
|
||||
- return " ".join(pipes.quote(arg) for arg in cmd)
|
||||
+ return " ".join(shlex.quote(arg) for arg in cmd)
|
||||
|
||||
|
||||
def write_to_script(text, filename):
|
||||
@@ -220,7 +219,7 @@
|
||||
)
|
||||
|
||||
for msg in self.expected_output:
|
||||
- output += "grep -F %s t.log || exit 1\n" % pipes.quote(msg)
|
||||
+ output += "grep -F %s t.log || exit 1\n" % shlex.quote(msg)
|
||||
|
||||
write_to_script(output, self.testfile)
|
||||
self.check_interestingness()
|
||||
diff --color -Naur llvm-project/libcxx/utils/libcxx/test/dsl.py llvm-project/libcxx/utils/libcxx/test/dsl.py
|
||||
--- llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-13 19:55:23.627829920 -0500
|
||||
+++ llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-13 19:57:42.124257373 -0500
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
import os
|
||||
import pickle
|
||||
-import pipes
|
||||
+import shlex
|
||||
import platform
|
||||
import re
|
||||
import shutil
|
||||
@@ -281,7 +281,7 @@
|
||||
}
|
||||
#endif
|
||||
"""
|
||||
- return programSucceeds(config, program, args=[pipes.quote(l) for l in locales])
|
||||
+ return programSucceeds(config, program, args=[shlex.quote(l) for l in locales])
|
||||
|
||||
|
||||
@_memoizeExpensiveOperation(lambda c, flags="": (c.substitutions, c.environment, flags))
|
||||
diff --color -Naur llvm-project/libcxx/utils/libcxx/test/format.py llvm-project/libcxx/utils/libcxx/test/format.py
|
||||
--- llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-13 19:55:23.627829920 -0500
|
||||
+++ llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-13 19:58:01.911604299 -0500
|
||||
@@ -11,7 +11,7 @@
|
||||
import lit
|
||||
import lit.formats
|
||||
import os
|
||||
-import pipes
|
||||
+import shlex
|
||||
import re
|
||||
import shutil
|
||||
|
||||
diff --color -Naur ninja/configure.py ninja/configure.py
|
||||
--- ninja/configure.py 2024-06-13 19:54:39.050795565 -0500
|
||||
+++ ninja/configure.py 2024-06-13 19:56:39.970026531 -0500
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
from optparse import OptionParser
|
||||
import os
|
||||
-import pipes
|
||||
+import shlex
|
||||
import string
|
||||
import subprocess
|
||||
import sys
|
||||
@@ -264,7 +264,7 @@
|
||||
env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS'])
|
||||
configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys)
|
||||
if configure_env:
|
||||
- config_str = ' '.join([k + '=' + pipes.quote(configure_env[k])
|
||||
+ config_str = ' '.join([k + '=' + shlex.quote(configure_env[k])
|
||||
for k in configure_env])
|
||||
n.variable('configure_env', config_str + '$ ')
|
||||
n.newline()
|
||||
@ -0,0 +1,270 @@
|
||||
diff --color -Naur llvm-project/clang/utils/creduce-clang-crash.py llvm-project/clang/utils/creduce-clang-crash.py
|
||||
--- llvm-project/clang/utils/creduce-clang-crash.py 2024-06-20 13:38:53.943180833 -0500
|
||||
+++ llvm-project/clang/utils/creduce-clang-crash.py 2024-06-20 13:42:30.244711005 -0500
|
||||
@@ -14,7 +14,6 @@
|
||||
import stat
|
||||
import sys
|
||||
import subprocess
|
||||
-import pipes
|
||||
import shlex
|
||||
import tempfile
|
||||
import shutil
|
||||
@@ -57,7 +56,7 @@
|
||||
sys.exit("ERROR: `%s` not found in %s" % (cmd_name, cmd_dir))
|
||||
|
||||
def quote_cmd(cmd):
|
||||
- return ' '.join(pipes.quote(arg) for arg in cmd)
|
||||
+ return ' '.join(shlex.quote(arg) for arg in cmd)
|
||||
|
||||
def write_to_script(text, filename):
|
||||
with open(filename, 'w') as f:
|
||||
@@ -199,7 +198,7 @@
|
||||
""" % (disable_symbolization, quote_cmd(self.get_crash_cmd()))
|
||||
|
||||
for msg in self.expected_output:
|
||||
- output += 'grep -F %s t.log || exit 1\n' % pipes.quote(msg)
|
||||
+ output += 'grep -F %s t.log || exit 1\n' % shlex.quote(msg)
|
||||
|
||||
write_to_script(output, self.testfile)
|
||||
self.check_interestingness()
|
||||
diff --color -Naur llvm-project/compiler-rt/test/asan/lit.cfg.py llvm-project/compiler-rt/test/asan/lit.cfg.py
|
||||
--- llvm-project/compiler-rt/test/asan/lit.cfg.py 2024-06-20 13:38:17.808753484 -0500
|
||||
+++ llvm-project/compiler-rt/test/asan/lit.cfg.py 2024-06-20 13:43:18.446949016 -0500
|
||||
@@ -6,14 +6,8 @@
|
||||
|
||||
import lit.formats
|
||||
|
||||
-# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if
|
||||
-# it's not available.
|
||||
-try:
|
||||
- import shlex
|
||||
- sh_quote = shlex.quote
|
||||
-except:
|
||||
- import pipes
|
||||
- sh_quote = pipes.quote
|
||||
+import shlex
|
||||
+sh_quote = shlex.quote
|
||||
|
||||
def get_required_attr(config, attr_name):
|
||||
attr_value = getattr(config, attr_name, None)
|
||||
diff --color -Naur llvm-project/compiler-rt/test/lit.common.cfg.py llvm-project/compiler-rt/test/lit.common.cfg.py
|
||||
--- llvm-project/compiler-rt/test/lit.common.cfg.py 2024-06-20 13:38:17.788752141 -0500
|
||||
+++ llvm-project/compiler-rt/test/lit.common.cfg.py 2024-06-20 13:43:44.961730162 -0500
|
||||
@@ -12,14 +12,8 @@
|
||||
import lit.formats
|
||||
import lit.util
|
||||
|
||||
-# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if
|
||||
-# it's not available.
|
||||
-try:
|
||||
- import shlex
|
||||
- sh_quote = shlex.quote
|
||||
-except:
|
||||
- import pipes
|
||||
- sh_quote = pipes.quote
|
||||
+import shlex
|
||||
+sh_quote = shlex.quote
|
||||
|
||||
def find_compiler_libdir():
|
||||
"""
|
||||
diff --color -Naur llvm-project/compiler-rt/test/memprof/lit.cfg.py llvm-project/compiler-rt/test/memprof/lit.cfg.py
|
||||
--- llvm-project/compiler-rt/test/memprof/lit.cfg.py 2024-06-20 13:38:17.852756440 -0500
|
||||
+++ llvm-project/compiler-rt/test/memprof/lit.cfg.py 2024-06-20 13:44:09.179356996 -0500
|
||||
@@ -6,14 +6,8 @@
|
||||
|
||||
import lit.formats
|
||||
|
||||
-# Get shlex.quote if available (added in 3.3), and fall back to pipes.quote if
|
||||
-# it's not available.
|
||||
-try:
|
||||
- import shlex
|
||||
- sh_quote = shlex.quote
|
||||
-except:
|
||||
- import pipes
|
||||
- sh_quote = pipes.quote
|
||||
+import shlex
|
||||
+sh_quote = shlex.quote
|
||||
|
||||
def get_required_attr(config, attr_name):
|
||||
attr_value = getattr(config, attr_name, None)
|
||||
diff --color -Naur llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py
|
||||
--- llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py 2024-06-20 13:38:17.946762755 -0500
|
||||
+++ llvm-project/compiler-rt/test/sanitizer_common/ios_commands/iossim_run.py 2024-06-20 13:48:37.348371396 -0500
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
-import glob, os, pipes, sys, subprocess
|
||||
+import glob, os, shlex, sys, subprocess
|
||||
|
||||
|
||||
device_id = os.environ.get('SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER')
|
||||
@@ -39,7 +39,7 @@
|
||||
rm_args.append(arg)
|
||||
else:
|
||||
# FIXME(dliew): pipes.quote() is deprecated
|
||||
- rm_args.append(pipes.quote(arg))
|
||||
+ rm_args.append(shlex.quote(arg))
|
||||
rm_cmd_line = ["/bin/rm"] + rm_args
|
||||
rm_cmd_line_str = ' '.join(rm_cmd_line)
|
||||
# We use `shell=True` so that any wildcard globs get expanded by the shell.
|
||||
diff --color -Naur llvm-project/libcxx/utils/libcxx/test/config.py llvm-project/libcxx/utils/libcxx/test/config.py
|
||||
--- llvm-project/libcxx/utils/libcxx/test/config.py 2024-06-20 13:38:59.394547032 -0500
|
||||
+++ llvm-project/libcxx/utils/libcxx/test/config.py 2024-06-20 13:45:49.931125052 -0500
|
||||
@@ -9,7 +9,6 @@
|
||||
import copy
|
||||
import os
|
||||
import pkgutil
|
||||
-import pipes
|
||||
import platform
|
||||
import re
|
||||
import shlex
|
||||
@@ -434,7 +433,7 @@
|
||||
def quote(self, s):
|
||||
if platform.system() == 'Windows':
|
||||
return lit.TestRunner.quote_windows_command([s])
|
||||
- return pipes.quote(s)
|
||||
+ return shlex.quote(s)
|
||||
|
||||
def configure_substitutions(self):
|
||||
sub = self.config.substitutions
|
||||
diff --color -Naur llvm-project/libcxx/utils/libcxx/test/dsl.py llvm-project/libcxx/utils/libcxx/test/dsl.py
|
||||
--- llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-20 13:38:59.394547032 -0500
|
||||
+++ llvm-project/libcxx/utils/libcxx/test/dsl.py 2024-06-20 13:45:11.318531231 -0500
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
import os
|
||||
import pickle
|
||||
-import pipes
|
||||
+import shlex
|
||||
import platform
|
||||
import re
|
||||
import shutil
|
||||
@@ -261,7 +261,7 @@
|
||||
}
|
||||
#endif
|
||||
"""
|
||||
- return programSucceeds(config, program, args=[pipes.quote(l) for l in locales])
|
||||
+ return programSucceeds(config, program, args=[shlex.quote(l) for l in locales])
|
||||
|
||||
@_memoizeExpensiveOperation(lambda c, flags='': (c.substitutions, c.environment, flags))
|
||||
def compilerMacros(config, flags=''):
|
||||
diff --color -Naur llvm-project/libcxx/utils/libcxx/test/format.py llvm-project/libcxx/utils/libcxx/test/format.py
|
||||
--- llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-20 13:38:59.394547032 -0500
|
||||
+++ llvm-project/libcxx/utils/libcxx/test/format.py 2024-06-20 13:45:31.689899688 -0500
|
||||
@@ -9,7 +9,7 @@
|
||||
import lit
|
||||
import lit.formats
|
||||
import os
|
||||
-import pipes
|
||||
+import shlex
|
||||
import re
|
||||
import shutil
|
||||
|
||||
diff --color -Naur ninja/configure.py ninja/configure.py
|
||||
--- ninja/configure.py 2024-06-20 13:38:14.957561954 -0500
|
||||
+++ ninja/configure.py 2024-06-20 13:46:12.859665292 -0500
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
from optparse import OptionParser
|
||||
import os
|
||||
-import pipes
|
||||
+import shlex
|
||||
import string
|
||||
import subprocess
|
||||
import sys
|
||||
@@ -264,7 +264,7 @@
|
||||
env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS'])
|
||||
configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys)
|
||||
if configure_env:
|
||||
- config_str = ' '.join([k + '=' + pipes.quote(configure_env[k])
|
||||
+ config_str = ' '.join([k + '=' + shlex.quote(configure_env[k])
|
||||
for k in configure_env])
|
||||
n.variable('configure_env', config_str + '$ ')
|
||||
n.newline()
|
||||
diff --color -Naur swift/utils/build_swift/build_swift/shell.py swift/utils/build_swift/build_swift/shell.py
|
||||
--- swift/utils/build_swift/build_swift/shell.py 2024-06-20 13:39:16.267680494 -0500
|
||||
+++ swift/utils/build_swift/build_swift/shell.py 2024-06-20 13:47:56.850650939 -0500
|
||||
@@ -23,7 +23,7 @@
|
||||
import sys
|
||||
from copy import copy as _copy
|
||||
from pathlib import Path
|
||||
-from pipes import quote as _quote
|
||||
+from shlex import quote as _quote
|
||||
from shlex import split
|
||||
from subprocess import CalledProcessError
|
||||
|
||||
diff --color -Naur swift/utils/sil-opt-verify-all-modules.py swift/utils/sil-opt-verify-all-modules.py
|
||||
--- swift/utils/sil-opt-verify-all-modules.py 2024-06-20 13:39:17.951793627 -0500
|
||||
+++ swift/utils/sil-opt-verify-all-modules.py 2024-06-20 13:40:50.278995757 -0500
|
||||
@@ -13,7 +13,7 @@
|
||||
import glob
|
||||
import multiprocessing
|
||||
import os
|
||||
-import pipes
|
||||
+import shlex
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
@@ -91,7 +91,7 @@
|
||||
|
||||
|
||||
def quote_shell_command(args):
|
||||
- return " ".join([pipes.quote(a) for a in args])
|
||||
+ return " ".join([shlex.quote(a) for a in args])
|
||||
|
||||
|
||||
def run_commands_in_parallel(commands):
|
||||
diff --color -Naur swift/utils/swift_build_support/swift_build_support/build_script_invocation.py swift/utils/swift_build_support/swift_build_support/build_script_invocation.py
|
||||
--- swift/utils/swift_build_support/swift_build_support/build_script_invocation.py 2024-06-20 13:39:16.270680695 -0500
|
||||
+++ swift/utils/swift_build_support/swift_build_support/build_script_invocation.py 2024-06-20 13:41:40.348359192 -0500
|
||||
@@ -11,7 +11,7 @@
|
||||
# ===---------------------------------------------------------------------===#
|
||||
|
||||
import os
|
||||
-import pipes
|
||||
+import shlex
|
||||
import platform
|
||||
|
||||
from build_swift.build_swift import argparse
|
||||
@@ -128,9 +128,9 @@
|
||||
"--build-jobs", str(args.build_jobs),
|
||||
"--lit-jobs", str(args.lit_jobs),
|
||||
"--common-cmake-options=%s" % ' '.join(
|
||||
- pipes.quote(opt) for opt in cmake.common_options()),
|
||||
+ shlex.quote(opt) for opt in cmake.common_options()),
|
||||
"--build-args=%s" % ' '.join(
|
||||
- pipes.quote(arg) for arg in cmake.build_args()),
|
||||
+ shlex.quote(arg) for arg in cmake.build_args()),
|
||||
"--dsymutil-jobs", str(args.dsymutil_jobs),
|
||||
]
|
||||
|
||||
@@ -388,7 +388,7 @@
|
||||
if args.extra_cmake_options:
|
||||
impl_args += [
|
||||
"--extra-cmake-options=%s" % ' '.join(
|
||||
- pipes.quote(opt) for opt in args.extra_cmake_options)
|
||||
+ shlex.quote(opt) for opt in args.extra_cmake_options)
|
||||
]
|
||||
|
||||
if args.lto_type is not None:
|
||||
diff --color -Naur swift/utils/swift_build_support/swift_build_support/shell.py swift/utils/swift_build_support/swift_build_support/shell.py
|
||||
--- swift/utils/swift_build_support/swift_build_support/shell.py 2024-06-20 13:39:16.271680762 -0500
|
||||
+++ swift/utils/swift_build_support/swift_build_support/shell.py 2024-06-20 13:42:02.214828084 -0500
|
||||
@@ -14,7 +14,7 @@
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
import os
|
||||
-import pipes
|
||||
+import shlex
|
||||
import platform
|
||||
import shutil
|
||||
import subprocess
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
|
||||
def _quote(arg):
|
||||
- return pipes.quote(str(arg))
|
||||
+ return shlex.quote(str(arg))
|
||||
|
||||
|
||||
def quote_command(args):
|
||||
@ -1,46 +0,0 @@
|
||||
From f189a95d6371cdb44f773029f7a19b94f0d9a839 Mon Sep 17 00:00:00 2001
|
||||
From: Finagolfin <finagolfin@tuta.io>
|
||||
Date: Fri, 28 Jun 2024 20:06:06 +0530
|
||||
Subject: [PATCH] [ClangImporter] Make sure the `-resource-dir` is checked
|
||||
before the `-sdk`, as done everywhere else in the compiler
|
||||
|
||||
Otherwise, these module maps can be pulled from a system SDK instead when
|
||||
building a fresh Swift stdlib, fixes #74696.
|
||||
---
|
||||
lib/ClangImporter/ClangIncludePaths.cpp | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/lib/ClangImporter/ClangIncludePaths.cpp b/lib/ClangImporter/ClangIncludePaths.cpp
|
||||
index 23431af724459..7e6ca8c2a9cb6 100644
|
||||
--- a/lib/ClangImporter/ClangIncludePaths.cpp
|
||||
+++ b/lib/ClangImporter/ClangIncludePaths.cpp
|
||||
@@ -35,10 +35,10 @@ static std::optional<Path> getActualModuleMapPath(
|
||||
|
||||
Path result;
|
||||
|
||||
- StringRef SDKPath = Opts.getSDKPath();
|
||||
- if (!SDKPath.empty()) {
|
||||
- result.append(SDKPath.begin(), SDKPath.end());
|
||||
- llvm::sys::path::append(result, "usr", "lib", "swift");
|
||||
+ if (!Opts.RuntimeResourcePath.empty()) {
|
||||
+ result.clear();
|
||||
+ result.append(Opts.RuntimeResourcePath.begin(),
|
||||
+ Opts.RuntimeResourcePath.end());
|
||||
llvm::sys::path::append(result, platform);
|
||||
if (isArchSpecific) {
|
||||
llvm::sys::path::append(result, arch);
|
||||
@@ -52,10 +52,10 @@ static std::optional<Path> getActualModuleMapPath(
|
||||
return result;
|
||||
}
|
||||
|
||||
- if (!Opts.RuntimeResourcePath.empty()) {
|
||||
- result.clear();
|
||||
- result.append(Opts.RuntimeResourcePath.begin(),
|
||||
- Opts.RuntimeResourcePath.end());
|
||||
+ StringRef SDKPath = Opts.getSDKPath();
|
||||
+ if (!SDKPath.empty()) {
|
||||
+ result.append(SDKPath.begin(), SDKPath.end());
|
||||
+ llvm::sys::path::append(result, "usr", "lib", "swift");
|
||||
llvm::sys::path::append(result, platform);
|
||||
if (isArchSpecific) {
|
||||
llvm::sys::path::append(result, arch);
|
||||
@ -1 +0,0 @@
|
||||
/usr/lib/swift/linux
|
||||
@ -0,0 +1,10 @@
|
||||
--- llvm-project/llvm/include/llvm/Support/Signals.h.orig 2023-01-25 12:42:42.006799309 -0600
|
||||
+++ llvm-project/llvm/include/llvm/Support/Signals.h 2023-01-25 12:43:15.856946625 -0600
|
||||
@@ -15,6 +15,7 @@
|
||||
#define LLVM_SUPPORT_SIGNALS_H
|
||||
|
||||
#include <string>
|
||||
+#include <stdint.h>
|
||||
|
||||
namespace llvm {
|
||||
class StringRef;
|
||||
@ -0,0 +1,14 @@
|
||||
--- swift-corelibs-libdispatch/src/shims/yield.c.orig 2022-09-16 12:04:16.691448773 -0500
|
||||
+++ swift-corelibs-libdispatch/src/shims/yield.c 2022-09-16 12:05:43.047145102 -0500
|
||||
@@ -25,6 +25,11 @@
|
||||
__DISPATCH_WAIT_FOR_ENQUEUER__(void **ptr)
|
||||
{
|
||||
int spins = 0;
|
||||
+ int nothing = spins;
|
||||
+ nothing = 23;
|
||||
+ spins = nothing;
|
||||
+ spins = 0;
|
||||
+
|
||||
void *value;
|
||||
while ((value = os_atomic_load(ptr, relaxed)) == NULL) {
|
||||
_dispatch_preemption_yield(++spins);
|
||||
Loading…
Reference in new issue