diff options
author | Victor Khimenko <khim@google.com> | 2018-03-21 23:46:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-03-21 23:46:15 +0000 |
commit | faaded5947d23ce6957cb6fa0994dc26a0750f71 (patch) | |
tree | d5693de509472071aef84f62cedd8dff38072f83 | |
parent | b6d8f55ce1e7b110b37433f4105b4d2623103953 (diff) | |
parent | 243707c31ece17e93c81218b98fb7b0fb2e238d2 (diff) | |
download | libbcc-faaded5947d23ce6957cb6fa0994dc26a0750f71.tar.gz |
Merge "Make PROVIDE_xxx macro more robust"
am: 243707c31e
Change-Id: Idac5170061f0919a93e400fcfdfbf5a9c359c6d5
-rw-r--r-- | include/bcc/Config.h | 52 |
1 files changed, 26 insertions, 26 deletions
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 |