diff options
| author | Jing Yu <jingyu@google.com> | 2010-08-10 10:08:15 -0700 |
|---|---|---|
| committer | Jing Yu <jingyu@google.com> | 2010-08-10 10:08:15 -0700 |
| commit | a4d9421024ed3f70aede5b11f977d264eb69bf61 (patch) | |
| tree | 249043f884d87192ee9cd326463758a141b80950 | |
| parent | f01e65905acd1e2052e875130cb723a658765bc8 (diff) | |
| download | toolchain_gcc-a4d9421024ed3f70aede5b11f977d264eb69bf61.tar.gz toolchain_gcc-a4d9421024ed3f70aede5b11f977d264eb69bf61.tar.bz2 toolchain_gcc-a4d9421024ed3f70aede5b11f977d264eb69bf61.zip | |
Remove definition of getpagesize() in order to build c++ library
for Android toolchain. This is a local work around. The long term
solution is to change the getpagesize() definition in bionicC. However
to be compatible with current bionicC and sysroot, we have to do
this local workaround inside gcc. After getpagesize() in bionicC
is changed and ndk constains that change, we can revert this CL.
Change-Id: I14757b967e41e45c06224c1d9ce7752bc1a7e9cb
| -rw-r--r-- | gcc-4.4.3/README.google | 5 | ||||
| -rw-r--r-- | gcc-4.4.3/libiberty/getpagesize.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc-4.4.3/README.google b/gcc-4.4.3/README.google index 807e19c08..83b757e21 100644 --- a/gcc-4.4.3/README.google +++ b/gcc-4.4.3/README.google @@ -2065,3 +2065,8 @@ gcc/config/arm/arm.h Add .note.GNU-stack annotation to all ARM targeted codes. Owner: jingyu Status: keep it local + +libiberty/getpagesize.c + Local work around for building C++ library for Android toolchain. + Owner: jingyu + Status: keep it local diff --git a/gcc-4.4.3/libiberty/getpagesize.c b/gcc-4.4.3/libiberty/getpagesize.c index 1c3a26304..4d44f30f1 100644 --- a/gcc-4.4.3/libiberty/getpagesize.c +++ b/gcc-4.4.3/libiberty/getpagesize.c @@ -60,12 +60,13 @@ BUGS # endif /* PAGESIZE */ #endif /* GNU_OUR_PAGESIZE */ +#if DEFAULT_LIBC != LIBC_BIONIC int getpagesize (void) { return (GNU_OUR_PAGESIZE); } - +#endif #else /* VMS */ #if 0 /* older distributions of gcc-vms are missing <syidef.h> */ |