diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2024-05-10 17:09:31 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2024-05-11 15:08:00 +0000 |
| commit | 03dc3932dacf76d4620773c3e67cd64c8917c2ef (patch) | |
| tree | 96f1bd2a7c6998fe6813edaa27f25e08bc1abd20 | |
| parent | fc4dec2f6a82c11ff7fe1aac2408d83dbbd1a9c5 (diff) | |
Fix the linkerMode test for Linux ARM
Having ret instruction fixes the error with clang on macOS, but
makes it fail on Linux on 32-bit ARM and some other architectures:
tests/auto/blackbox/testWorkDir/linkerMode/main.s: Assembler messages:
tests/auto/blackbox/testWorkDir/linkerMode/main.s:6: Error: bad instruction `ret'
ERROR: Process failed with exit code 1.
Amends e56cbf7b64810ca0fadc8d3ffbc92a5ba1b293a0.
Change-Id: Ic50d99875cc62e420abc4f1183ff311d45bcf3eb
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | tests/auto/blackbox/testdata/linkerMode/darwin.s | 6 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/linkerMode/main.s | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/blackbox/testdata/linkerMode/darwin.s b/tests/auto/blackbox/testdata/linkerMode/darwin.s new file mode 100644 index 000000000..fb165114b --- /dev/null +++ b/tests/auto/blackbox/testdata/linkerMode/darwin.s @@ -0,0 +1,6 @@ +.globl _main +.globl main + +_main: +main: + ret diff --git a/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs b/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs index 9934efb04..176730ce0 100644 --- a/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs +++ b/tests/auto/blackbox/testdata/linkerMode/linkerMode.qbs @@ -2,7 +2,7 @@ Project { CppApplication { consoleApplication: true name: "LinkedProduct-Assembly" - files: ["main.s"] + files: qbs.targetOS.includes("darwin") ? "darwin.s" : "main.s" cpp.linkerPath: cpp.compilerPathByLanguage["c"] diff --git a/tests/auto/blackbox/testdata/linkerMode/main.s b/tests/auto/blackbox/testdata/linkerMode/main.s index fb165114b..ef88f8c52 100644 --- a/tests/auto/blackbox/testdata/linkerMode/main.s +++ b/tests/auto/blackbox/testdata/linkerMode/main.s @@ -3,4 +3,3 @@ _main: main: - ret |