Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.

Commit b52e2a4

Browse files
committed
[Weekly]: Merge from branch main of upstream
1 parent 0ae9ce0 commit b52e2a4

File tree

8 files changed

+34
-17
lines changed

8 files changed

+34
-17
lines changed

CMakeLists.txt

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -806,8 +806,12 @@ function(
806806
if(run_tests)
807807
add_custom_target(check-picolibc-${variant})
808808
add_dependencies(check-picolibc-${variant} picolibc_${variant}-test)
809-
add_dependencies(check-picolibc check-picolibc-${variant})
810-
add_dependencies(llvm-toolchain-runtimes picolibc_${variant})
809+
# Do not add armv4 or armv5 tests to the check-all
810+
# targets as they currently hang.
811+
if(NOT variant MATCHES "armv4|5")
812+
add_dependencies(check-picolibc check-picolibc-${variant})
813+
add_dependencies(llvm-toolchain-runtimes picolibc_${variant})
814+
endif()
811815
endif()
812816
endfunction()
813817

@@ -1312,7 +1316,11 @@ function(add_compiler_rt_tests variant)
13121316
)
13131317
add_custom_target(check-compiler-rt-${variant})
13141318
add_dependencies(check-compiler-rt-${variant} compiler_rt_${variant}-check-compiler-rt)
1315-
add_dependencies(check-compiler-rt check-compiler-rt-${variant})
1319+
# Do not add armv4 or armv5 tests to the check-all
1320+
# targets as they currently hang.
1321+
if(NOT variant MATCHES "armv4|5")
1322+
add_dependencies(check-compiler-rt check-compiler-rt-${variant})
1323+
endif()
13161324
add_dependencies(check-llvm-toolchain-runtimes-${variant} check-compiler-rt-${variant})
13171325
endfunction()
13181326

@@ -1336,7 +1344,11 @@ function(add_libcxx_libcxxabi_libunwind_tests variant)
13361344
)
13371345
add_custom_target(${check_target}-${variant_with_extensions})
13381346
add_dependencies(${check_target}-${variant_with_extensions} ${target_name}-${check_target})
1339-
add_dependencies(${check_target} ${target_name}-${check_target})
1347+
# Do not add armv4 or armv5 tests to the check-all
1348+
# targets as they currently hang.
1349+
if(NOT variant MATCHES "armv4|5")
1350+
add_dependencies(${check_target} ${target_name}-${check_target})
1351+
endif()
13401352
add_dependencies(check-llvm-toolchain-runtimes-${variant} ${check_target}-${variant_with_extensions})
13411353
endforeach()
13421354
endfunction()
@@ -1501,7 +1513,11 @@ function(add_library_variant target_arch)
15011513
message("C++ runtime libraries tests disabled for ${variant}")
15021514
else()
15031515
add_custom_target(check-llvm-toolchain-runtimes-${variant})
1504-
add_dependencies(check-llvm-toolchain-runtimes check-llvm-toolchain-runtimes-${variant})
1516+
# Do not add armv4 or armv5 tests to the check-all
1517+
# targets as they currently hang.
1518+
if(NOT variant MATCHES "armv4|5")
1519+
add_dependencies(check-llvm-toolchain-runtimes check-llvm-toolchain-runtimes-${variant})
1520+
endif()
15051521
add_compiler_rt_tests("${variant}")
15061522
if(CXX_LIBS)
15071523
add_libcxx_libcxxabi_libunwind_tests("${variant}")

OmaxLTO.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
-flto=full \
22
-fvirtual-function-elimination \
33
-fwhole-program-vtables \
4-
-mllvm -extra-LTO-loop-unroll=true
4+
-Wl,-plugin-opt=-extra-LTO-loop-unroll=true
5+

docs/Screenshot_L4R5.png

-100 Bytes
Loading

docs/Screenshot_U5A9.png

-352 Bytes
Loading

docs/optimization-flags.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ In some cases it is benefitial to perform an additional loop unroll pass so that
66
Use cases where this could be beneficial - multiple (N>=4) nested loops.
77

88
### Usage:
9-
-mllvm -extra-LTO-loop-unroll=true/false
9+
-Wl,-plugin-opt=-extra-LTO-loop-unroll=true/false

multilib-generate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@ def generate_extensions(args):
247247
print("# original option to check that.")
248248

249249
for feature in all_features:
250-
print(f"- Match: -march=armv.*\\+{feature}($|\+.*)")
250+
print(f"- Match: -march=armv.*\\+{feature}($|\\+.*)")
251251
print(f" Flags:")
252252
print(f" - -march=armvX+{feature}")
253-
print(f"- Match: -march=armv.*\\+no{feature}($|\+.*)")
253+
print(f"- Match: -march=armv.*\\+no{feature}($|\\+.*)")
254254
print(f" Flags:")
255255
print(f" - -march=armvX+no{feature}")
256256
print()

patches/picolibc.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/meson.build b/meson.build
2-
index 0fdfa0412..8e679f166 100644
2+
index f90f5b818..2f8d63733 100644
33
--- a/meson.build
44
+++ b/meson.build
5-
@@ -1224,6 +1224,18 @@ if get_option('newlib-retargetable-locking') != get_option('newlib-multithread')
5+
@@ -1310,6 +1310,18 @@ if get_option('newlib-retargetable-locking') != get_option('newlib-multithread')
66
error('newlib-retargetable-locking and newlib-multithread must be set to the same value')
77
endif
88

@@ -22,13 +22,13 @@ index 0fdfa0412..8e679f166 100644
2222
cc.has_argument('-fno-tree-loop-distribute-patterns'),
2323
description: 'Compiler flag to prevent detecting memcpy/memset patterns')
2424
diff --git a/picolibc.ld.in b/picolibc.ld.in
25-
index b97ea3300..04b94f35c 100644
25+
index 7b63ba172..cda5e1e7e 100644
2626
--- a/picolibc.ld.in
2727
+++ b/picolibc.ld.in
2828
@@ -68,6 +68,9 @@ SECTIONS
29-
*(.text.unlikely .text.unlikely.*)
30-
*(.text.startup .text.startup.*)
31-
*(.text .text.* .opd .opd.*)
29+
*(.literal.unlikely .text.unlikely .literal.unlikely.* .text.unlikely.*)
30+
*(.literal.startup .text.startup .literal.startup.* .text.startup.*)
31+
*(.literal .text .literal.* .text.* .opd .opd.*)
3232
+ PROVIDE (__start___lcxx_override = .);
3333
+ *(__lcxx_override)
3434
+ PROVIDE (__stop___lcxx_override = .);

versions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"llvm-project": {
1010
"comment": "tagType can be branch, tag or commithash",
1111
"tagType": "commithash",
12-
"tag": "6e02e19c"
12+
"tag": "06984825"
1313
},
1414
"picolibc": {
1515
"tagType": "commithash",
16-
"tag": "fa65d578"
16+
"tag": "d55527c1"
1717
},
1818
"newlib": {
1919
"tagType": "tag",

0 commit comments

Comments
 (0)