diff options
| author | Elliott Hughes <enh@google.com> | 2020-02-13 15:56:31 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2020-02-13 18:00:16 -0800 |
| commit | 5ac438e5daf497526e7321b456ba87a758a95ea2 (patch) | |
| tree | b285ddd203793a6d11744afa37da0cd5f5bb017c /tools | |
| parent | 7482e240cf60fff52ec08cf9340edb231aae7079 (diff) | |
Clean up mips references in the headers.
Test: treehugger
Change-Id: I1997af980b9e46c7c530f9e6cb1aa407b2d63d76
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/versioner/platforms/crtbegin.map.txt | 2 | ||||
| -rw-r--r-- | tools/versioner/tests/preprocessor/expected/foo.h | 17 | ||||
| -rw-r--r-- | tools/versioner/tests/preprocessor/headers/foo.h | 8 |
3 files changed, 11 insertions, 16 deletions
diff --git a/tools/versioner/platforms/crtbegin.map.txt b/tools/versioner/platforms/crtbegin.map.txt index 2c08da698..b844c1ef6 100644 --- a/tools/versioner/platforms/crtbegin.map.txt +++ b/tools/versioner/platforms/crtbegin.map.txt @@ -3,5 +3,5 @@ CRTBEGIN { global: - atexit; # arm64 x86 x86_64 mips mips64 + atexit; # arm64 x86 x86_64 }; diff --git a/tools/versioner/tests/preprocessor/expected/foo.h b/tools/versioner/tests/preprocessor/expected/foo.h index 61e6056db..769c37eb1 100644 --- a/tools/versioner/tests/preprocessor/expected/foo.h +++ b/tools/versioner/tests/preprocessor/expected/foo.h @@ -54,26 +54,23 @@ int multiple_archs() __INTRODUCED_IN(14); // __INTRODUCED_IN_64(21) should be ignored. -#if (defined(__LP64__)) || (defined(__arm__) && __ANDROID_API__ >= 13) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 14) || (defined(__i386__) && __ANDROID_API__ >= 13) -int multiple_introduced_1() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_MIPS(14) __INTRODUCED_IN_X86(13) - __INTRODUCED_IN_64(21); -#endif /* (defined(__LP64__)) || (defined(__arm__) && __ANDROID_API__ >= 13) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 14) || (defined(__i386__) && __ANDROID_API__ >= 13) */ +#if (!defined(__LP64__) && __ANDROID_API__ >= 13) || (defined(__LP64__)) +int multiple_introduced_1() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_X86(13) __INTRODUCED_IN_64(21); +#endif /* (!defined(__LP64__) && __ANDROID_API__ >= 13) || (defined(__LP64__)) */ -#if (defined(__LP64__) && __ANDROID_API__ >= 22) || (defined(__arm__) && __ANDROID_API__ >= 13) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 14) || (defined(__i386__) && __ANDROID_API__ >= 13) -int multiple_introduced_2() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_MIPS(14) __INTRODUCED_IN_X86(13) - __INTRODUCED_IN_64(22); -#endif /* (defined(__LP64__) && __ANDROID_API__ >= 22) || (defined(__arm__) && __ANDROID_API__ >= 13) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 14) || (defined(__i386__) && __ANDROID_API__ >= 13) */ +#if (!defined(__LP64__) && __ANDROID_API__ >= 13) || (defined(__LP64__) && __ANDROID_API__ >= 22) +int multiple_introduced_2() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_X86(13) __INTRODUCED_IN_64(22); +#endif /* (!defined(__LP64__) && __ANDROID_API__ >= 13) || (defined(__LP64__) && __ANDROID_API__ >= 22) */ #if (!defined(__LP64__) && __ANDROID_API__ >= 12) || (defined(__LP64__)) -int group_lp32() __INTRODUCED_IN_ARM(12) __INTRODUCED_IN_X86(12) __INTRODUCED_IN_MIPS(12); +int group_lp32() __INTRODUCED_IN_ARM(12) __INTRODUCED_IN_X86(12); #endif /* (!defined(__LP64__) && __ANDROID_API__ >= 12) || (defined(__LP64__)) */ - #if defined(__cplusplus) } #endif diff --git a/tools/versioner/tests/preprocessor/headers/foo.h b/tools/versioner/tests/preprocessor/headers/foo.h index 349e5e65f..782b44a7e 100644 --- a/tools/versioner/tests/preprocessor/headers/foo.h +++ b/tools/versioner/tests/preprocessor/headers/foo.h @@ -37,13 +37,11 @@ int multiple_archs() __INTRODUCED_IN(14); #endif // __INTRODUCED_IN_64(21) should be ignored. -int multiple_introduced_1() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_MIPS(14) __INTRODUCED_IN_X86(13) - __INTRODUCED_IN_64(21); +int multiple_introduced_1() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_X86(13) __INTRODUCED_IN_64(21); -int multiple_introduced_2() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_MIPS(14) __INTRODUCED_IN_X86(13) - __INTRODUCED_IN_64(22); +int multiple_introduced_2() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_X86(13) __INTRODUCED_IN_64(22); -int group_lp32() __INTRODUCED_IN_ARM(12) __INTRODUCED_IN_X86(12) __INTRODUCED_IN_MIPS(12); +int group_lp32() __INTRODUCED_IN_ARM(12) __INTRODUCED_IN_X86(12); #if defined(__cplusplus) } |