Revert "Reland [Clang][Cmake] fix libtool duplicate member name warnings" #134656
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-backend-amdgpu @llvm/pr-subscribers-clang Author: Farzon Lotfi (farzonl) ChangesReverts llvm/llvm-project#133850 Full diff: https://github.com/llvm/llvm-project/pull/134656.diff 5 Files Affected:
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
-)
|
Member
|
@llvm/pr-subscribers-clang-codegen Author: Farzon Lotfi (farzonl) ChangesReverts llvm/llvm-project#133850 Full diff: https://github.com/llvm/llvm-project/pull/134656.diff 5 Files Affected:
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
-)
|
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/161/builds/5223 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #133850