diff options
| author | Victor Khimenko <khim@google.com> | 2018-03-22 00:55:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-22 00:55:17 +0000 |
| commit | ff2cafe4af98b3219e3694d5805e8225b917d1a2 (patch) | |
| tree | d5693de509472071aef84f62cedd8dff38072f83 | |
| parent | 049546daed09557cd53f10ae7ca0b49e074a6b2d (diff) | |
| parent | 5a7da217cee850ed04ed64cec532fb6e67a9f1c4 (diff) | |
| download | libbcc-ff2cafe4af98b3219e3694d5805e8225b917d1a2.tar.gz | |
Merge "Make PROVIDE_xxx macro more robust" am: 243707c31e am: faaded5947
am: 5a7da217ce
Change-Id: Id76f169ce3fee253d3fcaaae4fa38d26e4fbea47
| -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 |