Auto stash before merge of "main" and "origin/main"

This commit is contained in:
stijn
2021-02-10 10:06:04 +01:00
parent 455ad72aea
commit 7673bb3bbf
12 changed files with 685 additions and 0 deletions

View File

@@ -11,6 +11,23 @@ Idx Name Size VMA LMA File off Algn
CONTENTS, READONLY
3 .debug_aranges 00000020 00000000 00000000 0000012d 2**0
CONTENTS, READONLY, DEBUGGING
<<<<<<< HEAD
4 .debug_info 000009fe 00000000 00000000 0000014d 2**0
CONTENTS, READONLY, DEBUGGING
5 .debug_abbrev 00000756 00000000 00000000 00000b4b 2**0
CONTENTS, READONLY, DEBUGGING
6 .debug_line 000001a6 00000000 00000000 000012a1 2**0
CONTENTS, READONLY, DEBUGGING
7 .debug_frame 00000024 00000000 00000000 00001448 2**2
CONTENTS, READONLY, DEBUGGING
8 .debug_str 0000027d 00000000 00000000 0000146c 2**0
CONTENTS, READONLY, DEBUGGING
9 .debug_ranges 00000010 00000000 00000000 000016e9 2**0
CONTENTS, READONLY, DEBUGGING
10 .text 00000004 000000a4 000000a4 000000f8 2**1
CONTENTS, ALLOC, LOAD, READONLY, CODE
11 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 000016fc 2**2
=======
4 .debug_info 000009d7 00000000 00000000 0000014d 2**0
CONTENTS, READONLY, DEBUGGING
5 .debug_abbrev 00000756 00000000 00000000 00000b24 2**0
@@ -26,6 +43,7 @@ Idx Name Size VMA LMA File off Algn
10 .text 00000004 000000a4 000000a4 000000f8 2**1
CONTENTS, ALLOC, LOAD, READONLY, CODE
11 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 000016d4 2**2
>>>>>>> main
CONTENTS, READONLY, DEBUGGING
12 .text.main 00000002 000000a8 000000a8 000000fc 2**1
CONTENTS, ALLOC, LOAD, READONLY, CODE
@@ -88,7 +106,11 @@ Disassembly of section .text:
Disassembly of section .text:
000000a4 <__bad_interrupt>:
<<<<<<< HEAD
a4: 0c 94 00 00 jmp 0 ; 0x0 <__TEXT_REGION_ORIGIN__>
=======
a4: 0c 94 00 00 jmp 0 ; 0x0 <__vectors>
>>>>>>> main
Disassembly of section .text.main: