generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am d60a625d: Merge "Start moving 32-bit cruft somewhere it won\'t pollute 64-bit."

Browse Source 
* commit 'd60a625dd5e544fb49056d864898ff82bca99950':
  Start moving 32-bit cruft somewhere it won't pollute 64-bit.
This commit is contained in:
Elliott Hughes 2013-10-24 17:19:54 -07:00 committed by Android Git Automerger
commit c2404f6c1d
4 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libc/Android.mk
View File

@ -180,6 +180,7 @@ libc_common_src_files += \
bionic/fstatfs.c \ bionic/fstatfs.c \
bionic/__get_tls.cpp \ bionic/__get_tls.cpp \
bionic/lseek64.c \ bionic/lseek64.c \
bionic/ndk_cruft.cpp \
bionic/statfs.c \ bionic/statfs.c \
endif endif

55
libc/bionic/ndk_cruft.cpp Normal file
View File

@ -0,0 +1,55 @@
/*
* Copyright (C) 2013 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
// This file perpetuates the mistakes of the past, but only for 32-bit targets.
#if !defined(__LP64__)
#include <stdlib.h>
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
// These were accidentally declared in <unistd.h> because we stupidly used to inline
// getpagesize() and __getpageshift(). Needed for backwards compatibility with old NDK apps.
extern "C" {
unsigned int __page_size = PAGE_SIZE;
unsigned int __page_shift = PAGE_SHIFT;
}
// TODO: remove this backward compatibility hack (for jb-mr1 strace binaries).
extern "C" pid_t __wait4(pid_t pid, int* status, int options, struct rusage* rusage) {
return wait4(pid, status, options, rusage);
}
extern "C" int __open() {
abort();
}
#endif

7
libc/bionic/stubs.cpp
View File

@ -474,10 +474,3 @@ void endusershell() {
int getpagesize() { int getpagesize() {
return sysconf(_SC_PAGESIZE); return sysconf(_SC_PAGESIZE);
} }
// These were accidentally declared in <unistd.h> because we stupidly used to inline
// getpagesize() and __getpageshift(). Needed for backwards compatibility with old NDK apps.
extern "C" {
unsigned int __page_size = PAGE_SIZE;
unsigned int __page_shift = PAGE_SHIFT;
}

5
libc/bionic/wait.cpp
View File

@ -47,8 +47,3 @@ int waitid(idtype_t which, id_t id, siginfo_t* info, int options) {
// The system call takes an optional struct rusage that we don't need. // The system call takes an optional struct rusage that we don't need.
return __waitid(which, id, info, options, NULL); return __waitid(which, id, info, options, NULL);
} }
// TODO: remove this backward compatibility hack (for jb-mr1 strace binaries).
extern "C" pid_t __wait4(pid_t pid, int* status, int options, struct rusage* rusage) {
return wait4(pid, status, options, rusage);
}