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

Fix TLS linker warning

Browse source 
Fixes #565
Closes #577
Co-authored-by: tkchia <tkchia-cosmo@gmx.com>
This commit is contained in:
Justine Tunney 2022-09-04 00:03:37 -07:00
parent 1ef955c33b
commit 3c00d8c29c
2 changed files with 45 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ape/ape.lds
View file

@ -380,7 +380,9 @@ SECTIONS {
PROVIDE_HIDDEN(edata = .); PROVIDE_HIDDEN(edata = .);
KEEP(*(SORT_BY_NAME(.zip.*))) KEEP(*(SORT_BY_NAME(.zip.*)))
HIDDEN(_ezip = .); HIDDEN(_ezip = .);
. = ALIGN(PAGESIZE);
} :Ram } :Ram
. = ALIGN(PAGESIZE);
.tdata . : { .tdata . : {
_tdata_start = .; _tdata_start = .;
@ -389,7 +391,7 @@ SECTIONS {
. = ALIGN(16); . = ALIGN(16);
_tdata_end = .; _tdata_end = .;
. = ALIGN(PAGESIZE); . = ALIGN(PAGESIZE);
} :Tls } :Tls :Ram
. = ALIGN(PAGESIZE); . = ALIGN(PAGESIZE);
/*END: file content that's loaded by o/s */ /*END: file content that's loaded by o/s */

53
tool/decode/pe2.c
View file

@ -16,10 +16,11 @@
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │ │ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/ ╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/intrin/safemacros.internal.h"
#include "libc/calls/calls.h" #include "libc/calls/calls.h"
#include "libc/calls/struct/stat.h" #include "libc/calls/struct/stat.h"
#include "libc/fmt/conv.h" #include "libc/fmt/conv.h"
#include "libc/intrin/bits.h"
#include "libc/intrin/safemacros.internal.h"
#include "libc/nt/struct/imagedosheader.internal.h" #include "libc/nt/struct/imagedosheader.internal.h"
#include "libc/nt/struct/imagentheaders.internal.h" #include "libc/nt/struct/imagentheaders.internal.h"
#include "libc/nt/struct/imageoptionalheader.internal.h" #include "libc/nt/struct/imageoptionalheader.internal.h"
@ -205,15 +206,46 @@ static void showpeoptionalheader(struct NtImageOptionalHeader *opt) {
} }
} }
static void ShowIat(struct NtImageNtHeaders *pe, int64_t *iat, size_t n) { static void ShowIlt(int64_t *ilt) {
printf("\n"); printf("\n");
showtitle(basename(path), "windows", "import address table (iat)", NULL, showtitle(basename(path), "windows", "import lookup table (ilt)", 0, 0);
NULL); do {
printf("\n"); printf("\n");
size_t i; show(".quad", format(b1, "%#lx", *ilt),
for (i = 0; i < n; ++i) { gc(xasprintf("@%#lx", (intptr_t)ilt - (intptr_t)mz)));
show(".quad", format(b1, "%#lX", iat[i]), if (*ilt) {
gc(xasprintf("iat[%zu] @%#x", i, (intptr_t)(iat + i) - (intptr_t)pe))); char *hint = (char *)((intptr_t)mz + *ilt);
printf("/\t.short\t%d\t\t\t# @%#lx\n", READ16LE(hint),
(intptr_t)hint - (intptr_t)mz);
char *name = (char *)((intptr_t)mz + *ilt + 2);
printf("/\t.asciz\t%`'s\n", name);
printf("/\t.align\t2\n");
}
} while (*ilt++);
}
static void ShowIat(char *iat, size_t size) {
char *p, *e;
printf("\n");
showtitle(basename(path), "windows", "import address table (iat)", 0, 0);
for (p = iat, e = iat + size; p + 20 <= e; p += 20) {
printf("\n");
show(".long", format(b1, "%#x", READ32LE(p)),
gc(xasprintf("ImportLookupTable RVA @%#lx",
(intptr_t)p - (intptr_t)mz)));
show(".long", format(b1, "%#x", READ32LE(p + 4)), "TimeDateStamp");
show(".long", format(b1, "%#x", READ32LE(p + 8)), "ForwarderChain");
show(".long", format(b1, "%#x", READ32LE(p + 12)),
READ32LE(p + 12)
? gc(xasprintf("DllName RVA (%s)", (char *)mz + READ32LE(p + 12)))
: "DllName RVA");
show(".long", format(b1, "%#x", READ32LE(p + 16)),
"ImportAddressTable RVA");
}
for (p = iat, e = iat + size; p + 20 <= e; p += 20) {
if (READ32LE(p)) {
ShowIlt((void *)((intptr_t)mz + READ32LE(p)));
}
} }
} }
@ -242,11 +274,10 @@ static void showpeheader(struct NtImageNtHeaders *pe) {
showpeoptionalheader(pecheckaddress(mz, mzsize, &pe->OptionalHeader, showpeoptionalheader(pecheckaddress(mz, mzsize, &pe->OptionalHeader,
pe->FileHeader.SizeOfOptionalHeader)); pe->FileHeader.SizeOfOptionalHeader));
ShowIat( ShowIat(
pe, (void *)((intptr_t)mz +
(void *)((intptr_t)pe +
pe->OptionalHeader.DataDirectory[kNtImageDirectoryEntryImport] pe->OptionalHeader.DataDirectory[kNtImageDirectoryEntryImport]
.VirtualAddress), .VirtualAddress),
pe->OptionalHeader.DataDirectory[kNtImageDirectoryEntryImport].Size / 8); pe->OptionalHeader.DataDirectory[kNtImageDirectoryEntryImport].Size);
} }
static void showall(void) { static void showall(void) {