diff options
author | Elliott Hughes <enh@google.com> | 2013-09-30 17:41:08 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2013-09-30 18:42:13 -0700 |
commit | d3e64a3f403918abf2cc3f9f0f9a2204a420ec96 (patch) | |
tree | ec7cb0e25587096a42ed0fce4a125bf4bba7affd /libc/kernel/arch-x86/asm/uaccess.h | |
parent | 76218efbeb2e124656ce15d4eb5a7039da065123 (diff) | |
download | bionic-d3e64a3f403918abf2cc3f9f0f9a2204a420ec96.zip bionic-d3e64a3f403918abf2cc3f9f0f9a2204a420ec96.tar.gz bionic-d3e64a3f403918abf2cc3f9f0f9a2204a420ec96.tar.bz2 |
Add x86_64 to the bionic headers.
Manual changes:
cpp.py: cope with macros that refer to other macros.
defaults.py: x86 no longer always implies __i386__; use __i386__ to replace
the kernel CONFIG_X86_32 flag.
asm/page.h: the upstream page.h isn't a uapi header and no longer includes
the stuff we were using it for. Let's just have our own static file, since
it's the same for all our architectures (both 32- and 64-bit).
sys/select.h: we used to use the various FD_SET-related macros from the
kernel header files, but they've gone. Adjust by adding trivial equivalent
definitions.
Automated changes:
libc/kernel/arch-x86, libc/kernel/common: regenerated from
external/kernel-headers.
Change-Id: I84fc0ed52dc742e043b4ae300fd3b58ee99b7fcd
Diffstat (limited to 'libc/kernel/arch-x86/asm/uaccess.h')
-rw-r--r-- | libc/kernel/arch-x86/asm/uaccess.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libc/kernel/arch-x86/asm/uaccess.h b/libc/kernel/arch-x86/asm/uaccess.h index b167f6d..23da5d2 100644 --- a/libc/kernel/arch-x86/asm/uaccess.h +++ b/libc/kernel/arch-x86/asm/uaccess.h @@ -16,4 +16,9 @@ *** **************************************************************************** ****************************************************************************/ +#ifdef __i386__ #include "uaccess_32.h" +#else +#include "uaccess_64.h" +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#endif |