git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile.am (AM_CPPFLAGS): Add -isystem $(top_srcdir)/include/system. 

* 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.

From-SVN: r206476
This commit is contained in:
Jakub Jelinek 2014-01-09 19:15:41 +01:00 committed by Jakub Jelinek
parent c915a58145
commit 2613419a70
8 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libsanitizer/ChangeLog
View File

@ -1,4 +1,13 @@
2014-10-09 Jakub Jelinek <jakub@redhat.com> 2014-01-09 Jakub Jelinek <jakub@redhat.com>
* 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.
PR sanitizer/59136 PR sanitizer/59136
* sanitizer_common/Makefile.am (AM_CXXFLAGS): If * sanitizer_common/Makefile.am (AM_CXXFLAGS): If

7
libsanitizer/include/system/linux/aio_abi.h Normal file
View File

@ -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

8
libsanitizer/include/system/linux/mroute.h Normal file
View File

@ -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>

5
libsanitizer/include/system/linux/mroute6.h Normal file
View File

@ -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

7
libsanitizer/include/system/linux/perf_event.h Normal file
View File

@ -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

12
libsanitizer/include/system/linux/types.h Normal file
View File

@ -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

4
libsanitizer/sanitizer_common/Makefile.am
View File

@ -1,5 +1,5 @@
AM_CPPFLAGS = -I $(top_srcdir)/include AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system
# May be used by toolexeclibdir. # May be used by toolexeclibdir.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)

2
libsanitizer/sanitizer_common/Makefile.in
View File

@ -235,7 +235,7 @@ toolexeclibdir = @toolexeclibdir@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I $(top_srcdir)/include AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system
# May be used by toolexeclibdir. # May be used by toolexeclibdir.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)