diff --git a/ape/aarch64.lds b/ape/aarch64.lds index b19d6b879..9e27fe36f 100644 --- a/ape/aarch64.lds +++ b/ape/aarch64.lds @@ -72,10 +72,10 @@ SECTIONS { KEEP(*(SORT_NONE(.fini))) } =0x1f2003d5 - . += CONSTANT(COMMONPAGESIZE); + . += CONSTANT(MAXPAGESIZE); .privileged : { - __privileged_start = .; + __privileged_start = ABSOLUTE(.) & -CONSTANT(MAXPAGESIZE); *(.privileged*) } =0x1f2003d6 @@ -121,8 +121,8 @@ SECTIONS { _etext = .; PROVIDE(etext = .); - . += CONSTANT(COMMONPAGESIZE); - . = DATA_SEGMENT_ALIGN(CONSTANT(COMMONPAGESIZE), CONSTANT(COMMONPAGESIZE)); + . += CONSTANT(MAXPAGESIZE); + . = DATA_SEGMENT_ALIGN(CONSTANT(MAXPAGESIZE), CONSTANT(COMMONPAGESIZE)); .eh_frame : ONLY_IF_RW { KEEP(*(.eh_frame)) diff --git a/libc/intrin/nocolor.c b/libc/intrin/nocolor.c index 60ad3efa9..d2ac956ab 100644 --- a/libc/intrin/nocolor.c +++ b/libc/intrin/nocolor.c @@ -17,6 +17,7 @@ │ PERFORMANCE OF THIS SOFTWARE. │ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "libc/dce.h" +#include "libc/intrin/kprintf.h" #include "libc/log/internal.h" #include "libc/nt/version.h" #include "libc/runtime/runtime.h" diff --git a/libc/runtime/hook.greg.c b/libc/runtime/hook.greg.c index c781336e5..5a7f931ca 100644 --- a/libc/runtime/hook.greg.c +++ b/libc/runtime/hook.greg.c @@ -18,6 +18,7 @@ ╚─────────────────────────────────────────────────────────────────────────────*/ #include "ape/sections.internal.h" #include "libc/calls/struct/sigset.h" +#include "libc/intrin/kprintf.h" #include "libc/limits.h" #include "libc/macros.internal.h" #include "libc/runtime/runtime.h" diff --git a/test/libc/calls/ioctl_test.c b/test/libc/calls/ioctl_test.c index a504d8ef6..78d048aaf 100644 --- a/test/libc/calls/ioctl_test.c +++ b/test/libc/calls/ioctl_test.c @@ -73,6 +73,7 @@ TEST(siocgifconf, test) { ASSERT_NE(-1, close(socketfd)); } +#ifdef __x86_64__ TEST(siocgifconf, mkntenvblock_systemroot) { if (__argc != 1) return; SPAWN(fork); @@ -81,3 +82,4 @@ TEST(siocgifconf, mkntenvblock_systemroot) { abort(); EXITS(0); } +#endif diff --git a/test/libc/sock/socket_test.c b/test/libc/sock/socket_test.c index c958b3212..cc84fa786 100644 --- a/test/libc/sock/socket_test.c +++ b/test/libc/sock/socket_test.c @@ -144,6 +144,8 @@ TEST(socket, canBeInheritedByForkedWorker) { WAIT(exit, 0); } +#ifdef __x86_64__ + __attribute__((__constructor__)) static void StdioPro(int argc, char *argv[]) { if (argc >= 2 && !strcmp(argv[1], "StdioProg")) { ASSERT_EQ(NULL, getenv("__STDIO_SOCKETS")); @@ -186,3 +188,5 @@ TEST(socket, canBeUsedAsExecutedStdio) { EXPECT_SYS(0, 0, close(3)); WAIT(exit, 0); } + +#endif /* __x86_64__ */