pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix "Add a legacy inline for mmap64"."

This commit is contained in:
Treehugger Robot 2017-10-07 00:56:41 +00:00 committed by Gerrit Code Review
parent 3dacc47642 8c2323c697
commit 983c2da84c
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/include/android/legacy_sys_mman_inlines.h
View File

@ -43,6 +43,8 @@ __BEGIN_DECLS
* should allow a lot more code to build with _FILE_OFFSET_BITS=64 when
* targeting pre-L.
*/
static __inline void* mmap64(void* __addr, size_t __size, int __prot, int __flags, int __fd,
off64_t __offset) __RENAME(mmap64);
static __inline void* mmap64(void* __addr, size_t __size, int __prot, int __flags, int __fd,
off64_t __offset) {
const int __mmap2_shift = 12; // 2**12 == 4096

13
libc/include/sys/mman.h
View File

@ -48,12 +48,23 @@ __BEGIN_DECLS
/*
* mmap64 wasn't really around until L, but we added an inline for it since it
* allows a lot more code to compile with _FILE_OFFSET_BITS=64.
*
* GCC removes the static inline unless it is explicitly used. We can get around
* this with __attribute__((used)), but that needlessly adds a definition of
* mmap64 to every translation unit that includes this header. Instead, just
* preserve the old behavior for GCC and emit a useful diagnostic.
*/
void* mmap(void* __addr, size_t __size, int __prot, int __flags, int __fd, off_t __offset)
#if !defined(__clang__) && __ANDROID_API__ < __ANDROID_API_L__
__attribute__((error("mmap is not available with _FILE_OFFSET_BITS=64 when using GCC until "
"android-21. Either raise your minSdkVersion, disable "
"_FILE_OFFSET_BITS=64, or switch to Clang.")));
#else
__RENAME(mmap64);
#endif /* defined(__clang__) */
#else
void* mmap(void* __addr, size_t __size, int __prot, int __flags, int __fd, off_t __offset);
#endif
#endif /* defined(__USE_FILE_OFFSET64) */
#if __ANDROID_API__ >= __ANDROID_API_L__
void* mmap64(void* __addr, size_t __size, int __prot, int __flags, int __fd, off64_t __offset) __INTRODUCED_IN(21);