diff options
| author | Dan Albert <danalbert@google.com> | 2015-02-05 02:44:50 +0000 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-02-05 02:44:50 +0000 |
| commit | 3be4efa3416dfe0d3ce5028cfed5d33e1e88e62c (patch) | |
| tree | eead55ba08dc96d577853658fa6c65361c16b835 /libcxxabi/src | |
| parent | 8645ea65e523495fcb9432028ffe4b9c88591515 (diff) | |
| download | bcm5719-llvm-3be4efa3416dfe0d3ce5028cfed5d33e1e88e62c.tar.gz bcm5719-llvm-3be4efa3416dfe0d3ce5028cfed5d33e1e88e62c.zip | |
Some more -Wundef issues.
This should be all of them for Linux. Might be some for the others.
llvm-svn: 228267
Diffstat (limited to 'libcxxabi/src')
| -rw-r--r-- | libcxxabi/src/Unwind/AddressSpace.hpp | 6 | ||||
| -rw-r--r-- | libcxxabi/src/cxa_exception.hpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libcxxabi/src/Unwind/AddressSpace.hpp b/libcxxabi/src/Unwind/AddressSpace.hpp index 56e76bcfa1a..960c8f85bb4 100644 --- a/libcxxabi/src/Unwind/AddressSpace.hpp +++ b/libcxxabi/src/Unwind/AddressSpace.hpp @@ -35,7 +35,7 @@ namespace libunwind { #include "Registers.hpp" #if LIBCXXABI_ARM_EHABI -#if __linux__ +#ifdef __linux__ typedef long unsigned int *_Unwind_Ptr; extern "C" _Unwind_Ptr __gnu_Unwind_Find_exidx(_Unwind_Ptr addr, int *len); @@ -91,7 +91,7 @@ struct UnwindInfoSections { /// making local unwinds fast. class __attribute__((visibility("hidden"))) LocalAddressSpace { public: -#if __LP64__ +#ifdef __LP64__ typedef uint64_t pint_t; typedef int64_t sint_t; #else @@ -142,7 +142,7 @@ public: }; inline uintptr_t LocalAddressSpace::getP(pint_t addr) { -#if __LP64__ +#ifdef __LP64__ return get64(addr); #else return get32(addr); diff --git a/libcxxabi/src/cxa_exception.hpp b/libcxxabi/src/cxa_exception.hpp index 9b22ce3719e..8badb3b7fc1 100644 --- a/libcxxabi/src/cxa_exception.hpp +++ b/libcxxabi/src/cxa_exception.hpp @@ -27,7 +27,7 @@ static const uint64_t kOurDependentExceptionClass = 0x434C4E47432B2B01; // CLNGC static const uint64_t get_vendor_and_language = 0xFFFFFFFFFFFFFF00; // mask for CLNGC++ struct __cxa_exception { -#if __LP64__ || LIBCXXABI_ARM_EHABI +#if defined(__LP64__) || LIBCXXABI_ARM_EHABI // This is a new field to support C++ 0x exception_ptr. // For binary compatibility it is at the start of this // struct which is prepended to the object thrown in @@ -56,7 +56,7 @@ struct __cxa_exception { void *adjustedPtr; #endif -#if !__LP64__ && !LIBCXXABI_ARM_EHABI +#if !defined(__LP64__) && !LIBCXXABI_ARM_EHABI // This is a new field to support C++ 0x exception_ptr. // For binary compatibility it is placed where the compiler // previously adding padded to 64-bit align unwindHeader. @@ -70,7 +70,7 @@ struct __cxa_exception { // The layout of this structure MUST match the layout of __cxa_exception, with // primaryException instead of referenceCount. struct __cxa_dependent_exception { -#if __LP64__ || LIBCXXABI_ARM_EHABI +#if defined(__LP64__) || LIBCXXABI_ARM_EHABI void* primaryException; #endif @@ -94,7 +94,7 @@ struct __cxa_dependent_exception { void *adjustedPtr; #endif -#if !__LP64__ && !LIBCXXABI_ARM_EHABI +#if !defined(__LP64__) && !LIBCXXABI_ARM_EHABI void* primaryException; #endif |
