[compiler-rt] r294806 - Remove struct_rtentry_sz on FreeBSD

[Hans Wennborg via llvm-commits]

This was requested to be merged to 4.0 in the code review.

It's now been in for a while and I haven't heard of any issues.

Dimitry, go ahead and merge (or let me know and I'll do it).

Thanks,
Hans

On Fri, Feb 10, 2017 at 3:48 PM, Dimitry Andric via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: dim
> Date: Fri Feb 10 17:48:40 2017
> New Revision: 294806
>
> URL: http://llvm.org/viewvc/llvm-project?rev=294806&view=rev
> Log:
> 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/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc?rev=294806&r1=294805&r2=294806&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc (original)
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc Fri Feb 10 17:48:40 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);
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits