summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-11-08 15:25:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-08 15:25:38 -0800
commit5c56512eebc14558a2b3b83cdca09f04084d609c (patch)
tree182dcd878127865a3fa02236ba2b9b6e988c19be /libc
parente9664fea54d21f765c906006db27b8e275c4a198 (diff)
parentcdd6fdec6c8175b4b9f132a2b11c1fc5f20e8869 (diff)
am cdd6fdec: am 6768c1ee: Merge "Add a temporary uapi/linux/compiler.h until upstream has one."
* commit 'cdd6fdec6c8175b4b9f132a2b11c1fc5f20e8869': Add a temporary uapi/linux/compiler.h until upstream has one.
Diffstat (limited to 'libc')
-rw-r--r--libc/kernel/uapi/linux/compiler.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/libc/kernel/uapi/linux/compiler.h b/libc/kernel/uapi/linux/compiler.h
new file mode 100644
index 0000000000..8e89655c89
--- /dev/null
+++ b/libc/kernel/uapi/linux/compiler.h
@@ -0,0 +1,18 @@
+#ifndef _UAPI_LINUX_COMPILER_H
+#define _UAPI_LINUX_COMPILER_H
+
+/*
+ * This file is not currently in the Linux kernel tree.
+ * Upstream uapi headers refer to <linux/compiler.h> but there is
+ * no such uapi file. We've sent this upstream, and are optimistically
+ * adding it to bionic in the meantime. This should be replaced by
+ * a scrubbed header from external/kernel-headers when possible.
+ *
+ * An alternative to this file is to check in a symbolic link to the
+ * non-uapi <linux/compiler.h>. That's fine for building bionic too.
+ */
+
+#define __user
+#define __force
+
+#endif /* _UAPI_LINUX_COMPILER_H */