https://github.com/farzonl created
https://github.com/llvm/llvm-project/pull/134656
Reverts llvm/llvm-project#133850
>From 6de19ec12771b19d50f248221006724b3bbbd869 Mon Sep 17 00:00:00 2001
From: Farzon Lotfi <farz...@gmail.com>
Date: Mon, 7 Apr 2025 09:59:24 -0400
Subject: [PATCH] =?UTF-8?q?Revert=20"Reland=20[Clang][Cmake]=20fix=20libto?=
=?UTF-8?q?ol=20duplicate=20member=20name=20warnings=20(#13=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 0d71d9ab28d626e85a0085a50ff634f76a950ce0.
---
clang/lib/CodeGen/CMakeLists.txt | 49 ++++++++++++++-----
.../{Targets => }/HLSLBufferLayoutBuilder.cpp | 0
clang/lib/CodeGen/TargetBuiltins/AMDGPU.cpp | 2 +-
.../lib/CodeGen/TargetBuiltins/CMakeLists.txt | 14 ------
clang/lib/CodeGen/Targets/CMakeLists.txt | 31 ------------
5 files changed, 38 insertions(+), 58 deletions(-)
rename clang/lib/CodeGen/{Targets => }/HLSLBufferLayoutBuilder.cpp (100%)
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 7c627fc1cdb57..ebe2fbd7db295 100644
--- a/clang/lib/CodeGen/CMakeLists.txt
+++ b/clang/lib/CodeGen/CMakeLists.txt
@@ -107,6 +107,7 @@ add_clang_library(clangCodeGen
ConstantInitBuilder.cpp
CoverageMappingGen.cpp
ItaniumCXXABI.cpp
+ HLSLBufferLayoutBuilder.cpp
LinkInModulesPass.cpp
MacroPPCallbacks.cpp
MicrosoftCXXABI.cpp
@@ -115,7 +116,43 @@ 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
@@ -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/Targets/HLSLBufferLayoutBuilder.cpp
b/clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp
similarity index 100%
rename from clang/lib/CodeGen/Targets/HLSLBufferLayoutBuilder.cpp
rename to clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp
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 76be68a11d02a..0000000000000
--- a/clang/lib/CodeGen/TargetBuiltins/CMakeLists.txt
+++ /dev/null
@@ -1,14 +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
-)
diff --git a/clang/lib/CodeGen/Targets/CMakeLists.txt
b/clang/lib/CodeGen/Targets/CMakeLists.txt
deleted file mode 100644
index 6cf4167e2cda2..0000000000000
--- a/clang/lib/CodeGen/Targets/CMakeLists.txt
+++ /dev/null
@@ -1,31 +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
- HLSLBufferLayoutBuilder.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
-)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
