From 80e5e7dd75edbdf2997e15487fb3cc3489a3b4d2 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Tue, 13 Nov 2018 14:54:59 -0800 Subject: [PATCH] [Pal/Linux/security] adjust pal loader directory Now pal-Linux isn't created in Pal/src any more. Adjust its directory. Signed-off-by: Isaku Yamahata --- Pal/src/security/Linux/Makefile | 2 +- Pal/src/security/Linux/internal.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Pal/src/security/Linux/Makefile b/Pal/src/security/Linux/Makefile index 5ac289cb..5eaa83cd 100644 --- a/Pal/src/security/Linux/Makefile +++ b/Pal/src/security/Linux/Makefile @@ -3,7 +3,7 @@ LD = ld CFLAGS = -Wall -fPIC -O2 -std=c11 -Wall -U_FORTIFY_SOURCE \ -fno-stack-protector -fno-builtin \ - -DPAL_LOADER_PATH="$(abspath ../../libpal.so)" \ + -DRUNTIME_DIR=$(abspath $(RUNTIME_DIR)) \ -I. -I../../host/Linux/include -I../.. -I../../../include -I../../host/Linux \ -I../../../lib -I../../../linux-kernel/graphene LDFLAGS = -shared -nostdlib -z combreloc -z defs --version-script pal-sec.map -e start diff --git a/Pal/src/security/Linux/internal.h b/Pal/src/security/Linux/internal.h index bea8e51c..10ea237c 100644 --- a/Pal/src/security/Linux/internal.h +++ b/Pal/src/security/Linux/internal.h @@ -10,7 +10,10 @@ #include "api.h" -#define PAL_LOADER XSTRINGIFY(PAL_LOADER_PATH) +/* RUNTIME_FILE() is defined in pal_internal.h, and including pal_internal.h + * causes compile issue. So PAL_LOADER is defined without RUNTIME_FILE + * as workaround. */ +#define PAL_LOADER XSTRINGIFY(RUNTIME_DIR)"/pal-Linux" #ifdef __x86_64__ # include "sysdep-x86_64.h"