mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-30 16:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix build determinism issue

Browse source
This commit is contained in:
Justine Tunney 2024-07-27 19:03:32 -07:00
parent 81dd9639ed
commit 32292aee84
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
1 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tool/build/lib/elfwriter_zip.c
View file

@ -63,6 +63,13 @@ static int DetermineVersionNeededToExtract(int method) {
} }
} }
static int NormalizeMode(int mode) {
int res = mode & S_IFMT;
if (mode & 0111)
res |= 0111;
return res | 0644;
}
static unsigned char *EmitZipLfileHdr(unsigned char *p, const void *name, static unsigned char *EmitZipLfileHdr(unsigned char *p, const void *name,
size_t namesize, uint32_t crc, size_t namesize, uint32_t crc,
uint8_t era, uint16_t gflags, uint8_t era, uint16_t gflags,
@ -87,10 +94,10 @@ static unsigned char *EmitZipLfileHdr(unsigned char *p, const void *name,
static void EmitZipCdirHdr(unsigned char *p, const void *name, size_t namesize, static void EmitZipCdirHdr(unsigned char *p, const void *name, size_t namesize,
uint32_t crc, uint8_t era, uint16_t gflags, uint32_t crc, uint8_t era, uint16_t gflags,
uint16_t method, uint16_t mtime, uint16_t mdate, uint16_t method, uint16_t mtime, uint16_t mdate,
uint16_t iattrs, uint16_t dosmode, uint16_t unixmode, uint16_t iattrs, uint16_t unixmode, size_t compsize,
size_t compsize, size_t uncompsize, size_t uncompsize, size_t commentsize,
size_t commentsize, struct timespec mtim, struct timespec mtim, struct timespec atim,
struct timespec atim, struct timespec ctim) { struct timespec ctim) {
uint64_t mt, at, ct; uint64_t mt, at, ct;
p = WRITE32LE(p, kZipCfileHdrMagic); p = WRITE32LE(p, kZipCfileHdrMagic);
*p++ = kZipCosmopolitanVersion; *p++ = kZipCosmopolitanVersion;
@ -111,8 +118,8 @@ static void EmitZipCdirHdr(unsigned char *p, const void *name, size_t namesize,
p = WRITE16LE(p, commentsize); p = WRITE16LE(p, commentsize);
p = WRITE16LE(p, 0); /* disk */ p = WRITE16LE(p, 0); /* disk */
p = WRITE16LE(p, iattrs); p = WRITE16LE(p, iattrs);
p = WRITE16LE(p, dosmode); p = WRITE16LE(p, 0);
p = WRITE16LE(p, unixmode); p = WRITE16LE(p, NormalizeMode(unixmode));
p = WRITE32LE(p, 0); /* RELOCATE ME (kZipCfileOffsetOffset) */ p = WRITE32LE(p, 0); /* RELOCATE ME (kZipCfileOffsetOffset) */
/* 46 */ /* 46 */
memcpy(p, name, namesize); memcpy(p, name, namesize);
@ -142,8 +149,8 @@ void elfwriter_zip(struct ElfWriter *elf, const char *symbol, const char *cname,
uint32_t crc; uint32_t crc;
unsigned char *lfile, *cfile; unsigned char *lfile, *cfile;
struct ElfWriterSymRef lfilesym; struct ElfWriterSymRef lfilesym;
uint16_t method, gflags, mtime, mdate, iattrs;
size_t lfilehdrsize, uncompsize, compsize, commentsize; size_t lfilehdrsize, uncompsize, compsize, commentsize;
uint16_t method, gflags, mtime, mdate, iattrs, dosmode;
CHECK_NE(0, mtim.tv_sec); CHECK_NE(0, mtim.tv_sec);
@ -168,7 +175,6 @@ void elfwriter_zip(struct ElfWriter *elf, const char *symbol, const char *cname,
if (S_ISREG(mode) && istext(data, size)) { if (S_ISREG(mode) && istext(data, size)) {
iattrs |= kZipIattrText; iattrs |= kZipIattrText;
} }
dosmode = !(mode & 0200) ? kNtFileAttributeReadonly : 0;
method = ShouldCompress(name, namesize, data, size, nocompress) method = ShouldCompress(name, namesize, data, size, nocompress)
? kZipCompressionDeflate ? kZipCompressionDeflate
: kZipCompressionNone; : kZipCompressionNone;
@ -215,8 +221,8 @@ void elfwriter_zip(struct ElfWriter *elf, const char *symbol, const char *cname,
elfwriter_startsection(elf, ".zip.cdir", SHT_PROGBITS, 0); elfwriter_startsection(elf, ".zip.cdir", SHT_PROGBITS, 0);
EmitZipCdirHdr( EmitZipCdirHdr(
(cfile = elfwriter_reserve(elf, ZIP_CFILE_HDR_SIZE + namesize)), name, (cfile = elfwriter_reserve(elf, ZIP_CFILE_HDR_SIZE + namesize)), name,
namesize, crc, era, gflags, method, mtime, mdate, iattrs, dosmode, mode, namesize, crc, era, gflags, method, mtime, mdate, iattrs, mode, compsize,
compsize, uncompsize, commentsize, mtim, atim, ctim); uncompsize, commentsize, mtim, atim, ctim);
elfwriter_appendsym(elf, gc(xasprintf("%s%s", "zip+cdir:", name)), elfwriter_appendsym(elf, gc(xasprintf("%s%s", "zip+cdir:", name)),
ELF64_ST_INFO(STB_LOCAL, STT_OBJECT), STV_DEFAULT, 0, ELF64_ST_INFO(STB_LOCAL, STT_OBJECT), STV_DEFAULT, 0,
ZIP_CFILE_HDR_SIZE + namesize); ZIP_CFILE_HDR_SIZE + namesize);