Browse Source

[Pal/regression] Rename .so.c files to .c files

Isaku Yamahata 4 years ago
parent
commit
58e5139e74
3 changed files with 39 additions and 3 deletions
  1. 39 3
      Pal/regression/Makefile
  2. 0 0
      Pal/regression/Preload1.c
  3. 0 0
      Pal/regression/Preload2.c

+ 39 - 3
Pal/regression/Makefile

@@ -4,8 +4,39 @@ CC	= gcc
 CFLAGS	= -Wall -O2 -std=c11 -fno-builtin -nostdlib \
 	  -I../include/pal -I../lib -I../src
 
-preloads    = $(patsubst %.c,%,$(wildcard *.so.c))
-executables = $(filter-out $(preloads),$(patsubst %.c,%,$(wildcard *.c))) ..Bootstrap
+preloads = \
+	Preload1.so \
+	Preload2.so
+
+executables = \
+	..Bootstrap \
+	Attestation \
+	AtomicMath \
+	AvxDisable \
+	Bootstrap \
+	Bootstrap2 \
+	Bootstrap3 \
+	Bootstrap7 \
+	Directory \
+	Event \
+	Exception \
+	Exit \
+	File \
+	Hex \
+	Memory \
+	Misc \
+	Pipe \
+	Process \
+	Process2 \
+	Process3 \
+	Semaphore \
+	SendHandle \
+	Socket \
+	Symbols \
+	Thread \
+	Thread2 \
+	normalize_path
+
 manifests   = manifest $(patsubst %.manifest.template,%.manifest,$(wildcard *.manifest.template))
 
 target = $(executables) $(manifests)
@@ -62,11 +93,16 @@ manifest: manifest.template
 
 CFLAGS-AvxDisable += -mavx
 
+# workaround: File.manifest.template has strange reference
+# to ../regression/File
+../regression/File: | File
+	@true
+
 ifeq ($(findstring x86_64,$(SYS))$(findstring linux,$(SYS)),x86_64linux)
 LDLIBS-preloads = ../src/user_shared_start.o $(graphene_lib) $(pal_lib)
 $(preloads): CFLAGS += -shared -fPIC
 $(preloads): LDLIBS = $(LDLIBS-preloads)
-$(preloads): %.so: %.so.c $(LDLIBS-preloads)
+$(preloads): %.so: %.c $(LDLIBS-preloads)
 	$(call cmd,csingle)
 
 LDLIBS-executables = ../src/user_start.o $(graphene_lib) $(pal_lib) $(preloads)

+ 0 - 0
Pal/regression/Preload1.so.c → Pal/regression/Preload1.c


+ 0 - 0
Pal/regression/Preload2.so.c → Pal/regression/Preload2.c