diff options
author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-01-09 18:15:41 +0000 |
---|---|---|
committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-01-09 18:15:41 +0000 |
commit | da09c45097c5aa5270015eb6eac1355a102bd75f (patch) | |
tree | efb884e25a1f421a7a25d54c4f0b0f9506c4e226 /libsanitizer/include | |
parent | 1e25dcade351151929a2a6030a0eef6e96e1ca94 (diff) | |
download | gcc-da09c45097c5aa5270015eb6eac1355a102bd75f.tar.gz |
* sanitizer_common/Makefile.am (AM_CPPFLAGS): Add
-isystem $(top_srcdir)/include/system.
* sanitizer_common/Makefile.in: Regenerated.
* include/system/linux/aio_abi.h: New header.
* include/system/linux/mroute.h: New header.
* include/system/linux/mroute6.h: New header.
* include/system/linux/perf_event.h: New header.
* include/system/linux/types.h: New header.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206476 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer/include')
-rw-r--r-- | libsanitizer/include/system/linux/aio_abi.h | 7 | ||||
-rw-r--r-- | libsanitizer/include/system/linux/mroute.h | 8 | ||||
-rw-r--r-- | libsanitizer/include/system/linux/mroute6.h | 5 | ||||
-rw-r--r-- | libsanitizer/include/system/linux/perf_event.h | 7 | ||||
-rw-r--r-- | libsanitizer/include/system/linux/types.h | 12 |
5 files changed, 39 insertions, 0 deletions
diff --git a/libsanitizer/include/system/linux/aio_abi.h b/libsanitizer/include/system/linux/aio_abi.h new file mode 100644 index 00000000000..8fd317ff48a --- /dev/null +++ b/libsanitizer/include/system/linux/aio_abi.h @@ -0,0 +1,7 @@ +#include <linux/version.h> +#include_next <linux/aio_abi.h> +/* IOCB_CMD_PREADV/PWRITEV has been added in 2.6.19 */ +#if LINUX_VERSION_CODE < 132627 +#define IOCB_CMD_PREADV 7 +#define IOCB_CMD_PWRITEV 8 +#endif diff --git a/libsanitizer/include/system/linux/mroute.h b/libsanitizer/include/system/linux/mroute.h new file mode 100644 index 00000000000..cec9ec12a94 --- /dev/null +++ b/libsanitizer/include/system/linux/mroute.h @@ -0,0 +1,8 @@ +#include <linux/version.h> +/* <linux/mroute.h> before 2.6.26 included <linux/in.h> + which clashes with userspace headers. */ +#if LINUX_VERSION_CODE < 132634 +#define _LINUX_IN_H +#include <linux/types.h> +#endif +#include_next <linux/mroute.h> diff --git a/libsanitizer/include/system/linux/mroute6.h b/libsanitizer/include/system/linux/mroute6.h new file mode 100644 index 00000000000..45046020ffd --- /dev/null +++ b/libsanitizer/include/system/linux/mroute6.h @@ -0,0 +1,5 @@ +#include <linux/version.h> +/* <linux/mroute6.h> has been added in 2.6.26 */ +#if LINUX_VERSION_CODE >= 132634 +#include_next <linux/mroute6.h> +#endif diff --git a/libsanitizer/include/system/linux/perf_event.h b/libsanitizer/include/system/linux/perf_event.h new file mode 100644 index 00000000000..e54998beed6 --- /dev/null +++ b/libsanitizer/include/system/linux/perf_event.h @@ -0,0 +1,7 @@ +#include <linux/version.h> +/* <linux/perf_event.h> has been added in 2.6.32 */ +#if LINUX_VERSION_CODE >= 132640 +#include_next <linux/perf_event.h> +#else +#define perf_event_attr __sanitizer_perf_event_attr +#endif diff --git a/libsanitizer/include/system/linux/types.h b/libsanitizer/include/system/linux/types.h new file mode 100644 index 00000000000..01c98b9a3ad --- /dev/null +++ b/libsanitizer/include/system/linux/types.h @@ -0,0 +1,12 @@ +#ifndef LINUX_TYPES_WRAPPER_H +#define LINUX_TYPES_WRAPPER_H + +/* Before + https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/include/linux/types.h?id=6c7c6afbb8c0e60d32a563cae7c6889211e9d9d8 + linux/types.h conflicted with sys/ustat.h. Work around it. */ + +#define ustat __asan_bad_ustat +#include_next <linux/types.h> +#undef ustat + +#endif |