commit cd2cedc31a5a051062c87e1c215623acc3da5de8
author Victor Khimenko <khim@google.com> Wed Mar 21 20:03:32 2018 +0100
committer Victor Khimenko <khim@google.com> Tue Mar 27 20:01:29 2018 +0200
tree d5693de509472071aef84f62cedd8dff38072f83
parent 049546daed09557cd53f10ae7ca0b49e074a6b2d

Make PROVIDE_xxx macro more robust

If symbold is defined into "1" then it could be used as
  #if PROVIDE_xxx
  ...
  #endif

That's what cland and gcc are using if -DPROVIDE_xxx is used on the
command-line:
  https://gcc.gnu.org/onlinedocs/gcc/Preprocessor-Options.html#index-D
  https://clang.llvm.org/docs/ClangCommandLineReference.html

Test: make

Bug: b/75971275

Change-Id: Idcb1eb05d1823d30a64049b1c079a8b4bd34946f
(cherry picked from commit 53f9a6d92789cff92667ac3128ec0ec6d2273e51)

include/bcc/Config.h

diff --git a/include/bcc/Config.h b/include/bcc/Config.h
index 8293827..b824e4c 100644
--- a/include/bcc/Config.h
+++ b/include/bcc/Config.h
@@ -22,54 +22,54 @@
 //---------------------------------------------------------------------------
 
 #if defined(FORCE_ARM_CODEGEN)
-  #define PROVIDE_ARM_CODEGEN
-  #define DEFAULT_ARM_CODEGEN
+  #define PROVIDE_ARM_CODEGEN 1
+  #define DEFAULT_ARM_CODEGEN 1
 
 #elif defined(FORCE_ARM64_CODEGEN)
-  #define PROVIDE_ARM_CODEGEN
-  #define PROVIDE_ARM64_CODEGEN
-  #define DEFAULT_ARM64_CODEGEN
+  #define PROVIDE_ARM_CODEGEN 1
+  #define PROVIDE_ARM64_CODEGEN 1
+  #define DEFAULT_ARM64_CODEGEN 1
 
 #elif defined(FORCE_MIPS_CODEGEN)
-  #define PROVIDE_MIPS_CODEGEN
-  #define DEFAULT_MIPS_CODEGEN
+  #define PROVIDE_MIPS_CODEGEN 1
+  #define DEFAULT_MIPS_CODEGEN 1
 
 #elif defined(FORCE_MIPS64_CODEGEN)
-  #define PROVIDE_MIPS_CODEGEN
-  #define PROVIDE_MIPS64_CODEGEN
-  #define DEFAULT_MIPS64_CODEGEN
+  #define PROVIDE_MIPS_CODEGEN 1
+  #define PROVIDE_MIPS64_CODEGEN 1
+  #define DEFAULT_MIPS64_CODEGEN 1
 
 #elif defined(FORCE_X86_CODEGEN)
-  #define PROVIDE_X86_CODEGEN
-  #define DEFAULT_X86_CODEGEN
+  #define PROVIDE_X86_CODEGEN 1
+  #define DEFAULT_X86_CODEGEN 1
 
 #elif defined(FORCE_X86_64_CODEGEN)
   // There is no separate X86_64 code generation target. It is all part of X86.
-  #define PROVIDE_X86_CODEGEN
-  #define DEFAULT_X86_64_CODEGEN
+  #define PROVIDE_X86_CODEGEN 1
+  #define DEFAULT_X86_64_CODEGEN 1
 
 #else
-  #define PROVIDE_ARM_CODEGEN
-  #define PROVIDE_ARM64_CODEGEN
-  #define PROVIDE_MIPS_CODEGEN
-  #define PROVIDE_MIPS64_CODEGEN
-  #define PROVIDE_X86_CODEGEN
-  #define PROVIDE_X86_64_CODEGEN
+  #define PROVIDE_ARM_CODEGEN 1
+  #define PROVIDE_ARM64_CODEGEN 1
+  #define PROVIDE_MIPS_CODEGEN 1
+  #define PROVIDE_MIPS64_CODEGEN 1
+  #define PROVIDE_X86_CODEGEN 1
+  #define PROVIDE_X86_64_CODEGEN 1
 
   #if defined(__arm__)
-    #define DEFAULT_ARM_CODEGEN
+    #define DEFAULT_ARM_CODEGEN 1
   #elif defined(__aarch64__)
-    #define DEFAULT_ARM64_CODEGEN
+    #define DEFAULT_ARM64_CODEGEN 1
   #elif defined(__mips__)
     #if defined(__LP64__)
-      #define DEFAULT_MIPS64_CODEGEN
+      #define DEFAULT_MIPS64_CODEGEN 1
     #else
-      #define DEFAULT_MIPS_CODEGEN
+      #define DEFAULT_MIPS_CODEGEN 1
     #endif
   #elif defined(__i386__)
-    #define DEFAULT_X86_CODEGEN
+    #define DEFAULT_X86_CODEGEN 1
   #elif defined(__x86_64__)
-    #define DEFAULT_X86_64_CODEGEN
+    #define DEFAULT_X86_64_CODEGEN 1
   #endif
 #endif