[llvm] ff042de - [gn build] Port 24698e526f619271705fe72bcaa928be9bc82484. Fix AMDGPUTests

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2020-03-23T10:22:40-07:00
New Revision: ff042de67d5a756e983b682b696a0c45b06cb62f

URL: https://github.com/llvm/llvm-project/commit/ff042de67d5a756e983b682b696a0c45b06cb62f
DIFF: https://github.com/llvm/llvm-project/commit/ff042de67d5a756e983b682b696a0c45b06cb62f.diff

LOG: [gn build] Port 24698e526f619271705fe72bcaa928be9bc82484. Fix AMDGPUTests

Added: 
    

Modified: 
    llvm/utils/gn/secondary/llvm/lib/Target/targets.gni
    llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/targets.gni b/llvm/utils/gn/secondary/llvm/lib/Target/targets.gni
index 0fb7f4c5daa2..2590432529b6 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/targets.gni
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/targets.gni
@@ -44,8 +44,8 @@ if (llvm_targets_to_build == "host") {
 # and remember which targets are built where needed (for conditionally-built
 # unittest targets).
 llvm_build_AArch64 = false
-llvm_build_ARM = false
 llvm_build_AMDGPU = false
+llvm_build_ARM = false
 llvm_build_BPF = false
 llvm_build_Mips = false
 llvm_build_PowerPC = false

diff  --git a/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
index 3e156fc6ee70..238ff86b771c 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/Target/AMDGPU/BUILD.gn
@@ -7,7 +7,9 @@ unittest("AMDGPUTests") {
     "//llvm/lib/Target/AMDGPU:LLVMAMDGPUCodeGen",
     "//llvm/lib/Target/AMDGPU/MCTargetDesc",
     "//llvm/lib/Target/AMDGPU/TargetInfo",
+    "//llvm/lib/Target/AMDGPU/Utils",
   ]
+  include_dirs = [ "//llvm/lib/Target/AMDGPU" ]
   sources = [
     # Make `gn format` not collapse this, for sync_source_lists_from_cmake.py.
     "DwarfRegMappings.cpp",