diff options
| author | Dan Albert <danalbert@google.com> | 2016-01-04 20:53:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-04 20:53:26 +0000 |
| commit | 7a8d563bd8d31774268692616027d10fc62e45ee (patch) | |
| tree | d1a82b05327b5b25ad504de68d73b895bc27ef9b | |
| parent | 37cfca538428bc086d219649fd5eccc56291f799 (diff) | |
| parent | ed87a4358f7ea83139e82ece851aabd87428bcd5 (diff) | |
| download | ndk-7a8d563bd8d31774268692616027d10fc62e45ee.tar.gz | |
Merge "Fix unwind-struct test for mips64 arch"
am: ed87a4358f
* commit 'ed87a4358f7ea83139e82ece851aabd87428bcd5':
Fix unwind-struct test for mips64 arch
| -rw-r--r-- | tests/device/test-unwind-struct/jni/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/device/test-unwind-struct/jni/main.c b/tests/device/test-unwind-struct/jni/main.c index d16df13bc..14042037b 100644 --- a/tests/device/test-unwind-struct/jni/main.c +++ b/tests/device/test-unwind-struct/jni/main.c @@ -20,7 +20,7 @@ int main() { CHECK_EQ(88, sizeof(struct _Unwind_Control_Block)); CHECK_EQ(0, offsetof(struct _Unwind_Control_Block, exception_class)); CHECK_EQ(8, offsetof(struct _Unwind_Control_Block, exception_cleanup)); -#elif defined(__mips__) +#elif defined(__mips__) && !defined(__mips64) CHECK_EQ(24, sizeof(struct _Unwind_Exception)); CHECK_EQ(0, offsetof(struct _Unwind_Exception, exception_class)); CHECK_EQ(8, offsetof(struct _Unwind_Exception, exception_cleanup)); @@ -32,7 +32,7 @@ int main() { CHECK_EQ(8, offsetof(struct _Unwind_Exception, exception_cleanup)); CHECK_EQ(12, offsetof(struct _Unwind_Exception, private_1)); CHECK_EQ(16, offsetof(struct _Unwind_Exception, private_2)); -#elif defined(__aarch64__) || defined(__x86_64__) || defined(__mips64__) +#elif defined(__aarch64__) || defined(__x86_64__) || defined(__mips64) CHECK_EQ(32, sizeof(struct _Unwind_Exception)); CHECK_EQ(0, offsetof(struct _Unwind_Exception, exception_class)); CHECK_EQ(8, offsetof(struct _Unwind_Exception, exception_cleanup)); |