From: Patrik Hagglund <patrik.h.hagglund@ericsson.com>
Date: Wed, 29 May 2013 07:32:08 +0000 (+0000)
Subject: Temporary fix to get rid of gcc warning.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=92b4f2034671ba174a56c88f3e39e0ec7afb7374;p=oota-llvm.git

Temporary fix to get rid of gcc warning.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182832 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/R600/AMDGPUSubtarget.cpp b/lib/Target/R600/AMDGPUSubtarget.cpp
index 6bfe17bbae9..da342892da5 100644
--- a/lib/Target/R600/AMDGPUSubtarget.cpp
+++ b/lib/Target/R600/AMDGPUSubtarget.cpp
@@ -37,7 +37,16 @@ AMDGPUSubtarget::AMDGPUSubtarget(StringRef TT, StringRef CPU, StringRef FS) :
   ParseSubtargetFeatures(GPU, FS);
   DevName = GPU;
   Device = AMDGPUDeviceInfo::getDeviceFromName(DevName, this, Is64bit);
-  TexVTXClauseSize = (Device->getGeneration() >= AMDGPUDeviceInfo::HD4XXX)?16:8;
+
+  // FIXME: The code in the comment below was the original code. But the
+  // condition is always true, generating a warning when compiled with
+  // gcc. Vincent Lejeune indicated in a mail to llvm-commits 2013-05-23 that he
+  // will look into this. The code 'TexVTXClauseSize = 16' is just a temporary
+  // equivalent replacement, to get rid of the compiler warning.
+
+  // TexVTXClauseSize = (Device->getGeneration() >= AMDGPUDeviceInfo::HD4XXX)?16:8;
+
+  TexVTXClauseSize = 16;
 }
 
 AMDGPUSubtarget::~AMDGPUSubtarget() {