Skip to content

Commit cd0c87a

Browse files
adamgreigadamgreig
committed
CI: Update golden objdumps for new nm syntax
Also update format of command line arguments to nm to use double dashes.
1 parent 23f639b commit cd0c87a

File tree

9 files changed

+26
-29
lines changed

9 files changed

+26
-29
lines changed

‎ci/asm/app/release.objdump‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11

2-
app: file format ELF32-arm-little
2+
app: file format elf32-littlearm
33

44

55
Disassembly of section .text:
66

7-
HardFault:
7+
<HardFault>:
88
b #-0x4 <HardFault>
99

10-
main:
11-
trap
10+
<main>:
11+
b #-0x4 <main>
1212

13-
Reset:
13+
<Reset>:
1414
push {r7, lr}
1515
mov r7, sp
1616
bl #-0xa
1717
trap
1818

19-
DefaultExceptionHandler:
20-
b #-0x4 <DefaultExceptionHandler>
21-
22-
UsageFault:
23-
<unknown>
19+
<UsageFault>:
20+
b #-0x4 <UsageFault>
2421

25-
HardFaultTrampoline:
22+
<HardFaultTrampoline>:
2623
mrs r0, msp
2724
b #-0x18 <HardFault>

‎ci/asm/app/release.vector_table‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
app: file format ELF32-arm-little
2+
app: file format elf32-littlearm
33

44
Contents of section .vector_table:
55
0000 00000120 45000000 4f000000 51000000 ... E...O...Q...

‎ci/exceptions/app/app.objdump‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11

2-
app: file format ELF32-arm-little
2+
app: file format elf32-littlearm
33

44

55
Disassembly of section .text:
66

7-
main:
7+
<main>:
88
trap
99
trap
1010

11-
Reset:
11+
<Reset>:
1212
movw r1, #0x0
1313
movw r0, #0x0
1414
movt r1, #0x2000

‎ci/exceptions/app/app.vector_table.objdump‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
app: file format ELF32-arm-little
2+
app: file format elf32-littlearm
33

44
Contents of section .vector_table:
55
0000 00000120 45000000 7f000000 7f000000 ... E...........

‎ci/logging/app4/dev.objdump‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
00000000 g O .log 00000001 Goodbye
22
00000001 g O .log 00000001 Hello, world!
3-
00000001 .log 00000000 __log_warning_start__
3+
00000001 g .log 00000000 __log_warning_start__

‎ci/main/app/app.objdump‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

2-
app: file format ELF32-arm-little
2+
app: file format elf32-littlearm
33

44

55
Disassembly of section .text:
66

7-
main:
7+
<main>:
88
sub sp, #4
99
movs r0, #42
1010
str r0, [sp]
1111
b #-2 <main+0x8>
1212
b #-4 <main+0x8>
1313

14-
Reset:
14+
<Reset>:
1515
push {r7, lr}
1616
mov r7, sp
1717
bl #-18

‎ci/memory-layout/app.text.objdump‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

2-
app: file format ELF32-arm-little
2+
app: file format elf32-littlearm
33

44

55
Disassembly of section .text:
66

7-
Reset:
7+
<Reset>:
88
sub sp, #4
99
movs r0, #42
1010
str r0, [sp]

‎ci/memory-layout/app.vector_table.objdump‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
app: file format ELF32-arm-little
2+
app: file format elf32-littlearm
33

44
Contents of section .vector_table:
55
0000 00000120 09000000 ... ....

‎ci/script.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ main() {
5151

5252
# check that the Reset symbol is there
5353
diff -b app.text.objdump \
54-
<(cargo objdump --bin app -- -d -no-show-raw-insn -no-leading-addr)
54+
<(cargo objdump --bin app -- -d --no-show-raw-insn --no-leading-addr)
5555

5656
# check that the reset vector is there and has the right address
5757
diff -b app.vector_table.objdump \
58-
<(cargo objdump --bin app -- -s -section .vector_table)
58+
<(cargo objdump --bin app -- -s --section .vector_table)
5959

6060
qemu_check target/thumbv7m-none-eabi/debug/app
6161

@@ -69,7 +69,7 @@ main() {
6969
# check that the disassembly matches
7070
pushd app
7171
diff -b app.objdump \
72-
<(cargo objdump --bin app -- -d -no-show-raw-insn -no-leading-addr)
72+
<(cargo objdump --bin app -- -d --no-show-raw-insn --no-leading-addr)
7373
# disabled because of rust-lang/rust#53964
7474
# edition_check
7575
popd
@@ -104,7 +104,7 @@ main() {
104104
# check that the disassembly matches
105105
pushd app
106106
diff -b app.objdump \
107-
<(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex -no-leading-addr)
107+
<(cargo objdump --bin app --release -- -d --no-show-raw-insn --print-imm-hex --no-leading-addr)
108108
diff -b app.vector_table.objdump \
109109
<(cargo objdump --bin app --release -- -s -j .vector_table)
110110
edition_check
@@ -125,7 +125,7 @@ main() {
125125
# check that the disassembly matches
126126
pushd app
127127
diff -b release.objdump \
128-
<(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex -no-leading-addr)
128+
<(cargo objdump --bin app --release -- -d --no-show-raw-insn --print-imm-hex --no-leading-addr)
129129
diff release.vector_table \
130130
<(cargo objdump --bin app --release -- -s -j .vector_table)
131131
edition_check
@@ -142,7 +142,7 @@ main() {
142142
# check that the disassembly matches
143143
pushd app2
144144
diff -b release.objdump \
145-
<(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex -no-leading-addr)
145+
<(cargo objdump --bin app --release -- -d --no-show-raw-insn --print-imm-hex --no-leading-addr)
146146
diff release.vector_table \
147147
<(cargo objdump --bin app --release -- -s -j .vector_table)
148148
edition_check

0 commit comments

Comments
 (0)