From 104ad064df78d047008b0079aed419d1bfd8aa8a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 13 Jun 2015 05:11:14 +0000 Subject: [PATCH] AMDGPU: s/R600/AMDGPU/ in the Makefiles Now the library names in the Makefiles match the library names in LLVMBuild.txt. This should hopefully fix the remaining bot failures. llvm-svn: 239661 --- llvm/lib/Target/AMDGPU/AsmParser/Makefile | 6 +++--- llvm/lib/Target/AMDGPU/InstPrinter/Makefile | 2 +- llvm/lib/Target/AMDGPU/MCTargetDesc/Makefile | 2 +- llvm/lib/Target/AMDGPU/Makefile | 2 +- llvm/lib/Target/AMDGPU/TargetInfo/Makefile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/llvm/lib/Target/AMDGPU/AsmParser/Makefile b/llvm/lib/Target/AMDGPU/AsmParser/Makefile index e6689b5..5ad2190 100644 --- a/llvm/lib/Target/AMDGPU/AsmParser/Makefile +++ b/llvm/lib/Target/AMDGPU/AsmParser/Makefile @@ -1,4 +1,4 @@ -##===- lib/Target/R600/AsmParser/Makefile ----------------*- Makefile -*-===## +##===- lib/Target/AMDGPU/AsmParser/Makefile ----------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure # @@ -7,9 +7,9 @@ # ##===----------------------------------------------------------------------===## LEVEL = ../../../.. -LIBRARYNAME = LLVMR600AsmParser +LIBRARYNAME = LLVMAMDGPUAsmParser -# Hack: we need to include 'main' R600 target directory to grab private headers +# Hack: we need to include 'main' AMDGPU target directory to grab private headers CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. include $(LEVEL)/Makefile.common diff --git a/llvm/lib/Target/AMDGPU/InstPrinter/Makefile b/llvm/lib/Target/AMDGPU/InstPrinter/Makefile index a794cc1..4e48ac7 100644 --- a/llvm/lib/Target/AMDGPU/InstPrinter/Makefile +++ b/llvm/lib/Target/AMDGPU/InstPrinter/Makefile @@ -7,7 +7,7 @@ # ##===----------------------------------------------------------------------===## LEVEL = ../../../.. -LIBRARYNAME = LLVMR600AsmPrinter +LIBRARYNAME = LLVMAMDGPUAsmPrinter # Hack: we need to include 'main' x86 target directory to grab private headers CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/Makefile b/llvm/lib/Target/AMDGPU/MCTargetDesc/Makefile index 8894a76..5ad6866 100644 --- a/llvm/lib/Target/AMDGPU/MCTargetDesc/Makefile +++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/Makefile @@ -8,7 +8,7 @@ ##===----------------------------------------------------------------------===## LEVEL = ../../../.. -LIBRARYNAME = LLVMR600Desc +LIBRARYNAME = LLVMAMDGPUDesc # Hack: we need to include 'main' target directory to grab private headers CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. diff --git a/llvm/lib/Target/AMDGPU/Makefile b/llvm/lib/Target/AMDGPU/Makefile index 64a7c8c..2e2de50 100644 --- a/llvm/lib/Target/AMDGPU/Makefile +++ b/llvm/lib/Target/AMDGPU/Makefile @@ -8,7 +8,7 @@ ##===----------------------------------------------------------------------===## LEVEL = ../../.. -LIBRARYNAME = LLVMR600CodeGen +LIBRARYNAME = LLVMAMDGPUCodeGen TARGET = AMDGPU # Make sure that tblgen is run, first thing. diff --git a/llvm/lib/Target/AMDGPU/TargetInfo/Makefile b/llvm/lib/Target/AMDGPU/TargetInfo/Makefile index b8ac4e7..1b23287 100644 --- a/llvm/lib/Target/AMDGPU/TargetInfo/Makefile +++ b/llvm/lib/Target/AMDGPU/TargetInfo/Makefile @@ -7,7 +7,7 @@ # ##===----------------------------------------------------------------------===## LEVEL = ../../../.. -LIBRARYNAME = LLVMR600Info +LIBRARYNAME = LLVMAMDGPUInfo # Hack: we need to include 'main' target directory to grab private headers CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/.. -- 2.7.4