From f6ff7e3feb678b2b92e63a4b8c690fc8c46efaca Mon Sep 17 00:00:00 2001
From: Rong Tao <rtoax@foxmail.com>
Date: Sat, 2 Mar 2024 15:48:10 +0800
Subject: [PATCH] tests/hello: Patches and executables are compiled separately

And ULP_PIC macros are added.

TODO: If enable ULP_PIC, segvfault when apply ulpatch, i guess there are
some relocation handle failed.

Signed-off-by: Rong Tao <rtoax@foxmail.com>
---
 .gitignore           |  1 +
 tests/hello/Makefile | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 32d98bcf..f3cc5eda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ cmake_install.cmake
 # Patches
 *.patch
 *.ulp
+*.ulpo
 *.up
 
 # Temp
diff --git a/tests/hello/Makefile b/tests/hello/Makefile
index 4d5e872f..b9767e01 100644
--- a/tests/hello/Makefile
+++ b/tests/hello/Makefile
@@ -12,8 +12,13 @@ endif
 CFLAGS :=
 CFLAGS += -O0 -ggdb -g
 CFLAGS += -pthread
+CFLAGS += -D__ULP_DEV
+ifdef MCOUNT
+	CFLAGS += -pg
+endif
 
-TARGETS := hello hello-pie
+TARGETS := hello
+TARGETS += hello-pie
 TARGETS += test
 
 TARGETS_ULP := patch-print.ulp
@@ -25,10 +30,10 @@ TARGETS_ULP += patch-add-vars.ulp
 TARGETS_ULP += patch-failed-bss.ulp
 TARGETS_ULP += patch-pthread.ulp
 
-CFLAGS += -D__ULP_DEV
-
-ifdef MCOUNT
-	CFLAGS += -pg
+CFLAGS_ULP :=
+CFLAGS_ULP += -O0
+ifdef ULP_PIC
+	CFLAGS_ULP += -fpic
 endif
 
 build: ${TARGETS_ULP} ${TARGETS}
@@ -45,7 +50,11 @@ LDFLAGS_hello-pie := -pie
 	@echo -e "Compile  \033[1m$(<)\033[m to \033[1m$(@)\033[m"
 	$(CC) -o $(@) -c $(<) $(CFLAGS) $(CFLAGS_$(*))
 
-%.ulp: %.o
+%.ulpo: %.c
+	@echo -e "Compile  \033[1m$(<)\033[m to \033[1m$(@)\033[m"
+	$(CC) -o $(@) -c $(<) $(CFLAGS_ULP)
+
+%.ulp: %.ulpo
 	@echo -e "Gen ulpatch  \033[1m$(<)\033[m to \033[1m$(@)\033[m"
 	cp $(<) $(@).no-build-id
 	$(LD) -relocatable -o $(@) --build-id=sha1 $(<)
@@ -56,4 +65,4 @@ $(TARGETS): %:
 	strip $(@) -o $(@).stripped
 
 clean:
-	rm -f $(TARGETS) *.o *.ulp core.* *.ulp.no-build-id *.stripped
+	rm -f $(TARGETS) *.o *.ulp *.ulpo core.* *.ulp.no-build-id *.stripped