Merge pull request #242 from haonanya/haonanya/remove-image-support-120

Remove __IMAGE_SUPPORT__ macro for SPIR

Author: fzou1

patches/clang/0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch

@@ -0,0 +1,48 @@
+From dccea3a4e68c9a4ce069f2f0a2a24df057199db1 Mon Sep 17 00:00:00 2001
+From: haonanya <[email protected]>
+Date: Tue, 11 May 2021 11:13:02 +0800
+Subject: [PATCH] Remove __IMAGE_SUPPORT__ macro for SPIR since SPIR doesn't
+ require image support
+
+Signed-off-by: haonanya <[email protected]>
+---
+ clang/lib/Frontend/InitPreprocessor.cpp     | 3 ---
+ clang/test/Preprocessor/predefined-macros.c | 2 --
+ 2 files changed, 5 deletions(-)
+
+diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
+index c64a912ce919..c60972c96e5d 100644
+--- a/clang/lib/Frontend/InitPreprocessor.cpp
++++ b/clang/lib/Frontend/InitPreprocessor.cpp
+@@ -1121,9 +1121,6 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
+   // OpenCL definitions.
+   if (LangOpts.OpenCL) {
+     TI.getOpenCLFeatureDefines(LangOpts, Builder);
+-
+-    if (TI.getTriple().isSPIR())
+-      Builder.defineMacro("__IMAGE_SUPPORT__");
+   }
+ 
+   if (TI.hasInt128Type() && LangOpts.CPlusPlus && LangOpts.GNUMode) {
+diff --git a/clang/test/Preprocessor/predefined-macros.c b/clang/test/Preprocessor/predefined-macros.c
+index e406b9a70570..88606518c7de 100644
+--- a/clang/test/Preprocessor/predefined-macros.c
++++ b/clang/test/Preprocessor/predefined-macros.c
+@@ -188,14 +188,12 @@
+ 
+ // RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir-unknown-unknown \
+ // RUN:   | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIR
+-// CHECK-SPIR-DAG: #define __IMAGE_SUPPORT__ 1
+ // CHECK-SPIR-DAG: #define __SPIR__ 1
+ // CHECK-SPIR-DAG: #define __SPIR32__ 1
+ // CHECK-SPIR-NOT: #define __SPIR64__ 1
+ 
+ // RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir64-unknown-unknown \
+ // RUN:   | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIR64
+-// CHECK-SPIR64-DAG: #define __IMAGE_SUPPORT__ 1
+ // CHECK-SPIR64-DAG: #define __SPIR__ 1
+ // CHECK-SPIR64-DAG: #define __SPIR64__ 1
+ // CHECK-SPIR64-NOT: #define __SPIR32__ 1
+-- 
+2.17.1
+