https://github.com/farzonl created
https://github.com/llvm/llvm-project/pull/133795
Reverts llvm/llvm-project#133619
>From 068da73e6dab35fdbd18c6b5c3ad1e0a9ed5a783 Mon Sep 17 00:00:00 2001
From: Farzon Lotfi <farz...@gmail.com>
Date: Mon, 31 Mar 2025 16:51:59 -0400
Subject: [PATCH] Revert "[Clang][Cmake] fix libtool duplicate member name
warnings (#133619)"
This reverts commit cc2b4326142e6df6755472edaf264a0af4fe599a.
---
clang/lib/CodeGen/CMakeLists.txt | 49 ++++++++++++++-----
clang/lib/CodeGen/TargetBuiltins/AMDGPU.cpp | 2 +-
.../lib/CodeGen/TargetBuiltins/CMakeLists.txt | 19 -------
clang/lib/CodeGen/Targets/CMakeLists.txt | 35 -------------
4 files changed, 38 insertions(+), 67 deletions(-)
delete mode 100644 clang/lib/CodeGen/TargetBuiltins/CMakeLists.txt
delete mode 100644 clang/lib/CodeGen/Targets/CMakeLists.txt
diff --git a/clang/lib/CodeGen/CMakeLists.txt b/clang/lib/CodeGen/CMakeLists.txt
index cdf9f909a3675..ebe2fbd7db295 100644
--- a/clang/lib/CodeGen/CMakeLists.txt
+++ b/clang/lib/CodeGen/CMakeLists.txt
@@ -116,8 +116,45 @@ add_clang_library(clangCodeGen
PatternInit.cpp
SanitizerMetadata.cpp
SwiftCallingConv.cpp
+ TargetBuiltins/ARM.cpp
+ TargetBuiltins/AMDGPU.cpp
+ TargetBuiltins/Hexagon.cpp
+ TargetBuiltins/NVPTX.cpp
+ TargetBuiltins/PPC.cpp
+ TargetBuiltins/RISCV.cpp
+ TargetBuiltins/SPIR.cpp
+ TargetBuiltins/SystemZ.cpp
+ TargetBuiltins/WebAssembly.cpp
+ TargetBuiltins/X86.cpp
TargetInfo.cpp
+ Targets/AArch64.cpp
+ Targets/AMDGPU.cpp
+ Targets/ARC.cpp
+ Targets/ARM.cpp
+ Targets/AVR.cpp
+ Targets/BPF.cpp
+ Targets/CSKY.cpp
+ Targets/DirectX.cpp
+ Targets/Hexagon.cpp
+ Targets/Lanai.cpp
+ Targets/LoongArch.cpp
+ Targets/M68k.cpp
+ Targets/MSP430.cpp
+ Targets/Mips.cpp
+ Targets/NVPTX.cpp
+ Targets/PNaCl.cpp
+ Targets/PPC.cpp
+ Targets/RISCV.cpp
+ Targets/SPIR.cpp
+ Targets/Sparc.cpp
+ Targets/SystemZ.cpp
+ Targets/TCE.cpp
+ Targets/VE.cpp
+ Targets/WebAssembly.cpp
+ Targets/X86.cpp
+ Targets/XCore.cpp
VarBypassDetector.cpp
+
DEPENDS
vt_gen
intrinsics_gen
@@ -133,16 +170,4 @@ add_clang_library(clangCodeGen
clangFrontend
clangLex
clangSerialization
- clangCodeGenTargetBuiltins
- clangCodeGenTargets
- )
-
- target_include_directories(clangCodeGen
- PUBLIC
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/TargetBuiltins
- ${CMAKE_CURRENT_SOURCE_DIR}/Targets
)
-
- add_subdirectory(TargetBuiltins)
- add_subdirectory(Targets)
diff --git a/clang/lib/CodeGen/TargetBuiltins/AMDGPU.cpp
b/clang/lib/CodeGen/TargetBuiltins/AMDGPU.cpp
index 577fee05d4af6..b56b739094ff3 100644
--- a/clang/lib/CodeGen/TargetBuiltins/AMDGPU.cpp
+++ b/clang/lib/CodeGen/TargetBuiltins/AMDGPU.cpp
@@ -1,4 +1,4 @@
-//===------- AMDGPU.cpp - Emit LLVM Code for builtins
---------------------===//
+//===------- AMDCPU.cpp - Emit LLVM Code for builtins
---------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/clang/lib/CodeGen/TargetBuiltins/CMakeLists.txt
b/clang/lib/CodeGen/TargetBuiltins/CMakeLists.txt
deleted file mode 100644
index 8526c063b4593..0000000000000
--- a/clang/lib/CodeGen/TargetBuiltins/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-add_clang_library(clangCodeGenTargetBuiltins STATIC
- ARM.cpp
- AMDGPU.cpp
- Hexagon.cpp
- NVPTX.cpp
- PPC.cpp
- RISCV.cpp
- SPIR.cpp
- SystemZ.cpp
- WebAssembly.cpp
- X86.cpp
-)
-
-target_link_libraries(clangCodeGenTargetBuiltins
- PRIVATE
- clangCodeGen
-)
diff --git a/clang/lib/CodeGen/Targets/CMakeLists.txt
b/clang/lib/CodeGen/Targets/CMakeLists.txt
deleted file mode 100644
index fd79b6191b379..0000000000000
--- a/clang/lib/CodeGen/Targets/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-add_clang_library(clangCodeGenTargets STATIC
- AArch64.cpp
- AMDGPU.cpp
- ARC.cpp
- ARM.cpp
- AVR.cpp
- BPF.cpp
- CSKY.cpp
- DirectX.cpp
- Hexagon.cpp
- Lanai.cpp
- LoongArch.cpp
- M68k.cpp
- MSP430.cpp
- Mips.cpp
- NVPTX.cpp
- PNaCl.cpp
- PPC.cpp
- RISCV.cpp
- SPIR.cpp
- Sparc.cpp
- SystemZ.cpp
- TCE.cpp
- VE.cpp
- WebAssembly.cpp
- X86.cpp
- XCore.cpp
-)
-
-target_link_libraries(clangCodeGenTargets
- PRIVATE
- clangCodeGen
-)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
