Auto stash before merge of "main" and "origin/main"
This commit is contained in:
@@ -11,6 +11,25 @@ Idx Name Size VMA LMA File off Algn
|
||||
CONTENTS, READONLY
|
||||
3 .debug_aranges 00000050 00000000 00000000 000001eb 2**0
|
||||
CONTENTS, READONLY, DEBUGGING
|
||||
<<<<<<< HEAD
|
||||
4 .debug_info 00000cfe 00000000 00000000 0000023b 2**0
|
||||
CONTENTS, READONLY, DEBUGGING
|
||||
5 .debug_abbrev 000008c5 00000000 00000000 00000f39 2**0
|
||||
CONTENTS, READONLY, DEBUGGING
|
||||
6 .debug_line 0000036f 00000000 00000000 000017fe 2**0
|
||||
CONTENTS, READONLY, DEBUGGING
|
||||
7 .debug_frame 0000008c 00000000 00000000 00001b70 2**2
|
||||
CONTENTS, READONLY, DEBUGGING
|
||||
8 .debug_str 0000027d 00000000 00000000 00001bfc 2**0
|
||||
CONTENTS, READONLY, DEBUGGING
|
||||
9 .debug_loc 000001dc 00000000 00000000 00001e79 2**0
|
||||
CONTENTS, READONLY, DEBUGGING
|
||||
10 .debug_ranges 00000040 00000000 00000000 00002055 2**0
|
||||
CONTENTS, READONLY, DEBUGGING
|
||||
11 .text 00000004 00000164 00000164 000001b8 2**1
|
||||
CONTENTS, ALLOC, LOAD, READONLY, CODE
|
||||
12 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 00002098 2**2
|
||||
=======
|
||||
4 .debug_info 00000cd7 00000000 00000000 0000023b 2**0
|
||||
CONTENTS, READONLY, DEBUGGING
|
||||
5 .debug_abbrev 000008c5 00000000 00000000 00000f12 2**0
|
||||
@@ -28,6 +47,7 @@ Idx Name Size VMA LMA File off Algn
|
||||
11 .text 00000004 00000164 00000164 000001b8 2**1
|
||||
CONTENTS, ALLOC, LOAD, READONLY, CODE
|
||||
12 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 00002070 2**2
|
||||
>>>>>>> main
|
||||
CONTENTS, READONLY, DEBUGGING
|
||||
13 .text.wait 0000001e 0000010e 0000010e 00000162 2**1
|
||||
CONTENTS, ALLOC, LOAD, READONLY, CODE
|
||||
@@ -98,7 +118,11 @@ Disassembly of section .text:
|
||||
Disassembly of section .text:
|
||||
|
||||
00000164 <__bad_interrupt>:
|
||||
<<<<<<< HEAD
|
||||
164: 0c 94 00 00 jmp 0 ; 0x0 <__vectors>
|
||||
=======
|
||||
164: 0c 94 00 00 jmp 0 ; 0x0 <__TEXT_REGION_ORIGIN__>
|
||||
>>>>>>> main
|
||||
|
||||
Disassembly of section .text.wait:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user