commit 579a7dabebdf53e6f2c113cd9783b407e0170f4e
author Antonio Maiorano <amaiorano@google.com> Mon Jul 20 12:14:10 2020 -0400
committer Antonio Maiorano <amaiorano@google.com> Tue Jul 21 14:07:47 2020 +0000
tree 56a2219dfe55739d9d0a565f8b26b6dcab189ec7
parent 8fc641b6a8cff94427cc273318dba0c42efe55cc

Fix LLVM-10 CMake build

Some of the files for LLVM 10 were conditionally compiled for Debug
builds; however, two of these were also in the main source list:

${LLVM_DIR}/lib/Analysis/RegionInfo.cpp
${LLVM_DIR}/lib/Support/Debug.cpp

This lead to linker errors for missing symbols when, for e.g.,
Support/Debug.cpp was built because Support/circular_raw_ostream.cpp
was not compiled.

I decided to just fold in these few Debug-only sources into the main
list to keep it simple and similar to how LLVM 7 was being built.

Bug: b/152339534
Change-Id: Ie4dda85b3323f5036d29fd80908b1925b6c86853
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/46708
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

third_party/llvm-10.0/CMakeLists.txt

diff --git a/third_party/llvm-10.0/CMakeLists.txt b/third_party/llvm-10.0/CMakeLists.txt
index c201a1f..b1424ef 100644
--- a/third_party/llvm-10.0/CMakeLists.txt
+++ b/third_party/llvm-10.0/CMakeLists.txt
@@ -78,6 +78,7 @@
     ${LLVM_DIR}/lib/Analysis/ProfileSummaryInfo.cpp
     ${LLVM_DIR}/lib/Analysis/PtrUseVisitor.cpp
     ${LLVM_DIR}/lib/Analysis/RegionInfo.cpp
+    ${LLVM_DIR}/lib/Analysis/RegionPrinter.cpp
     ${LLVM_DIR}/lib/Analysis/ScalarEvolution.cpp
     ${LLVM_DIR}/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp
     ${LLVM_DIR}/lib/Analysis/ScalarEvolutionExpander.cpp
@@ -92,6 +93,7 @@
     ${LLVM_DIR}/lib/Analysis/ValueLatticeUtils.cpp
     ${LLVM_DIR}/lib/Analysis/ValueTracking.cpp
     ${LLVM_DIR}/lib/Analysis/VectorUtils.cpp
+    ${LLVM_DIR}/lib/Analysis/VFABIDemangling.cpp
     ${LLVM_DIR}/lib/BinaryFormat/Dwarf.cpp
     ${LLVM_DIR}/lib/BinaryFormat/Magic.cpp
     ${LLVM_DIR}/lib/BinaryFormat/Wasm.cpp
@@ -460,6 +462,7 @@
     ${LLVM_DIR}/lib/MC/MCAsmInfoCOFF.cpp
     ${LLVM_DIR}/lib/MC/MCAsmInfoDarwin.cpp
     ${LLVM_DIR}/lib/MC/MCAsmInfoELF.cpp
+    ${LLVM_DIR}/lib/MC/MCAsmMacro.cpp
     ${LLVM_DIR}/lib/MC/MCAsmStreamer.cpp
     ${LLVM_DIR}/lib/MC/MCAssembler.cpp
     ${LLVM_DIR}/lib/MC/MCCodeEmitter.cpp
@@ -564,6 +567,7 @@
     ${LLVM_DIR}/lib/Support/BlockFrequency.cpp
     ${LLVM_DIR}/lib/Support/BranchProbability.cpp
     ${LLVM_DIR}/lib/Support/Chrono.cpp
+    ${LLVM_DIR}/lib/Support/circular_raw_ostream.cpp
     ${LLVM_DIR}/lib/Support/CodeGenCoverage.cpp
     ${LLVM_DIR}/lib/Support/CommandLine.cpp
     ${LLVM_DIR}/lib/Support/Compression.cpp
@@ -592,6 +596,7 @@
     ${LLVM_DIR}/lib/Support/KnownBits.cpp
     ${LLVM_DIR}/lib/Support/LEB128.cpp
     ${LLVM_DIR}/lib/Support/LineIterator.cpp
+    ${LLVM_DIR}/lib/Support/Locale.cpp
     ${LLVM_DIR}/lib/Support/LowLevelType.cpp
     ${LLVM_DIR}/lib/Support/ManagedStatic.cpp
     ${LLVM_DIR}/lib/Support/MathExtras.cpp
@@ -810,18 +815,6 @@
     ${LLVM_DIR}/lib/Transforms/Vectorize/VPlanVerifier.cpp
 )
 
-if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-    list(APPEND LLVM_LIST
-        ${LLVM_DIR}/lib/Analysis/RegionInfo.cpp
-        ${LLVM_DIR}/lib/Analysis/RegionPrinter.cpp
-        ${LLVM_DIR}/lib/Analysis/VFABIDemangling.cpp
-        ${LLVM_DIR}/lib/MC/MCAsmMacro.cpp
-        ${LLVM_DIR}/lib/Support/circular_raw_ostream.cpp
-        ${LLVM_DIR}/lib/Support/Debug.cpp
-        ${LLVM_DIR}/lib/Support/Locale.cpp
-    )
-endif()
-
 if(ARCH STREQUAL "x86" OR ARCH STREQUAL "x86_64")
     list(APPEND LLVM_LIST
         ${LLVM_DIR}/lib/Target/X86/AsmParser/X86AsmParser.cpp