Fix tests on aarch64

This commit is contained in:
Justine Tunney 2023-07-29 19:02:25 -07:00
parent 18bb5888e1
commit bd49ea1c3a
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
5 changed files with 12 additions and 4 deletions

View file

@ -72,10 +72,10 @@ SECTIONS {
KEEP(*(SORT_NONE(.fini))) KEEP(*(SORT_NONE(.fini)))
} =0x1f2003d5 } =0x1f2003d5
. += CONSTANT(COMMONPAGESIZE); . += CONSTANT(MAXPAGESIZE);
.privileged : { .privileged : {
__privileged_start = .; __privileged_start = ABSOLUTE(.) & -CONSTANT(MAXPAGESIZE);
*(.privileged*) *(.privileged*)
} =0x1f2003d6 } =0x1f2003d6
@ -121,8 +121,8 @@ SECTIONS {
_etext = .; _etext = .;
PROVIDE(etext = .); PROVIDE(etext = .);
. += CONSTANT(COMMONPAGESIZE); . += CONSTANT(MAXPAGESIZE);
. = DATA_SEGMENT_ALIGN(CONSTANT(COMMONPAGESIZE), CONSTANT(COMMONPAGESIZE)); . = DATA_SEGMENT_ALIGN(CONSTANT(MAXPAGESIZE), CONSTANT(COMMONPAGESIZE));
.eh_frame : ONLY_IF_RW { .eh_frame : ONLY_IF_RW {
KEEP(*(.eh_frame)) KEEP(*(.eh_frame))

View file

@ -17,6 +17,7 @@
PERFORMANCE OF THIS SOFTWARE. PERFORMANCE OF THIS SOFTWARE.
*/ */
#include "libc/dce.h" #include "libc/dce.h"
#include "libc/intrin/kprintf.h"
#include "libc/log/internal.h" #include "libc/log/internal.h"
#include "libc/nt/version.h" #include "libc/nt/version.h"
#include "libc/runtime/runtime.h" #include "libc/runtime/runtime.h"

View file

@ -18,6 +18,7 @@
*/ */
#include "ape/sections.internal.h" #include "ape/sections.internal.h"
#include "libc/calls/struct/sigset.h" #include "libc/calls/struct/sigset.h"
#include "libc/intrin/kprintf.h"
#include "libc/limits.h" #include "libc/limits.h"
#include "libc/macros.internal.h" #include "libc/macros.internal.h"
#include "libc/runtime/runtime.h" #include "libc/runtime/runtime.h"

View file

@ -73,6 +73,7 @@ TEST(siocgifconf, test) {
ASSERT_NE(-1, close(socketfd)); ASSERT_NE(-1, close(socketfd));
} }
#ifdef __x86_64__
TEST(siocgifconf, mkntenvblock_systemroot) { TEST(siocgifconf, mkntenvblock_systemroot) {
if (__argc != 1) return; if (__argc != 1) return;
SPAWN(fork); SPAWN(fork);
@ -81,3 +82,4 @@ TEST(siocgifconf, mkntenvblock_systemroot) {
abort(); abort();
EXITS(0); EXITS(0);
} }
#endif

View file

@ -144,6 +144,8 @@ TEST(socket, canBeInheritedByForkedWorker) {
WAIT(exit, 0); WAIT(exit, 0);
} }
#ifdef __x86_64__
__attribute__((__constructor__)) static void StdioPro(int argc, char *argv[]) { __attribute__((__constructor__)) static void StdioPro(int argc, char *argv[]) {
if (argc >= 2 && !strcmp(argv[1], "StdioProg")) { if (argc >= 2 && !strcmp(argv[1], "StdioProg")) {
ASSERT_EQ(NULL, getenv("__STDIO_SOCKETS")); ASSERT_EQ(NULL, getenv("__STDIO_SOCKETS"));
@ -186,3 +188,5 @@ TEST(socket, canBeUsedAsExecutedStdio) {
EXPECT_SYS(0, 0, close(3)); EXPECT_SYS(0, 0, close(3));
WAIT(exit, 0); WAIT(exit, 0);
} }
#endif /* __x86_64__ */