diff options
| author | Sumanth Gundapaneni <sgundapa@codeaurora.org> | 2015-12-01 23:06:23 +0000 |
|---|---|---|
| committer | Sumanth Gundapaneni <sgundapa@codeaurora.org> | 2015-12-01 23:06:23 +0000 |
| commit | c1c674c60b6d60d9292e4baca4546ca949255671 (patch) | |
| tree | 88d4cdb0356f0b301038bd71a2f26d7ca3bb41b5 /compiler-rt/lib/builtins | |
| parent | d8828fcff002510b4241af94d00fb122a254715a (diff) | |
| download | bcm5719-llvm-c1c674c60b6d60d9292e4baca4546ca949255671.tar.gz bcm5719-llvm-c1c674c60b6d60d9292e4baca4546ca949255671.zip | |
builtins: Fix the sysroot's reference to si_int in int_types.h
si_int is already defined in sysroot's siginfo.h
emutls.c includes pthread.h which includes asm/siginfo.h which
in turn includes asm-generic/siginfo.h and that defines si_int.
si_int is also defined in builtin's int_types.h and this leads to
errors. This patch fixes the issue by undefining the si_int in int_types.h
Differential Revision: http://reviews.llvm.org/D15086
llvm-svn: 254472
Diffstat (limited to 'compiler-rt/lib/builtins')
| -rw-r--r-- | compiler-rt/lib/builtins/int_types.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler-rt/lib/builtins/int_types.h b/compiler-rt/lib/builtins/int_types.h index ba1f7522a83..2dad43bc738 100644 --- a/compiler-rt/lib/builtins/int_types.h +++ b/compiler-rt/lib/builtins/int_types.h @@ -20,6 +20,10 @@ #include "int_endianness.h" +/* si_int is defined in Linux sysroot's asm-generic/siginfo.h */ +#ifdef si_int +#undef si_int +#endif typedef int si_int; typedef unsigned su_int; |
