From a5507dea800fe8cd338139432a7438c33e7027f3 Mon Sep 17 00:00:00 2001 From: Yonghong Song Date: Wed, 11 Apr 2018 16:08:00 +0000 Subject: [PATCH] bpf: accept all asm register names Sometimes when people compile bpf programs with "clang ... -target bpf ...", the kernel header files may contain host arch inline assembly codes as in the patch https://patchwork.kernel.org/patch/10119683/ by Arnaldo Carvaldo de Melo. The current workaround in the above patch is to guard the inline assembly with "#ifndef __BPF__" marco. So when __BPF__ is defined, these macros will have no use. Such a method is not extensible. As a matter of fact, most of these inline assembly codes will be thrown away at the end of clang compilation. So for bpf target, this patch accepts all asm register names in clang AST stage. The name will be checked again during llc code generation if the inline assembly code is indeed for bpf programs. With this patch, the above "#ifndef __BPF__" is not needed any more in https://patchwork.kernel.org/patch/10119683/. Signed-off-by: Yonghong Song git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@329823 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/TargetInfo.h | 2 +- lib/Basic/Targets/BPF.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/clang/Basic/TargetInfo.h b/include/clang/Basic/TargetInfo.h index 26f72a1814..8fbda351ff 100644 --- a/include/clang/Basic/TargetInfo.h +++ b/include/clang/Basic/TargetInfo.h @@ -619,7 +619,7 @@ public: /// according to GCC. /// /// This is used by Sema for inline asm statements. - bool isValidGCCRegisterName(StringRef Name) const; + virtual bool isValidGCCRegisterName(StringRef Name) const; /// \brief Returns the "normalized" GCC register name. /// diff --git a/lib/Basic/Targets/BPF.h b/lib/Basic/Targets/BPF.h index 36d2da4dbf..61a7ddae9c 100644 --- a/lib/Basic/Targets/BPF.h +++ b/lib/Basic/Targets/BPF.h @@ -63,6 +63,7 @@ public: return TargetInfo::VoidPtrBuiltinVaList; } + bool isValidGCCRegisterName(StringRef Name) const override { return true; } ArrayRef getGCCRegNames() const override { return None; } bool validateAsmConstraint(const char *&Name, -- 2.40.0