From 51a4a0d68f3761a0a0317b3bedde06a3cb44ee3d Mon Sep 17 00:00:00 2001 From: Yonghong Song Date: Fri, 26 Apr 2019 15:35:51 +0000 Subject: [PATCH] [BPF] do not generate predefined macro bpf "DefineStd(Builder, "bpf", Opts)" generates the following three macros: bpf __bpf __bpf__ and the macro "bpf" is due to the fact that the target language is C which allows GNU extensions. The name "bpf" could be easily used as variable name or type field name. For example, in current linux kernel, there are four places where bpf is used as a field name. If the corresponding types are included in bpf program, the compilation error will occur. This patch removed predefined macro "bpf" as well as "__bpf" which is rarely used if used at all. Signed-off-by: Yonghong Song Differential Revision: https://reviews.llvm.org/D61173 llvm-svn: 359310 --- clang/lib/Basic/Targets/BPF.cpp | 2 +- clang/test/Preprocessor/bpf-predefined-macros.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 clang/test/Preprocessor/bpf-predefined-macros.c diff --git a/clang/lib/Basic/Targets/BPF.cpp b/clang/lib/Basic/Targets/BPF.cpp index e0527db..0cf55a5 100644 --- a/clang/lib/Basic/Targets/BPF.cpp +++ b/clang/lib/Basic/Targets/BPF.cpp @@ -20,7 +20,7 @@ using namespace clang::targets; void BPFTargetInfo::getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const { - DefineStd(Builder, "bpf", Opts); + Builder.defineMacro("__bpf__"); Builder.defineMacro("__BPF__"); } diff --git a/clang/test/Preprocessor/bpf-predefined-macros.c b/clang/test/Preprocessor/bpf-predefined-macros.c new file mode 100644 index 0000000..bcb985f --- /dev/null +++ b/clang/test/Preprocessor/bpf-predefined-macros.c @@ -0,0 +1,16 @@ +// RUN: %clang -E -target bpfel -x c -o - %s | FileCheck %s +// RUN: %clang -E -target bpfeb -x c -o - %s | FileCheck %s + +#ifdef __bpf__ +int b; +#endif +#ifdef __BPF__ +int c; +#endif +#ifdef bpf +int d; +#endif + +// CHECK: int b; +// CHECK: int c; +// CHECK-NOT: int d; -- 2.7.4