commit f85911d274afbcdf3094664c5e1f53e96f954c7f
author Jean-François Geyelin <jif@google.com> Mon May 22 17:06:28 2023 +0200
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jun 20 12:11:42 2023 +0000
tree ed83ac75cff68cd88f68c1fdfa26c6bdf1deb9ca
parent ae667fe96db9b7f76edea242015d61f293c7210e

Add files back to fix build on RISC-V

Bug: b/273278430

Change-Id: I6c8ad61b8f02ae07c740d9b67cb55ba8828281c5
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/71708
Commit-Queue: Jean-François Geyelin <jif@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Jean-François Geyelin <jif@google.com>

third_party/llvm-16.0/Android.bp

diff --git a/third_party/llvm-16.0/Android.bp b/third_party/llvm-16.0/Android.bp
index 202fbcf..b2832f8 100644
--- a/third_party/llvm-16.0/Android.bp
+++ b/third_party/llvm-16.0/Android.bp
@@ -1298,6 +1298,8 @@
                 "llvm/lib/Target/RISCV/RISCVTargetObjectFile.cpp",
                 "llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp",
                 "llvm/lib/Target/RISCV/TargetInfo/RISCVTargetInfo.cpp",
+                "llvm/lib/TargetParser/RISCVTargetParser.cpp",
+                "llvm/lib/Transforms/IPO/BarrierNoopPass.cpp",
             ],
         },
         x86: {

third_party/llvm-16.0/BUILD.gn

diff --git a/third_party/llvm-16.0/BUILD.gn b/third_party/llvm-16.0/BUILD.gn
index 19c0f4b..13f5cc3 100644
--- a/third_party/llvm-16.0/BUILD.gn
+++ b/third_party/llvm-16.0/BUILD.gn
@@ -1687,5 +1687,7 @@
     "llvm/lib/Target/RISCV/RISCVTargetObjectFile.cpp",
     "llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp",
     "llvm/lib/Target/RISCV/TargetInfo/RISCVTargetInfo.cpp",
+    "llvm/lib/TargetParser/RISCVTargetParser.cpp",
+    "llvm/lib/Transforms/IPO/BarrierNoopPass.cpp",
   ]
 }

third_party/llvm-16.0/CMakeLists.txt

diff --git a/third_party/llvm-16.0/CMakeLists.txt b/third_party/llvm-16.0/CMakeLists.txt
index b949e04..62d0cda 100644
--- a/third_party/llvm-16.0/CMakeLists.txt
+++ b/third_party/llvm-16.0/CMakeLists.txt
@@ -1497,6 +1497,8 @@
         ${LLVM_DIR}/lib/Target/RISCV/RISCVTargetObjectFile.cpp
         ${LLVM_DIR}/lib/Target/RISCV/RISCVTargetTransformInfo.cpp
         ${LLVM_DIR}/lib/Target/RISCV/TargetInfo/RISCVTargetInfo.cpp
+        ${LLVM_DIR}/lib/TargetParser/RISCVTargetParser.cpp
+        ${LLVM_DIR}/lib/Transforms/IPO/BarrierNoopPass.cpp
     )
 endif()
 

third_party/llvm-16.0/scripts/generate_build_files.py

diff --git a/third_party/llvm-16.0/scripts/generate_build_files.py b/third_party/llvm-16.0/scripts/generate_build_files.py
index f6ca772..f6690a6 100755
--- a/third_party/llvm-16.0/scripts/generate_build_files.py
+++ b/third_party/llvm-16.0/scripts/generate_build_files.py
@@ -370,6 +370,11 @@
     "/lib/Transforms/IPO/BarrierNoopPass.cpp",
 ]
 
+files_to_add_back_for_llvm_riscv = [
+    "/lib/TargetParser/RISCVTargetParser.cpp",
+    "/lib/Transforms/IPO/BarrierNoopPass.cpp",
+]
+
 # Architecture specific files
 files_x86 = keep_files_with_prefix(all_files, "/lib/Target/X86/")
 files_Mips = keep_files_with_prefix(all_files, "/lib/Target/Mips/")
@@ -381,6 +386,8 @@
 files_ARM.sort()
 files_PowerPC = keep_files_with_prefix(all_files, "/lib/Target/PowerPC/")
 files_RISCV = keep_files_with_prefix(all_files, "/lib/Target/RISCV/")
+files_RISCV.extend(files_to_add_back_for_llvm_riscv)
+files_RISCV.sort()
 
 generated_file_comment = "File generated by " + sys.argv[0]