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/tools/cpp.py | |
parent | 76218efbeb2e124656ce15d4eb5a7039da065123 (diff) | |
download | android_bionic-d3e64a3f403918abf2cc3f9f0f9a2204a420ec96.tar.gz android_bionic-d3e64a3f403918abf2cc3f9f0f9a2204a420ec96.tar.bz2 android_bionic-d3e64a3f403918abf2cc3f9f0f9a2204a420ec96.zip |
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/tools/cpp.py')
-rw-r--r-- | libc/kernel/tools/cpp.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libc/kernel/tools/cpp.py b/libc/kernel/tools/cpp.py index b8aa7755b..e3a9038ce 100644 --- a/libc/kernel/tools/cpp.py +++ b/libc/kernel/tools/cpp.py @@ -1345,7 +1345,11 @@ class CppExpr: if macros[name] == kCppUndefinedMacro: return ("int", 0) else: - return ("int", 1) + try: + value = int(macros[name]) + return ("int", value) + except: + return ("defined", macros[name]) if kernel_remove_config_macros and name.startswith("CONFIG_"): return ("int", 0) |