[llvm-branch-commits] [compiler-rt-branch] r295095 - Merging r294806:

[Dimitry Andric via llvm-branch-commits]

Author: dim
Date: Tue Feb 14 13:40:03 2017
New Revision: 295095

URL: http://llvm.org/viewvc/llvm-project?rev=295095&view=rev
Log:
Merging r294806:
------------------------------------------------------------------------
r294806 | dim | 2017-02-11 00:48:40 +0100 (Sat, 11 Feb 2017) | 15 lines

Remove struct_rtentry_sz on FreeBSD

Summary:
Since struct rtentry is an internal kernel-only structure on FreeBSD,
and SIOCADDRT and SIOCDELRT are not supported anyway, stop including
socketvar.h and attempting to get at the definition of struct rtentry,
and move the line with struct_rtentry_sz to the SANIZER_LINUX block.

Reviewers: kcc, kutuzov.viktor.84, emaste

Reviewed By: kcc, emaste

Subscribers: emaste, llvm-commits, kubamracek

Differential Revision: https://reviews.llvm.org/D29832
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_40/   (props changed)
    compiler-rt/branches/release_40/lib/sanitizer_common/sanitizer_platform_limits_posix.cc

Propchange: compiler-rt/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 13:40:03 2017
@@ -1 +1 @@
-/compiler-rt/trunk:292517,293120,293536,294886
+/compiler-rt/trunk:292517,293120,293536,294806,294886

Modified: compiler-rt/branches/release_40/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_40/lib/sanitizer_common/sanitizer_platform_limits_posix.cc?rev=295095&r1=295094&r2=295095&view=diff
==============================================================================
--- compiler-rt/branches/release_40/lib/sanitizer_common/sanitizer_platform_limits_posix.cc (original)
+++ compiler-rt/branches/release_40/lib/sanitizer_common/sanitizer_platform_limits_posix.cc Tue Feb 14 13:40:03 2017
@@ -23,11 +23,6 @@
 #ifdef _FILE_OFFSET_BITS
 #undef _FILE_OFFSET_BITS
 #endif
-#if SANITIZER_FREEBSD
-#define _WANT_RTENTRY
-#include <sys/param.h>
-#include <sys/socketvar.h>
-#endif
 #include <arpa/inet.h>
 #include <dirent.h>
 #include <errno.h>
@@ -433,6 +428,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
   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);
@@ -452,7 +448,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
   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);