From 97b683ed3cbeeb059e5ad3de8f884db734447d56 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Sun, 24 Mar 2019 23:08:10 -0700 Subject: Fix build with newer newlib --- pk/elf.c | 4 ++-- pk/syscall.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pk/elf.c b/pk/elf.c index c154f7e..43810ec 100644 --- a/pk/elf.c +++ b/pk/elf.c @@ -1,14 +1,14 @@ // See LICENSE for license details. -#include "mmap.h" #include "pk.h" #include "mtrap.h" #include "boot.h" #include "bits.h" +#include "elf.h" #include #include -#include #include +#include "mmap.h" /** * The protection flags are in the p_flags section of the program header. diff --git a/pk/syscall.h b/pk/syscall.h index 963158e..478ea61 100644 --- a/pk/syscall.h +++ b/pk/syscall.h @@ -68,6 +68,7 @@ #define ERR_PTR(x) ((void*)(long)(x)) #define PTR_ERR(x) ((long)(x)) +#undef AT_FDCWD #define AT_FDCWD -100 long do_syscall(long a0, long a1, long a2, long a3, long a4, long a5, unsigned long n); -- cgit v1.1