Workaround valgrind-3.24.0 botch of 'notrack' on i386

https://github.com/upx/upx/issues/890
	modified:   stub/src/i386-linux.elf-fold.S
	modified:   ../misc/testsuite/upx_testsuite_1-expected_sha256sums.sh
           plus generated .h .map
This commit is contained in:
John Reiser
2025-03-02 14:30:50 -08:00
parent 70f1ab8cb7
commit 903ca50391
4 changed files with 1179 additions and 1179 deletions
+1156 -1156
View File
File diff suppressed because it is too large Load Diff
+2 -1
View File
@@ -289,7 +289,8 @@ L60:
.byte 0x3e
.endm
mov al, __NR_munmap // eax was 0 from L60
NOTRACK; jmp [edi] // unmap ourselves via escape hatch, then goto entry
// valgrind-3.24.0 has bug with NOTRACK on i386
/*NOTRACK;*/ jmp [edi] // unmap ourselves via escape hatch, then goto entry
section SYSCALLS
// Sometimes linux enforces page-aligned address
+7 -8
View File
@@ -7,16 +7,15 @@ Name Origin Length Attributes
Linker script and memory map
.text 0x0000000000000000 0x9b6
.text 0x0000000000000000 0x191 tmp/i386-linux.elf-fold.o
.text 0x0000000000000000 0x9b2
.text 0x0000000000000000 0x190 tmp/i386-linux.elf-fold.o
0x0000000000000008 get_page_mask
0x0000000000000015 get_upxfn_path
*fill* 0x0000000000000191 0x3 00
.text 0x0000000000000194 0x0 tmp/i386-linux.elf-help_umf.o
.text 0x0000000000000194 0x0 tmp/i386-expand.o
.text 0x0000000000000194 0x822 tmp/i386-linux.elf-main2.o
0x00000000000002ec underlay
0x0000000000000862 upx_main
.text 0x0000000000000190 0x0 tmp/i386-linux.elf-help_umf.o
.text 0x0000000000000190 0x0 tmp/i386-expand.o
.text 0x0000000000000190 0x822 tmp/i386-linux.elf-main2.o
0x00000000000002e8 underlay
0x000000000000085e upx_main
HUMF_A 0x0000000000000000 0x5
HUMF_A 0x0000000000000000 0x5 tmp/i386-linux.elf-help_umf.o