CMakeLists.txt: Good link_libraries() depends

Signed-off-by: Rong Tao <[email protected]>
Rtoax · Jun 12, 2024 · 38f95d5 · 38f95d5
1 parent 003e627
commit 38f95d5
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 50 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -12,9 +12,9 @@ find_library(ELF elf /usr/lib64)
 find_library(RT rt /usr/lib64)
 
 link_libraries(${ELF} ${RT}
-	ulpatch_arch
-	ulpatch_utils
 	ulpatch_elf
+	ulpatch_patch
+	ulpatch_utils
 )
 add_definitions(-MD -Wall -Werror -D_GNU_SOURCE -Wuninitialized -Wreturn-type -pg)
 

diff --git a/src/elf/CMakeLists.txt b/src/elf/CMakeLists.txt
@@ -7,7 +7,6 @@ find_library(ELF elf /usr/lib64)
 
 link_libraries(${ELF}
 	ulpatch_utils
-	ulpatch_patch
 )
 
 add_definitions(-MD -Wall -Werror -D_GNU_SOURCE -Wuninitialized -Wreturn-type)

diff --git a/src/elf/elf_api.h b/src/elf/elf_api.h
@@ -134,6 +134,7 @@ int fprint_symbol(FILE *fp, struct symbol *s, int firstline);
  */
 int print_sym(const GElf_Sym *sym, const char *symname, const char *vername);
 int is_undef_symbol(const GElf_Sym *sym);
+bool is_ftrace_entry(char *func);
 
 /* ELF Note api */
 int handle_notes(struct elf_file *elf, GElf_Shdr *shdr, Elf_Scn *scn);

diff --git a/src/elf/symbol.c b/src/elf/symbol.c
@@ -82,6 +82,30 @@ int print_sym(const GElf_Sym *sym, const char *symname, const char *vername)
 	return 0;
 }
 
+const static char *___ftrace_entry_funcs[] = {
+	"__cyg_profile_func_enter",
+	"__fentry__",
+	"mcount",
+	"_mcount",
+	"__gnu_mcount_nc",
+};
+
+/* If compile with -pg, there might be hava mcount() */
+bool is_ftrace_entry(char *func)
+{
+	int i;
+	bool ret = false;
+
+	for (i = 0; i < ARRAY_SIZE(___ftrace_entry_funcs); i++) {
+		if (!strcmp(___ftrace_entry_funcs[i], func)) {
+			ret = true;
+			break;
+		}
+	}
+
+	return ret;
+}
+
 int is_undef_symbol(const GElf_Sym *sym)
 {
 	return sym->st_shndx == SHN_UNDEF || sym->st_shndx >= SHN_LORESERVE;

diff --git a/src/patch/CMakeLists.txt b/src/patch/CMakeLists.txt
@@ -16,7 +16,6 @@ link_libraries(${ELF}
 add_definitions(-MD -Wall -Werror -D_GNU_SOURCE -Wuninitialized -Wreturn-type)
 
 add_library(ulpatch_patch STATIC
-	ftrace.c
 	patch.c
 )
 

diff --git a/src/patch/ftrace.c b/src/patch/ftrace.c
diff --git a/src/patch/patch.h b/src/patch/patch.h
@@ -82,8 +82,6 @@ struct jmp_table_entry {
 
 struct task_struct;
 
-bool is_ftrace_entry(char *func);
-
 extern void _ftrace_mcount(void);
 extern void _ftrace_mcount_return(void);