diff options
| author | Caroline Tice <cmtice@google.com> | 2016-10-04 22:48:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-10-04 22:48:29 +0000 |
| commit | 73869497573424ded482a5d44c2644e0b8c7d946 (patch) | |
| tree | 39fb495c167d82c28e314e6002e13308c08f09cc | |
| parent | 5f67bb318bb447a52b9f6c31661addd01e65475f (diff) | |
| parent | 9554b320f43eae57037ea27c334446e6c99481c5 (diff) | |
| download | toolchain_gcc-73869497573424ded482a5d44c2644e0b8c7d946.tar.gz toolchain_gcc-73869497573424ded482a5d44c2644e0b8c7d946.tar.bz2 toolchain_gcc-73869497573424ded482a5d44c2644e0b8c7d946.zip | |
Merge "[GCC 4.9] Fix posix_memalign declaration."
| -rw-r--r-- | gcc-4.9/gcc/config/i386/pmm_malloc.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc-4.9/gcc/config/i386/pmm_malloc.h b/gcc-4.9/gcc/config/i386/pmm_malloc.h index 67b88a857..4506dbc9a 100644 --- a/gcc-4.9/gcc/config/i386/pmm_malloc.h +++ b/gcc-4.9/gcc/config/i386/pmm_malloc.h @@ -32,9 +32,13 @@ #ifndef __cplusplus extern int posix_memalign (void **, size_t, size_t); #else +#ifdef __GLIBC__ extern "C" int posix_memalign (void **, size_t, size_t) throw (); -#endif -#endif +#else +extern "C" int posix_memalign (void **, size_t, size_t); +#endif /* __GLIBC__ */ +#endif /* __cplusplus */ +#endif /* !(__ANDROID__) || (HAVE_POSIX_MEMALIGN) */ static __inline void * _mm_malloc (size_t size, size_t alignment) |