Index: cfe/trunk/lib/Basic/Targets/BPF.cpp
===================================================================
--- cfe/trunk/lib/Basic/Targets/BPF.cpp
+++ cfe/trunk/lib/Basic/Targets/BPF.cpp
@@ -20,7 +20,7 @@
 
 void BPFTargetInfo::getTargetDefines(const LangOptions &Opts,
                                      MacroBuilder &Builder) const {
-  DefineStd(Builder, "bpf", Opts);
+  Builder.defineMacro("__bpf__");
   Builder.defineMacro("__BPF__");
 }
 
Index: cfe/trunk/test/Preprocessor/bpf-predefined-macros.c
===================================================================
--- cfe/trunk/test/Preprocessor/bpf-predefined-macros.c
+++ cfe/trunk/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;