mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

#undef PAGE_{MASK,SIZE} to fix build problems on some machines.

Browse Source 
committer: mfx <mfx> 1139743226 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2006-02-12 11:20:26 +00:00
parent 24ce1ef5e7
commit 51ac5172f5
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_lx_elf.cpp
View File

@ -894,6 +894,8 @@ void PackLinuxElf64amd::pack3(OutputFile *fo, Filter &ft)
fo->write(&zero, frag); fo->write(&zero, frag);
len += frag; len += frag;
#undef PAGE_MASK
#undef PAGE_SIZE
#define PAGE_MASK (~0u<<12) #define PAGE_MASK (~0u<<12)
#define PAGE_SIZE (-PAGE_MASK) #define PAGE_SIZE (-PAGE_MASK)
upx_byte *const p = const_cast<upx_byte *>(getLoader()); upx_byte *const p = const_cast<upx_byte *>(getLoader());

1
src/p_lx_exc.cpp
View File

@ -215,6 +215,7 @@ PackLinuxI386::pack4(OutputFile *fo, Filter &ft)
fo->write(shstrtab, sizeof(shstrtab)); fo->write(shstrtab, sizeof(shstrtab));
#endif // } #endif // }
#undef PAGE_MASK
#define PAGE_MASK (~0u<<12) #define PAGE_MASK (~0u<<12)
// pre-calculate for benefit of runtime disappearing act via munmap() // pre-calculate for benefit of runtime disappearing act via munmap()
elfout.phdr[0].p_memsz = PAGE_MASK & (~PAGE_MASK + elfout.phdr[0].p_filesz); elfout.phdr[0].p_memsz = PAGE_MASK & (~PAGE_MASK + elfout.phdr[0].p_filesz);

5
src/p_lx_interp.cpp
View File

@ -129,12 +129,13 @@ void PackLinuxI386interp::pack2(OutputFile *fo, Filter &ft)
super::pack2(fo, ft); super::pack2(fo, ft);
} }
#undef PAGE_MASK
#define PAGE_MASK (~0u<<12) #define PAGE_MASK (~0u<<12)
void PackLinuxI386interp::pack3(OutputFile *fo, Filter &/*ft*/) void PackLinuxI386interp::pack3(OutputFile *fo, Filter &/*ft*/)
{ {
unsigned long base = getbase(phdri, ehdri.e_phnum); unsigned base = getbase(phdri, ehdri.e_phnum);
unsigned long sz = PAGE_MASK & (~PAGE_MASK + elfout.phdr[0].p_filesz); unsigned sz = PAGE_MASK & (~PAGE_MASK + elfout.phdr[0].p_filesz);
if (base < (0x11000 + sz)) { if (base < (0x11000 + sz)) {
base = 0x11000 + sz; base = 0x11000 + sz;
} }

2
src/p_mach.cpp
View File

@ -231,6 +231,8 @@ PackMachPPC32::pack2(OutputFile *fo, Filter &ft) // append compressed body
segcmdo.filesize = fo->getBytesWritten(); segcmdo.filesize = fo->getBytesWritten();
} }
#undef PAGE_MASK
#undef PAGE_SIZE
#define PAGE_MASK (~0u<<12) #define PAGE_MASK (~0u<<12)
#define PAGE_SIZE -PAGE_MASK #define PAGE_SIZE -PAGE_MASK
void void