diff options
| author | Ben Cheng <bccheng@google.com> | 2012-03-07 16:16:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 16:16:10 -0800 |
| commit | 36c8c1039fca1c338796c4a8951c31e4fdf1d3b9 (patch) | |
| tree | fc661a73e7311d4b2cfceb47f3eb9228e16ab96b /libc/kernel/common/linux/compiler-gcc.h | |
| parent | 27a5923b24a7f0a1a75498bcb6771f380b681e09 (diff) | |
| parent | 4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd (diff) | |
Merge "Revert "Update bionic kernel headers using update_all.py""
Diffstat (limited to 'libc/kernel/common/linux/compiler-gcc.h')
| -rw-r--r-- | libc/kernel/common/linux/compiler-gcc.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libc/kernel/common/linux/compiler-gcc.h b/libc/kernel/common/linux/compiler-gcc.h index 106486861..0dd4a6278 100644 --- a/libc/kernel/common/linux/compiler-gcc.h +++ b/libc/kernel/common/linux/compiler-gcc.h @@ -7,23 +7,16 @@ *** structures, and macros generated from the original header, and thus, *** contains no copyrightable information. *** - *** To edit the content of this header, modify the corresponding - *** source file (e.g. under external/kernel-headers/original/) then - *** run bionic/libc/kernel/tools/update_all.py - *** - *** Any manual change here will be lost the next time this script will - *** be run. You've been warned! - *** **************************************************************************** ****************************************************************************/ #define barrier() __asm__ __volatile__("": : :"memory") + #define RELOC_HIDE(ptr, off) ({ unsigned long __ptr; __asm__ ("" : "=r"(__ptr) : "0"(ptr)); (typeof(ptr)) (__ptr + (off)); }) + #define inline inline __attribute__((always_inline)) #define __inline__ __inline__ __attribute__((always_inline)) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define __inline __inline __attribute__((always_inline)) #define __deprecated __attribute__((deprecated)) #define noinline __attribute__((noinline)) #define __attribute_pure__ __attribute__((pure)) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define __attribute_const__ __attribute__((__const__)) |