chaoticgd · chaoticgd · Jan 12, 2024 · Jan 12, 2024
diff --git a/thirdparty/demanglegnu/CMakeLists.txt b/thirdparty/demanglegnu/CMakeLists.txt
@@ -1,24 +1,27 @@
 add_library(demanglegnu STATIC
-	alloca.c
-	cp-demangle.c
-	cplus-dem.c
-	d-demangle.c
-	dyn-string.c
-	getopt1.c
-	getopt.c
-	rust-demangle.c
-	safe-ctype.c
-	xexit.c
-	xmalloc.c
-	xmemdup.c
-	xstrdup.c
+	src/alloca.c
+	src/cp-demangle.c
+	src/cplus-dem.c
+	src/d-demangle.c
+	src/dyn-string.c
+	src/getopt1.c
+	src/getopt.c
+	src/rust-demangle.c
+	src/safe-ctype.c
+	src/xexit.c
+	src/xmalloc.c
+	src/xmemdup.c
+	src/xstrdup.c
 )
-target_include_directories(demanglegnu PUBLIC .)
-target_compile_definitions(demanglegnu PRIVATE -DHAVE_LIMITS_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1)
+
+set(GNU_DEMANGLER_FLAGS -DHAVE_DECL_BASENAME=1 -DHAVE_LIMITS_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1)
+
+target_include_directories(demanglegnu PUBLIC include)
+target_compile_definitions(demanglegnu PUBLIC ${GNU_DEMANGLER_FLAGS})
 
 add_executable(demangler_fuzzer testsuite/demangler-fuzzer.c)
 add_executable(demangler_test testsuite/test-demangle.c)
 target_link_libraries(demangler_fuzzer demanglegnu)
 target_link_libraries(demangler_test demanglegnu)
-target_compile_definitions(demangler_fuzzer PRIVATE -DHAVE_LIMITS_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1)
-target_compile_definitions(demangler_test PRIVATE -DHAVE_LIMITS_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1)
+target_compile_definitions(demangler_fuzzer PUBLIC ${GNU_DEMANGLER_FLAGS})
+target_compile_definitions(demangler_test PUBLIC ${GNU_DEMANGLER_FLAGS})
diff --git a/thirdparty/demanglegnu/ansidecl.h → thirdparty/demanglegnu/include/ansidecl.h b/thirdparty/demanglegnu/ansidecl.h → thirdparty/demanglegnu/include/ansidecl.h
diff --git a/thirdparty/demanglegnu/cp-demangle.h → thirdparty/demanglegnu/include/cp-demangle.h b/thirdparty/demanglegnu/cp-demangle.h → thirdparty/demanglegnu/include/cp-demangle.h
diff --git a/thirdparty/demanglegnu/demangle.h → thirdparty/demanglegnu/include/demangle.h b/thirdparty/demanglegnu/demangle.h → thirdparty/demanglegnu/include/demangle.h
diff --git a/thirdparty/demanglegnu/dyn-string.h → thirdparty/demanglegnu/include/dyn-string.h b/thirdparty/demanglegnu/dyn-string.h → thirdparty/demanglegnu/include/dyn-string.h
diff --git a/thirdparty/demanglegnu/environ.h → thirdparty/demanglegnu/include/environ.h b/thirdparty/demanglegnu/environ.h → thirdparty/demanglegnu/include/environ.h
diff --git a/thirdparty/demanglegnu/getopt.h → thirdparty/demanglegnu/include/getopt.h b/thirdparty/demanglegnu/getopt.h → thirdparty/demanglegnu/include/getopt.h
diff --git a/thirdparty/demanglegnu/libiberty.h → thirdparty/demanglegnu/include/libiberty.h b/thirdparty/demanglegnu/libiberty.h → thirdparty/demanglegnu/include/libiberty.h
diff --git a/thirdparty/demanglegnu/safe-ctype.h → thirdparty/demanglegnu/include/safe-ctype.h b/thirdparty/demanglegnu/safe-ctype.h → thirdparty/demanglegnu/include/safe-ctype.h
diff --git a/thirdparty/demanglegnu/alloca.c → thirdparty/demanglegnu/src/alloca.c b/thirdparty/demanglegnu/alloca.c → thirdparty/demanglegnu/src/alloca.c
diff --git a/thirdparty/demanglegnu/argv.c → thirdparty/demanglegnu/src/argv.c b/thirdparty/demanglegnu/argv.c → thirdparty/demanglegnu/src/argv.c
diff --git a/thirdparty/demanglegnu/cp-demangle.c → thirdparty/demanglegnu/src/cp-demangle.c b/thirdparty/demanglegnu/cp-demangle.c → thirdparty/demanglegnu/src/cp-demangle.c
diff --git a/thirdparty/demanglegnu/cplus-dem.c → thirdparty/demanglegnu/src/cplus-dem.c b/thirdparty/demanglegnu/cplus-dem.c → thirdparty/demanglegnu/src/cplus-dem.c
diff --git a/thirdparty/demanglegnu/d-demangle.c → thirdparty/demanglegnu/src/d-demangle.c b/thirdparty/demanglegnu/d-demangle.c → thirdparty/demanglegnu/src/d-demangle.c
diff --git a/thirdparty/demanglegnu/dyn-string.c → thirdparty/demanglegnu/src/dyn-string.c b/thirdparty/demanglegnu/dyn-string.c → thirdparty/demanglegnu/src/dyn-string.c
diff --git a/thirdparty/demanglegnu/getopt.c → thirdparty/demanglegnu/src/getopt.c b/thirdparty/demanglegnu/getopt.c → thirdparty/demanglegnu/src/getopt.c
diff --git a/thirdparty/demanglegnu/getopt1.c → thirdparty/demanglegnu/src/getopt1.c b/thirdparty/demanglegnu/getopt1.c → thirdparty/demanglegnu/src/getopt1.c
diff --git a/thirdparty/demanglegnu/rust-demangle.c → thirdparty/demanglegnu/src/rust-demangle.c b/thirdparty/demanglegnu/rust-demangle.c → thirdparty/demanglegnu/src/rust-demangle.c
diff --git a/thirdparty/demanglegnu/safe-ctype.c → thirdparty/demanglegnu/src/safe-ctype.c b/thirdparty/demanglegnu/safe-ctype.c → thirdparty/demanglegnu/src/safe-ctype.c
diff --git a/thirdparty/demanglegnu/xexit.c → thirdparty/demanglegnu/src/xexit.c b/thirdparty/demanglegnu/xexit.c → thirdparty/demanglegnu/src/xexit.c
diff --git a/thirdparty/demanglegnu/xmalloc.c → thirdparty/demanglegnu/src/xmalloc.c b/thirdparty/demanglegnu/xmalloc.c → thirdparty/demanglegnu/src/xmalloc.c
diff --git a/thirdparty/demanglegnu/xmemdup.c → thirdparty/demanglegnu/src/xmemdup.c b/thirdparty/demanglegnu/xmemdup.c → thirdparty/demanglegnu/src/xmemdup.c
diff --git a/thirdparty/demanglegnu/xstrdup.c → thirdparty/demanglegnu/src/xstrdup.c b/thirdparty/demanglegnu/xstrdup.c → thirdparty/demanglegnu/src/xstrdup.c