[LibOS,Pal] Move header files from Pal/lib/ under Pal/include/

LibOS/shim/src/Makefile

@@ -9,7 +9,7 @@ CFLAGS += -fPIC -Winline -Wwrite-strings \
 	  -Werror=implicit-function-declaration \
 	  $(cc-option, -Wnull-dereference) \
 	  -fno-stack-protector -fno-builtin -Wno-inline \
-	  -I../include -I../../../Pal/lib -I../../../Pal/include/pal \
+	  -I../include -I../../../Pal/include/lib -I../../../Pal/include/pal \
 	  -I../../../Pal/include/elf
 
 CFLAGS += -Wextra

LibOS/shim/test/regression/Makefile

@@ -23,7 +23,7 @@ CFLAGS-eventfd = -pthread
 CFLAGS-futex_bitset = -pthread
 CFLAGS-futex_requeue = -pthread
 CFLAGS-futex_wake_op = -pthread
-CFLAGS-spinlock += -I$(PALDIR)/../lib -pthread
+CFLAGS-spinlock += -I$(PALDIR)/../include/lib -pthread
 CFLAGS-sigprocmask += -pthread
 
 %: %.c

Pal/lib/pal_crypto.h → Pal/include/lib/pal_crypto.h

@@ -33,18 +33,18 @@
 #ifdef CRYPTO_USE_MBEDTLS
 #define CRYPTO_PROVIDER_SPECIFIED
 
-#include "crypto/mbedtls/include/mbedtls/cmac.h"
+#include "mbedtls/cmac.h"
 typedef struct AES LIB_AES_CONTEXT;
 
-#include "crypto/mbedtls/include/mbedtls/dhm.h"
-#include "crypto/mbedtls/include/mbedtls/rsa.h"
-#include "crypto/mbedtls/include/mbedtls/sha256.h"
+#include "mbedtls/dhm.h"
+#include "mbedtls/rsa.h"
+#include "mbedtls/sha256.h"
 
 typedef mbedtls_sha256_context LIB_SHA256_CONTEXT;
 
 /* DH_SIZE is tied to the choice of parameters in mbedtls_dh.c. */
 #define DH_SIZE 256
-#include "crypto/mbedtls/include/mbedtls/dhm.h"
+#include "mbedtls/dhm.h"
 typedef mbedtls_dhm_context LIB_DH_CONTEXT;
 typedef mbedtls_rsa_context LIB_RSA_KEY;
 typedef struct {
@@ -52,9 +52,9 @@ typedef struct {
     mbedtls_cipher_context_t ctx;
 } LIB_AESCMAC_CONTEXT;
 
-#include "crypto/mbedtls/include/mbedtls/ctr_drbg.h"
-#include "crypto/mbedtls/include/mbedtls/entropy.h"
-#include "crypto/mbedtls/include/mbedtls/ssl.h"
+#include "mbedtls/ctr_drbg.h"
+#include "mbedtls/entropy.h"
+#include "mbedtls/ssl.h"
 typedef struct {
     mbedtls_entropy_context entropy;
     mbedtls_ctr_drbg_context ctr_drbg;
@@ -130,7 +130,7 @@ int lib_Base64Encode(const uint8_t* src, size_t slen, char* dst, size_t* dlen);
 int lib_Base64Decode(const char *src, size_t slen, uint8_t* dst, size_t* dlen);
 
 #ifdef CRYPTO_USE_MBEDTLS
-#include "crypto/mbedtls/include/mbedtls/asn1.h"
+#include "mbedtls/asn1.h"
 enum asn1_tag {
     ASN1_BOOLEAN                = MBEDTLS_ASN1_BOOLEAN,
     ASN1_INTEGET                = MBEDTLS_ASN1_INTEGER,

Pal/lib/Makefile

@@ -2,7 +2,7 @@ include ../../Scripts/Makefile.configs
 include ../../Scripts/Makefile.rules
 include ../src/host/$(PAL_HOST)/Makefile.am
 
-CFLAGS += -I. -I../include -I../include/pal -Icrypto/mbedtls/include -I../include/host/$(PAL_HOST)
+CFLAGS += -I../include/lib -I../include -I../include/pal -Icrypto/mbedtls/include -I../include/host/$(PAL_HOST)
 
 subdirs = string stdlib network graphene crypto
 

Pal/regression/Makefile

@@ -2,7 +2,7 @@ include ../../Scripts/Makefile.configs
 include ../../Scripts/Makefile.rules
 
 CFLAGS	+= -fno-builtin -nostdlib \
-	  -I../include/pal -I../lib -I../src
+	  -I../include/pal -I../include/lib -I../src
 
 preloads = \
 	Preload1.so \

Pal/src/Makefile

@@ -20,8 +20,8 @@ OBJ_DIR = $(HOST_DIR)/.obj
 
 include host/$(PAL_HOST)/Makefile.am
 
-CFLAGS	+= -I. -I../include -I../include/pal -I../include/$(HOST_DIR) \
-	-I$(HOST_DIR) -I../lib
+CFLAGS += -I. -I../include -I../include/pal -I../include/$(HOST_DIR) \
+    -I$(HOST_DIR) -I../include/lib
 
 PAL_HOST_MACRO = $(shell echo $(PAL_HOST) | tr '[:lower:]' '[:upper:]' | tr '-' '_')
 

Pal/src/host/Linux-SGX/Makefile

@@ -5,9 +5,9 @@ ias_cert_url ?= https://certificates.trustedservices.intel.com/Intel_SGX_Attesta
 ias_cert_sha256 ?= e7b9113b647bc6bd421d4f140076a3acc31e410e01bf12883841e824cdaf1564
 ias_cert_file = quote/$(notdir $(ias_cert_url))
 
-CFLAGS	+= -I. -Iinclude -I../.. -I../../../include  -I../../../include/pal \
+CFLAGS += -I. -Iinclude -I../.. -I../../../include -I../../../include/pal \
 	-I../../../lib/crypto/mbedtls/include -I../../../include/host/Linux-SGX \
-	-I../../../lib -Isgx-driver
+	-I../../../include/lib -Isgx-driver
 ASFLAGS += -I. -I../.. -I../../../include
 
 host_files = libpal-Linux-SGX.a pal-sgx debugger/sgx_gdb.so pal.map generated_offsets.py

Pal/src/host/Linux/Makefile

@@ -2,7 +2,7 @@ include ../../../../Scripts/Makefile.configs
 include Makefile.am
 
 CFLAGS	+= -I. -Iinclude -I../.. -I../../../include -I../../../include/pal \
-	   -I../../../include/host/Linux -I../../../lib \
+	   -I../../../include/host/Linux -I../../../include/lib \
 	   -I../../../linux-kernel/graphene
 ASFLAGS += -I. -Iinclude -I../.. -I../../../include
 

Pal/src/host/Skeleton/Makefile

@@ -2,7 +2,7 @@ include ../../../../Scripts/Makefile.configs
 include Makefile.am
 
 CFLAGS  += -I. -I../.. -I../../../include  -I../../../include/pal \
-	-I../../../include/host/Skeleton -I../../../lib
+	-I../../../include/host/Skeleton -I../../../include/lib
 ASFLAGS += -I. -I../.. -I../../../include
 
 host_files = libpal-Skeleton.a pal.map

Pal/test/Makefile

@@ -2,7 +2,7 @@ include ../../Scripts/Makefile.configs
 include ../../Scripts/Makefile.rules
 
 CFLAGS += -fno-builtin -nostdlib -no-pie \
-	  -I../include/pal -I../lib
+	  -I../include/pal -I../include/lib
 
 executables = HelloWorld File Failure Thread Fork Event Process Exception \
 	      Memory Pipe Tcp Udp Yield Server Wait HandleSend Select Segment \

Scripts/Makefile.Test

@@ -22,8 +22,8 @@ CFLAGS += -Wno-unused-result
 
 CFLAGS-libos = -I$(SHIMDIR)/include -L$(SHIMDIR)/../glibc-build/libos
 
-CFLAGS-libos-debug = -I$(SHIMDIR)/include -I$(PALDIR)/../include/pal -I$(PALDIR)/../lib -fno-builtin -nostdlib
-CXXFLAGS-libos-debug = -I$(SHIMDIR)/include -I$(PALDIR)/../include/pal -I$(PALDIR)/../lib -fno-builtin -nostdlib
+CFLAGS-libos-debug = -I$(SHIMDIR)/include -I$(PALDIR)/../include/pal -I$(PALDIR)/../include/lib -fno-builtin -nostdlib
+CXXFLAGS-libos-debug = -I$(SHIMDIR)/include -I$(PALDIR)/../include/pal -I$(PALDIR)/../include/lib -fno-builtin -nostdlib
 LDFLAGS-libos-debug = -L$(SHIMDIR)/src -L$(PALDIR)/host/$(PAL_HOST) -Wl,-rpath-link=$(abspath $(RUNTIME)) -lpal -lsysdb_debug
 
 .PHONY: all