Skip to content

Commit 7903234

Browse files
authored
merge main into amd-staging (llvm#1860)
2 parents d27bc17 + ea65662 commit 7903234

File tree

7 files changed

+7
-6
lines changed

7 files changed

+7
-6
lines changed

libc/config/linux/riscv/entrypoints.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ if(LIBC_COMPILER_HAS_FIXED_POINT)
779779
libc.src.stdfix.idivr
780780
libc.src.stdfix.idivlr
781781
libc.src.stdfix.idivk
782-
libc.src.stdfix.idivulk
782+
libc.src.stdfix.idivlk
783783
libc.src.stdfix.idivur
784784
libc.src.stdfix.idivulr
785785
libc.src.stdfix.idivuk

lldb/test/Shell/Settings/TestCxxFrameFormat.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ int main(int argc, char const *argv[]) {
2424
#--- commands.input
2525
settings set plugin.cplusplus.display.function-name-format "${function.scope}${function.basename}"
2626
settings set -f frame-format "custom-frame '${function.name-with-args}'\n"
27-
break set -l 3
27+
break set -l 3 -f main.cpp
2828

2929
run
3030
bt

lldb/test/Shell/Settings/TestCxxFrameFormatObjC.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ int main() { return bar(10); }
1717
#--- commands.input
1818
settings set plugin.cplusplus.display.function-name-format "this affects C++ only"
1919
settings set -f frame-format "custom-frame '${function.name-with-args}'\n"
20-
break set -l 3
20+
break set -l 3 -f main.m
2121
run
2222

2323
bt

lldb/test/Shell/Settings/TestCxxFrameFormatPartialFailure.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ int main(int argc, const char *argv[]) {
2222
#--- commands.input
2323
settings set plugin.cplusplus.display.function-name-format "${function.basename}${script.target:invalid_func}"
2424
settings set -f frame-format "custom-frame '${function.name-with-args}'\n"
25-
break set -l 2
25+
break set -l 2 -f main.cpp
2626

2727
run
2828
bt

lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ int main() {
3838

3939
#--- commands.input
4040
settings set -f frame-format "custom-frame '${function.basename}'\n"
41-
break set -l 5
41+
break set -l 5 -f main.cpp
4242

4343
run
4444
bt

lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ int main() { return bar(); }
2929

3030
#--- commands.input
3131
settings set -f frame-format "custom-frame '${function.template-arguments}'\n"
32-
break set -l 4
32+
break set -l 4 -f main.cpp
3333

3434
run
3535
bt

llvm/lib/Target/VE/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ add_llvm_target(VECodeGen
3838
SelectionDAG
3939
Support
4040
Target
41+
TargetParser
4142
TransformUtils
4243
VEDesc
4344
VEInfo

0 commit comments

Comments
 (0)