jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
John Reiser
2017-06-19 16:01:35 -07:00
parent 82af555974
commit 9f20bbb046
2 changed files with 1996 additions and 4015 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/i386-linux.elf-entry.h
+1990 -3996
View File
File diff suppressed because it is too large Load Diff
src/stub/tmp/i386-linux.elf-entry.bin.dump
+6 -19
View File
@@ -169,17 +169,10 @@ Idx Name Size VMA LMA File off Algn Flags
164 ctok32.30 0000000a 00000000 00000000 00001aa8 2**0 CONTENTS, RELOC, READONLY 164 ctok32.30 0000000a 00000000 00000000 00001aa8 2**0 CONTENTS, RELOC, READONLY
165 ctok32.40 00000005 00000000 00000000 00001ab2 2**0 CONTENTS, RELOC, READONLY 165 ctok32.40 00000005 00000000 00000000 00001ab2 2**0 CONTENTS, RELOC, READONLY
166 LEXEC017 00000002 00000000 00000000 00001ab7 2**0 CONTENTS, READONLY 166 LEXEC017 00000002 00000000 00000000 00001ab7 2**0 CONTENTS, READONLY
<<<<<<< HEAD 167 LEXEC020 00000031 00000000 00000000 00001ab9 2**0 CONTENTS, READONLY
167 LEXEC020 0000003e 00000000 00000000 00001ab9 2**0 CONTENTS, READONLY 168 LEXECEXE 00000040 00000000 00000000 00001aea 2**0 CONTENTS, RELOC, READONLY
168 LEXECEXE 00000033 00000000 00000000 00001af7 2**0 CONTENTS, RELOC, READONLY 169 LEXECDYN 000000a6 00000000 00000000 00001b2a 2**0 CONTENTS, RELOC, READONLY
169 LEXECDYN 0000009b 00000000 00000000 00001b2a 2**0 CONTENTS, RELOC, READONLY 170 LEXEC025 00000041 00000000 00000000 00001bd0 2**0 CONTENTS, RELOC, READONLY
170 LEXEC025 00000041 00000000 00000000 00001bc5 2**0 CONTENTS, RELOC, READONLY
=======
167 LEXEC020 00000041 00000000 00000000 00001ab9 2**0 CONTENTS, READONLY
168 LEXECEXE 0000003f 00000000 00000000 00001afa 2**0 CONTENTS, RELOC, READONLY
169 LEXECDYN 0000008f 00000000 00000000 00001b39 2**0 CONTENTS, RELOC, READONLY
170 LEXEC025 00000020 00000000 00000000 00001bc8 2**0 CONTENTS, RELOC, READONLY
>>>>>>> i386-VDSO
SYMBOL TABLE: SYMBOL TABLE:
00000000 l d N2BSMA10 00000000 N2BSMA10 00000000 l d N2BSMA10 00000000 N2BSMA10
00000000 l d N2BFAS11 00000000 N2BFAS11 00000000 l d N2BFAS11 00000000 N2BFAS11
@@ -674,15 +667,9 @@ OFFSET TYPE VALUE
RELOCATION RECORDS FOR [LEXECDYN]: RELOCATION RECORDS FOR [LEXECDYN]:
OFFSET TYPE VALUE OFFSET TYPE VALUE
<<<<<<< HEAD
00000031 R_386_32 LEXEC025
00000095 R_386_32 LEXEC025
00000065 R_386_PC32 LEXEC020
=======
00000004 R_386_32 LEXEC025 00000004 R_386_32 LEXEC025
0000008a R_386_32 LEXEC025 000000a0 R_386_32 LEXEC025
0000005c R_386_PC32 LEXEC020 00000070 R_386_PC32 LEXEC020
>>>>>>> i386-VDSO
RELOCATION RECORDS FOR [LEXEC025]: RELOCATION RECORDS FOR [LEXEC025]:
OFFSET TYPE VALUE OFFSET TYPE VALUE