From 9da4021626dd48a1cc25054d1d4009e098f4d97b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 3 Oct 2013 07:56:35 -0700 Subject: [PATCH] radeonsi: Use 'SI' as the LLVM processor for CIK on LLVM <= 3.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit LLVM 3.3 does not know about CIK processors, and the codes paths for SI and CIK are the same. Reviewed-by: Marek Olšák Cc: "9.2" --- src/gallium/drivers/radeonsi/radeonsi_pipe.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c index c3250e4..121fd18 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c @@ -307,11 +307,15 @@ const char *r600_get_llvm_processor_name(enum radeon_family family) case CHIP_PITCAIRN: return "pitcairn"; case CHIP_VERDE: return "verde"; case CHIP_OLAND: return "oland"; +#if HAVE_LLVM <= 0x0303 + default: return "SI"; +#else case CHIP_HAINAN: return "hainan"; case CHIP_BONAIRE: return "bonaire"; case CHIP_KABINI: return "kabini"; case CHIP_KAVERI: return "kaveri"; default: return ""; +#endif } } -- 2.7.4