[Pal/Linux-SGX] Remove #undef __USE_POSIX199309 from linux_types.h

And the rest cascaded. Signed-off-by: Wojtek Porczyk <[email protected]>
gramineproject · Aug 23, 2021 · 807a4f1 · 807a4f1
1 parent e0c2577
commit 807a4f1
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 13 deletions.
diff --git a/Pal/src/host/Linux-SGX/generated-offsets.c b/Pal/src/host/Linux-SGX/generated-offsets.c
@@ -3,16  3,14 @@
 
 #include "ecall_types.h"
 #include "generated-offsets-build.h"
 #include "gsgx.h"
 #include "ocall_types.h"
 #include "pal.h"
-#include "pal_linux.h"
 #include "pal_linux_defs.h"
 #include "pal_security.h"
 #include "sgx_arch.h"
 #include "sgx_tls.h"
 
-#include "gsgx.h"
-
 __attribute__((__used__)) static void dummy(void) {
     /* defines in sgx_arch.h */
     DEFINE(SGX_FLAGS_DEBUG, SGX_FLAGS_DEBUG);

diff --git a/Pal/src/host/Linux-SGX/linux_types.h b/Pal/src/host/Linux-SGX/linux_types.h
@@ -1,22  1,20 @@
 #ifndef LINUX_TYPES_H
 #define LINUX_TYPES_H
 
-#include <linux/posix_types.h> /* needed for __kernel_off_t */
-#include <linux/socket.h>
-#include <linux/time.h>
-#define __timespec_defined
-#undef __USE_POSIX199309
 #include <asm/fcntl.h>
 #include <asm/posix_types.h>
 #include <asm/stat.h>
 #include <linux/poll.h>
 #include <linux/sched.h>
 #include <linux/socket.h>
 #include <linux/time.h>
 #include <linux/uio.h>
 #include <stdint.h>
 
 #include "sigset.h"
 
 typedef __kernel_off_t off_t;
 typedef __kernel_pid_t pid_t;
 
 #ifndef size_t
 typedef __kernel_size_t size_t;

diff --git a/Pal/src/host/Linux-SGX/pal_linux.h b/Pal/src/host/Linux-SGX/pal_linux.h
@@ -9,7  9,16 @@
 
 #include "api.h"
 #include "assert.h"
 
 /*
  * XXX this ifdef is because there is no mbedtls linked in untrusted PAL; this should be fixed by
  * cleaning up this header which has become a rubbish bin for everything that didn't have a better
  * place
  */
 #ifdef IN_ENCLAVE
 #include "crypto.h"
 #endif /* IN_ENCLAVE */
 
 #include "enclave_ocalls.h"
 #include "linux_types.h"
 #include "log.h"
@@ -37,8  46,6 @@ extern struct pal_linux_state {
     const char* runtime_dir;
 } g_linux_state;
 
-#define DEFAULT_BACKLOG 2048
-
 #define ACCESS_R 4
 #define ACCESS_W 2
 #define ACCESS_X 1

diff --git a/Pal/src/host/Linux-SGX/sgx_enclave.c b/Pal/src/host/Linux-SGX/sgx_enclave.c
@@ -7,6  7,7 @@
 #include <asm/ioctls.h>
 #include <asm/mman.h>
 #include <asm/socket.h>
 #include <limits.h>
 #include <linux/fs.h>
 #include <linux/futex.h>
 #include <linux/in.h>
@@ -29,6  30,8 @@
 #include "sgx_tls.h"
 #include "sigset.h"
 
 #define DEFAULT_BACKLOG 2048
 
 #define ODEBUG(code, ms) \
     do {                 \
     } while (0)

diff --git a/Pal/src/host/Linux-SGX/sgx_enclave.h b/Pal/src/host/Linux-SGX/sgx_enclave.h
@@ -1,5  1,4 @@
-#include "pal_linux.h"
-#include "pal_security.h"
 #include <stddef.h>
 
 int ecall_enclave_start(char* libpal_uri, char* args, size_t args_size, char* env, size_t env_size);
 

diff --git a/Pal/src/host/Linux-SGX/sgx_main.c b/Pal/src/host/Linux-SGX/sgx_main.c
@@ -12,7  12,7 @@
  * errors.
  */
 #include "pal_internal-arch.h"
-#include "pal_linux.h"
 #include "pal_linux_defs.h"
 #include "pal_linux_error.h"
 #include "pal_rtld.h"
 #include "hex.h"

diff --git a/Pal/src/host/Linux-SGX/sgx_perf_data.c b/Pal/src/host/Linux-SGX/sgx_perf_data.c
@@ -31,6  31,7 @@
 #include <asm/perf_regs.h>
 #include <assert.h>
 #include <linux/perf_event.h>
 #include <linux/fs.h>
 
 #include "perm.h"
 #include "sgx_internal.h"

diff --git a/Pal/src/host/Linux-SGX/sgx_profile.c b/Pal/src/host/Linux-SGX/sgx_profile.c
@@ -14,6  14,7 @@
 
 #include <assert.h>
 #include <errno.h>
 #include <linux/fs.h>
 #include <linux/limits.h>
 #include <stddef.h>