Skip to content

Commit 6ccb1ed

Browse files
committed
Updated Upstream
Upstream has released updates that appear to apply and compile correctly Upstream Changes: dc88fbf5 build: update FlowSched 8f51b357 fix: defer all level events to avoid clearing deferred state cc314e73 fix: compilation issue with LLVM 20 5dde8d2c fix: downgrade to max deferred instead of clearing on level downgrade
1 parent 1b3a487 commit 6ccb1ed

File tree

4 files changed

+3
-15
lines changed

4 files changed

+3
-15
lines changed

current-upstream

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
tag-848727b496b176467be3e666feb4033289cfabb2
1+
tag-f7919b573380a63143305094f606bdfca22720e6

patches/main/0007-build-pin-archloom.patch

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,3 @@ index 58a27320..9ec498ef 100644
1616
id "me.champeau.jmh" version "0.7.2"
1717
id 'com.modrinth.minotaur' version '2.+' apply false
1818
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
19-
diff --git a/c2me-opts-natives-math/src/c/CMakeLists.txt b/c2me-opts-natives-math/src/c/CMakeLists.txt
20-
index 30597bea..f8170f6f 100644
21-
--- a/c2me-opts-natives-math/src/c/CMakeLists.txt
22-
+++ b/c2me-opts-natives-math/src/c/CMakeLists.txt
23-
@@ -27,6 +27,6 @@ endif()
24-
execute_process(COMMAND llvm-config --prefix OUTPUT_VARIABLE LLVM_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
25-
26-
target_include_directories(c2me-opts-natives-math PRIVATE includes/)
27-
-target_compile_options(c2me-opts-natives-math PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wall -Wextra -Wpedantic -ffreestanding -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-compilation-dir=. -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-prefix-map=${LLVM_PREFIX}=.../llvm-prefix -fno-math-errno -mprefer-vector-width=512 -ffp-contract=off -Rpass-analysis=loop-vectorize -mno-stack-arg-probe -fsave-optimization-record "SHELL:-mllvm -extra-vectorizer-passes" "SHELL:-mllvm -slp-vectorize-hor-store" "SHELL:-mllvm -slp-min-tree-size=1" "SHELL:-mllvm -slp-min-reg-size=64" "SHELL:-mllvm -slp-threshold=-1" "SHELL:-mllvm -enable-epilogue-vectorization">)
28-
+target_compile_options(c2me-opts-natives-math PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wall -Wextra -Wpedantic -ffreestanding -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-compilation-dir=. -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-prefix-map=${LLVM_PREFIX}=.../llvm-prefix -fno-math-errno -mprefer-vector-width=512 -ffp-contract=off -Rpass-analysis=loop-vectorize -mno-stack-arg-probe -fsave-optimization-record "SHELL:-mllvm -extra-vectorizer-passes" "SHELL:-mllvm -slp-vectorize-hor-store" "SHELL:-mllvm -slp-min-tree-size=2" "SHELL:-mllvm -slp-min-reg-size=64" "SHELL:-mllvm -slp-threshold=-1" "SHELL:-mllvm -enable-epilogue-vectorization">)
29-
target_link_options(c2me-opts-natives-math PRIVATE -v -nostdlib -fuse-ld=lld -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-compilation-dir=. -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-prefix-map=${LLVM_PREFIX}=.../llvm-prefix)
30-

0 commit comments

Comments
 (0)