Wed Jun 14 12:16:27 2017 UTC ()
Detach <sys/user.h> from sanitizer_procmaps_netbsd.cc (GCC)

This header in this context is freebsdism.

Sponsored by <The NetBSD Foundation>


(kamil)
diff -r1.2 -r1.3 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_procmaps_netbsd.cc
cvs diff -r1.2 -r1.3 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/Attic/sanitizer_procmaps_netbsd.cc (expand / switch to unified diff)

--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/Attic/sanitizer_procmaps_netbsd.cc 2016/06/01 04:06:15 1.2
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/Attic/sanitizer_procmaps_netbsd.cc 2017/06/14 12:16:27 1.3
@@ -5,27 +5,26 @@ @@ -5,27 +5,26 @@
5// 5//
6//===----------------------------------------------------------------------===// 6//===----------------------------------------------------------------------===//
7// 7//
8// Information about the process mappings (FreeBSD-specific parts). 8// Information about the process mappings (FreeBSD-specific parts).
9//===----------------------------------------------------------------------===// 9//===----------------------------------------------------------------------===//
10 10
11#include "sanitizer_platform.h" 11#include "sanitizer_platform.h"
12#if SANITIZER_NETBSD 12#if SANITIZER_NETBSD
13#include "sanitizer_common.h" 13#include "sanitizer_common.h"
14#include "sanitizer_procmaps.h" 14#include "sanitizer_procmaps.h"
15 15
16#include <unistd.h> 16#include <unistd.h>
17#include <sys/sysctl.h> 17#include <sys/sysctl.h>
18#include <sys/user.h> 
19 18
20namespace __sanitizer { 19namespace __sanitizer {
21 20
22void ReadProcMaps(ProcSelfMapsBuff *proc_maps) { 21void ReadProcMaps(ProcSelfMapsBuff *proc_maps) {
23 struct kinfo_vmentry *kiv; 22 struct kinfo_vmentry *kiv;
24 const int Mib[] = { CTL_VM, VM_PROC, VM_PROC_MAP, getpid(), sizeof(*kiv) }; 23 const int Mib[] = { CTL_VM, VM_PROC, VM_PROC_MAP, getpid(), sizeof(*kiv) };
25 size_t Size = 0; 24 size_t Size = 0;
26 int Err = sysctl(Mib, __arraycount(Mib), NULL, &Size, NULL, 0); 25 int Err = sysctl(Mib, __arraycount(Mib), NULL, &Size, NULL, 0);
27 CHECK_EQ(Err, 0); 26 CHECK_EQ(Err, 0);
28 CHECK_GT(Size, 0); 27 CHECK_GT(Size, 0);
29 28
30 size_t MmapedSize = Size * 4 / 3; 29 size_t MmapedSize = Size * 4 / 3;
31 void *VmMap = MmapOrDie(MmapedSize, "ReadProcMaps()"); 30 void *VmMap = MmapOrDie(MmapedSize, "ReadProcMaps()");