diff options
| author | Elliott Hughes <enh@google.com> | 2021-01-08 20:34:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-08 20:34:11 +0000 |
| commit | ddb51deebe1e24203b496006bf52a95a617d824f (patch) | |
| tree | 8f5119d9fb845396c9c86873a8f9607026e36a42 /libc | |
| parent | 764c717156f5eda8711e78083134e2d3eb5a390c (diff) | |
| parent | 771af5efc6954f7dfb1420328faeef961378c196 (diff) | |
Merge "Fix things so that <features.h> can be used from assembler again." am: 771af5efc6
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1543864
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id5265987dc1e5490f1f61d9dfd64cf4f159309cc
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/include/android/api-level.h | 7 | ||||
| -rw-r--r-- | libc/private/bionic_asm.h | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libc/include/android/api-level.h b/libc/include/android/api-level.h index bcddddd59..40846fb8b 100644 --- a/libc/include/android/api-level.h +++ b/libc/include/android/api-level.h @@ -151,6 +151,9 @@ __BEGIN_DECLS /** Names the "S" API level (31), for comparison against `__ANDROID_API__`. */ #define __ANDROID_API_S__ 31 +/* This file is included in <features.h>, and might be used from .S files. */ +#if !defined(__ASSEMBLY__) + /** * Returns the `targetSdkVersion` of the caller, or `__ANDROID_API_FUTURE__` if * there is no known target SDK version (for code not running in the context of @@ -167,7 +170,7 @@ int android_get_application_target_sdk_version() __INTRODUCED_IN(24); #if __ANDROID_API__ < 29 -// android_get_device_api_level is a static inline before API level 29. +/* android_get_device_api_level is a static inline before API level 29. */ #define __BIONIC_GET_DEVICE_API_LEVEL_INLINE static __inline #include <bits/get_device_api_level_inlines.h> #undef __BIONIC_GET_DEVICE_API_LEVEL_INLINE @@ -185,6 +188,8 @@ int android_get_device_api_level() __INTRODUCED_IN(29); #endif +#endif /* defined(__ASSEMBLY__) */ + __END_DECLS /** @} */ diff --git a/libc/private/bionic_asm.h b/libc/private/bionic_asm.h index 6d4f7d52c..d68a2d604 100644 --- a/libc/private/bionic_asm.h +++ b/libc/private/bionic_asm.h @@ -26,8 +26,10 @@ * SUCH DAMAGE. */ -#ifndef _PRIVATE_BIONIC_ASM_H_ -#define _PRIVATE_BIONIC_ASM_H_ +#pragma once + +/* https://github.com/android/ndk/issues/1422 */ +#include <features.h> #include <asm/unistd.h> /* For system call numbers. */ #define MAX_ERRNO 4095 /* For recognizing system call error returns. */ @@ -86,5 +88,3 @@ #define NOTE_GNU_PROPERTY() \ __bionic_asm_custom_note_gnu_section() - -#endif |