commit 0eb6892d0ef78a5689b84b26ad19f7a3a7fec9cd
author android-build-team Robot <android-build-team-robot@google.com> Wed Mar 28 07:24:39 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Mar 28 07:24:39 2018 +0000
tree d5693de509472071aef84f62cedd8dff38072f83
parent 3c296976df7acb5a0cc4887e6ad08c3dc1eaddbe
parent cd2cedc31a5a051062c87e1c215623acc3da5de8

Snap for 4683893 from cd2cedc31a5a051062c87e1c215623acc3da5de8 to pi-release

Change-Id: Ia0ea9164ba446225a36302a9b08758a3027ee074

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