wok-4.x view gcc/stuff/gcc-4.9.2-libsanitizer_fix-1.patch @ rev 12466
New toolchain GCC 4.9.2, Glibc 2.19, Binutils 2.23.1
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Wed Nov 09 15:12:00 2022 +0000 (18 months ago) |
| parents | |
| children |
line source
1 2013-12-10 Jakub Jelinek <jakub@redhat.com>
3 * sanitizer_common/Makefile.am (AM_CPPFLAGS): Add
4 -isystem $(top_srcdir)/include/system.
5 * sanitizer_common/Makefile.in: Regenerated.
6 * include/system/linux/aio_abi.h: New header.
7 * include/system/linux/mroute.h: New header.
8 * include/system/linux/mroute6.h: New header.
9 * include/system/linux/perf_event.h: New header.
10 * include/system/linux/types.h: New header.
12 --- a/libsanitizer/sanitizer_common/Makefile.am 2013-12-10 09:55:19.000000000 +0100
13 +++ b/libsanitizer/sanitizer_common/Makefile.am 2013-12-10 09:56:36.748472017 +0100
14 @@ -1,5 +1,5 @@
15 -AM_CPPFLAGS = -I $(top_srcdir)/include
16 -
17 +AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system
18 +
19 # May be used by toolexeclibdir.
20 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
22 --- a/libsanitizer/include/system/linux/mroute.h 2013-12-10 09:56:03.888640325 +0100
23 +++ b/libsanitizer/include/system/linux/mroute.h 2013-12-10 09:56:03.888640325 +0100
24 @@ -0,0 +1,8 @@
25 +#include <linux/version.h>
26 +/* <linux/mroute.h> before 2.6.26 included <linux/in.h>
27 + which clashes with userspace headers. */
28 +#if LINUX_VERSION_CODE < 132634
29 +#define _LINUX_IN_H
30 +#include <linux/types.h>
31 +#endif
32 +#include_next <linux/mroute.h>
33 --- a/libsanitizer/include/system/linux/aio_abi.h 2013-12-10 09:56:03.887640312 +0100
34 +++ b/libsanitizer/include/system/linux/aio_abi.h 2013-12-10 09:56:03.887640312 +0100
35 @@ -0,0 +1,7 @@
36 +#include <linux/version.h>
37 +#include_next <linux/aio_abi.h>
38 +/* IOCB_CMD_PREADV/PWRITEV has been added in 2.6.19 */
39 +#if LINUX_VERSION_CODE < 132627
40 +#define IOCB_CMD_PREADV 7
41 +#define IOCB_CMD_PWRITEV 8
42 +#endif
43 --- a/libsanitizer/include/system/linux/types.h 2013-12-10 09:56:03.888640325 +0100
44 +++ b/libsanitizer/include/system/linux/types.h 2013-12-10 09:56:03.888640325 +0100
45 @@ -0,0 +1,12 @@
46 +#ifndef LINUX_TYPES_WRAPPER_H
47 +#define LINUX_TYPES_WRAPPER_H
48 +
49 +/* Before
50 + https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/include/linux/types.h?id=6c7c6afbb8c0e60d32a563cae7c6889211e9d9d8
51 + linux/types.h conflicted with sys/ustat.h. Work around it. */
52 +
53 +#define ustat __asan_bad_ustat
54 +#include_next <linux/types.h>
55 +#undef ustat
56 +
57 +#endif
58 --- a/libsanitizer/include/system/linux/perf_event.h 2013-12-10 09:56:03.888640325 +0100
59 +++ b/libsanitizer/include/system/linux/perf_event.h 2013-12-10 09:56:03.888640325 +0100
60 @@ -0,0 +1,7 @@
61 +#include <linux/version.h>
62 +/* <linux/perf_event.h> has been added in 2.6.32 */
63 +#if LINUX_VERSION_CODE >= 132640
64 +#include_next <linux/perf_event.h>
65 +#else
66 +#define perf_event_attr __sanitizer_perf_event_attr
67 +#endif
68 --- a/libsanitizer/include/system/linux/mroute6.h 2013-12-10 09:56:03.888640325 +0100
69 +++ b/libsanitizer/include/system/linux/mroute6.h 2013-12-10 09:56:03.888640325 +0100
70 @@ -0,0 +1,5 @@
71 +#include <linux/version.h>
72 +/* <linux/mroute6.h> has been added in 2.6.26 */
73 +#if LINUX_VERSION_CODE >= 132634
74 +#include_next <linux/mroute6.h>
75 +#endif
76 --- a/libsanitizer/sanitizer_common/Makefile.in 2013-12-10 09:55:19.000000000 +0100
77 +++ b/libsanitizer/sanitizer_common/Makefile.in 2013-12-10 09:57:05.079324403 +0100
78 @@ -235,7 +235,7 @@ toolexeclibdir = @toolexeclibdir@
79 top_build_prefix = @top_build_prefix@
80 top_builddir = @top_builddir@
81 top_srcdir = @top_srcdir@
82 -AM_CPPFLAGS = -I $(top_srcdir)/include
83 +AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system
85 # May be used by toolexeclibdir.
86 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)