From 21327fe5f1a978d374beba579350734ff759eb8d Mon Sep 17 00:00:00 2001 From: Andreas Tobler Date: Fri, 17 Feb 2017 20:23:28 +0100 Subject: [PATCH] backport: re PR sanitizer/79562 (sanitizer breaks bootstrap of x86_64-*-freebsd) 2017-02-17 Andreas Tobler Backported from mainline 2017-02-16 Andreas Tobler PR sanitizer/79562 * sanitizer_common/sanitizer_platform_limits_posix.cc: Cherry-pick upstream r294806. From-SVN: r245547 --- libsanitizer/ChangeLog | 9 +++++++++ .../sanitizer_common/sanitizer_platform_limits_posix.cc | 7 +------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 13d19493495a..00af6a47885f 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,12 @@ +2017-02-17 Andreas Tobler + + Backported from mainline + 2017-02-16 Andreas Tobler + + PR sanitizer/79562 + * sanitizer_common/sanitizer_platform_limits_posix.cc: Cherry-pick + upstream r294806. + 2016-11-16 Markus Trippelsdorf PR sanitizer/78294 diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc index 2ef4ca22276e..0d5b11f6e15f 100644 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -21,11 +21,6 @@ #ifdef _FILE_OFFSET_BITS #undef _FILE_OFFSET_BITS #endif -#if SANITIZER_FREEBSD -#define _WANT_RTENTRY -#include -#include -#endif #include #include #include @@ -353,6 +348,7 @@ namespace __sanitizer { unsigned struct_input_absinfo_sz = sizeof(struct input_absinfo); unsigned struct_input_id_sz = sizeof(struct input_id); unsigned struct_mtpos_sz = sizeof(struct mtpos); + unsigned struct_rtentry_sz = sizeof(struct rtentry); unsigned struct_termio_sz = sizeof(struct termio); unsigned struct_vt_consize_sz = sizeof(struct vt_consize); unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes); @@ -372,7 +368,6 @@ namespace __sanitizer { unsigned struct_midi_info_sz = sizeof(struct midi_info); unsigned struct_mtget_sz = sizeof(struct mtget); unsigned struct_mtop_sz = sizeof(struct mtop); - unsigned struct_rtentry_sz = sizeof(struct rtentry); unsigned struct_sbi_instrument_sz = sizeof(struct sbi_instrument); unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec); unsigned struct_synth_info_sz = sizeof(struct synth_info); -- 2.47.2