Merge pull request #968 from compnerd/collision

Catfish-Man · web-flow · commit 0a1497d91412 · 2025-01-24T10:24:23.000-08:00
build: rename `LLVMDemangle` to `llvmDemangle`
diff --git a/lib/llvm/Demangle/CMakeLists.txt b/lib/llvm/Demangle/CMakeLists.txt
@@ -1,6 +1,6 @@
-add_llbuild_library(LLVMDemangle STATIC
+add_llbuild_library(llvmDemangle STATIC
     ItaniumDemangle.cpp
     MicrosoftDemangle.cpp
 )
 
-set_property(GLOBAL APPEND PROPERTY LLBuild_EXPORTS LLVMDemangle)
+set_property(GLOBAL APPEND PROPERTY LLBuild_EXPORTS llvmDemangle)
diff --git a/lib/llvm/Support/CMakeLists.txt b/lib/llvm/Support/CMakeLists.txt
@@ -55,7 +55,7 @@ raw_ostream.cpp
 
 
 target_link_libraries(llvmSupport PRIVATE
-  LLVMDemangle
+  llvmDemangle
   Threads::Threads
   ${CMAKE_DL_LIBS})
 
diff --git a/tests/Examples/buildsystem-capi.llbuild b/tests/Examples/buildsystem-capi.llbuild
@@ -1,6 +1,6 @@
 # Check that the BuildSystem C API example builds and runs correctly.
 #
-# RUN: %clangxx -o %t.exe -x c++ %{srcroot}/examples/c-api/buildsystem/main.c -I %{srcroot}/products/libllbuild/include -lllbuild -lllbuildBuildSystem -lllbuildCore -lllbuildBasic -lllvmSupport -lLLVMDemangle -L %{llbuild-lib-dir} -Werror -Xlinker %{sqlite} %{curses} %{threads} %{dl}
+# RUN: %clangxx -o %t.exe -x c++ %{srcroot}/examples/c-api/buildsystem/main.c -I %{srcroot}/products/libllbuild/include -lllbuild -lllbuildBuildSystem -lllbuildCore -lllbuildBasic -lllvmSupport -lllvmDemangle -L %{llbuild-lib-dir} -Werror -Xlinker %{sqlite} %{curses} %{threads} %{dl}
 # RUN: env DYLD_LIBRARY_PATH=%{llbuild-lib-dir} LD_LIBRARY_PATH=%{llbuild-lib-dir} %t.exe %s > %t.out
 # RUN: %{FileCheck} %s --input-file %t.out
 #
diff --git a/utils/import-llvm/cmake/demangleCMakeLists.txt b/utils/import-llvm/cmake/demangleCMakeLists.txt
@@ -1,4 +1,4 @@
-add_llbuild_library(LLVMDemangle
+add_llbuild_library(llvmDemangle
     ItaniumDemangle.cpp
     MicrosoftDemangle.cpp
 )
diff --git a/utils/import-llvm/cmake/supportCMakeLists.txt b/utils/import-llvm/cmake/supportCMakeLists.txt
@@ -55,7 +55,7 @@ raw_ostream.cpp
 
 
 target_link_libraries(llvmSupport PRIVATE
-  LLVMDemangle
+  llvmDemangle
   Threads::Threads
   ${CMAKE_DL_LIBS})
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-add_llbuild_library(LLVMDemangle STATIC`
	`1`	`+add_llbuild_library(llvmDemangle STATIC`
`2`	`2`	`ItaniumDemangle.cpp`
`3`	`3`	`MicrosoftDemangle.cpp`
`4`	`4`	`)`
`5`	`5`
`6`		`-set_property(GLOBAL APPEND PROPERTY LLBuild_EXPORTS LLVMDemangle)`
	`6`	`+set_property(GLOBAL APPEND PROPERTY LLBuild_EXPORTS llvmDemangle)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# Check that the BuildSystem C API example builds and runs correctly.`
`2`	`2`	`#`
`3`		`-# RUN: %clangxx -o %t.exe -x c++ %{srcroot}/examples/c-api/buildsystem/main.c -I %{srcroot}/products/libllbuild/include -lllbuild -lllbuildBuildSystem -lllbuildCore -lllbuildBasic -lllvmSupport -lLLVMDemangle -L %{llbuild-lib-dir} -Werror -Xlinker %{sqlite} %{curses} %{threads} %{dl}`
	`3`	`+# RUN: %clangxx -o %t.exe -x c++ %{srcroot}/examples/c-api/buildsystem/main.c -I %{srcroot}/products/libllbuild/include -lllbuild -lllbuildBuildSystem -lllbuildCore -lllbuildBasic -lllvmSupport -lllvmDemangle -L %{llbuild-lib-dir} -Werror -Xlinker %{sqlite} %{curses} %{threads} %{dl}`
`4`	`4`	`# RUN: env DYLD_LIBRARY_PATH=%{llbuild-lib-dir} LD_LIBRARY_PATH=%{llbuild-lib-dir} %t.exe %s > %t.out`
`5`	`5`	`# RUN: %{FileCheck} %s --input-file %t.out`
`6`	`6`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-add_llbuild_library(LLVMDemangle`
	`1`	`+add_llbuild_library(llvmDemangle`
`2`	`2`	`ItaniumDemangle.cpp`
`3`	`3`	`MicrosoftDemangle.cpp`
`4`	`4`	`)`