|
| 1 | +From 79e290a8d1975da1f6d46ec85a9dff1f5f8e6e43 Mon Sep 17 00:00:00 2001 |
| 2 | +From: haonanya <haonan.yang@intel.com> |
| 3 | +Date: Sat, 8 May 2021 11:21:16 +0800 |
| 4 | +Subject: [PATCH] Remove __IMAGE_SUPPORT__ macro for SPIR |
| 5 | + |
| 6 | +Signed-off-by: haonanya <haonan.yang@intel.com> |
| 7 | +--- |
| 8 | + clang/lib/Frontend/InitPreprocessor.cpp | 2 -- |
| 9 | + clang/test/Preprocessor/predefined-macros.c | 2 -- |
| 10 | + 2 files changed, 4 deletions(-) |
| 11 | + |
| 12 | +diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp |
| 13 | +index c64a912ce919..852562f6d4dd 100644 |
| 14 | +--- a/clang/lib/Frontend/InitPreprocessor.cpp |
| 15 | ++++ b/clang/lib/Frontend/InitPreprocessor.cpp |
| 16 | +@@ -1122,8 +1122,6 @@ static void InitializePredefinedMacros(const TargetInfo &TI, |
| 17 | + if (LangOpts.OpenCL) { |
| 18 | + TI.getOpenCLFeatureDefines(LangOpts, Builder); |
| 19 | + |
| 20 | +- if (TI.getTriple().isSPIR()) |
| 21 | +- Builder.defineMacro("__IMAGE_SUPPORT__"); |
| 22 | + } |
| 23 | + |
| 24 | + if (TI.hasInt128Type() && LangOpts.CPlusPlus && LangOpts.GNUMode) { |
| 25 | +diff --git a/clang/test/Preprocessor/predefined-macros.c b/clang/test/Preprocessor/predefined-macros.c |
| 26 | +index e406b9a70570..88606518c7de 100644 |
| 27 | +--- a/clang/test/Preprocessor/predefined-macros.c |
| 28 | ++++ b/clang/test/Preprocessor/predefined-macros.c |
| 29 | +@@ -188,14 +188,12 @@ |
| 30 | + |
| 31 | + // RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir-unknown-unknown \ |
| 32 | + // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIR |
| 33 | +-// CHECK-SPIR-DAG: #define __IMAGE_SUPPORT__ 1 |
| 34 | + // CHECK-SPIR-DAG: #define __SPIR__ 1 |
| 35 | + // CHECK-SPIR-DAG: #define __SPIR32__ 1 |
| 36 | + // CHECK-SPIR-NOT: #define __SPIR64__ 1 |
| 37 | + |
| 38 | + // RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir64-unknown-unknown \ |
| 39 | + // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIR64 |
| 40 | +-// CHECK-SPIR64-DAG: #define __IMAGE_SUPPORT__ 1 |
| 41 | + // CHECK-SPIR64-DAG: #define __SPIR__ 1 |
| 42 | + // CHECK-SPIR64-DAG: #define __SPIR64__ 1 |
| 43 | + // CHECK-SPIR64-NOT: #define __SPIR32__ 1 |
| 44 | +-- |
| 45 | +2.17.1 |
| 46 | + |
0 commit comments