[gentoo-commits] proj/musl:master commit in: sys-libs/compiler-rt-sanitizers/files/, sys-libs/compiler-rt-sanitizers/ - gentoo-commits

From:	Aric Belsito <lluixhi@×××××.com>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/musl:master commit in: sys-libs/compiler-rt-sanitizers/files/, sys-libs/compiler-rt-sanitizers/
Date:	Wed, 27 Jun 2018 20:12:52
Message-Id:	`1530130328.a4db0d857163fa23918072cb4a24314c997a317c.lluixhi@gentoo`

1

commit:     a4db0d857163fa23918072cb4a24314c997a317c

2

Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>

3

AuthorDate: Wed Jun 27 20:12:08 2018 +0000

4

Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>

5

CommitDate: Wed Jun 27 20:12:08 2018 +0000

6

URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=a4db0d85

7

8

sys-libs/compiler-rt-sanitizers: bump to 6.0.1

9

10

 sys-libs/compiler-rt-sanitizers/Manifest           |   3 +

11

 .../compiler-rt-sanitizers-6.0.0.ebuild            |   2 +-

12

 ....ebuild => compiler-rt-sanitizers-6.0.1.ebuild} |  10 +-

13

 ...compiler-rt-sanitizers-6.0.1-musl-patches.patch | 287 +++++++++++++++++++++

14

 4 files changed, 299 insertions(+), 3 deletions(-)

15

16

diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest

17

index 7b4c6b9..4ce4f0d 100644

18

--- a/sys-libs/compiler-rt-sanitizers/Manifest

19

+++ b/sys-libs/compiler-rt-sanitizers/Manifest

20

@@ -2,8 +2,11 @@ DIST compiler-rt-4.0.1.src.tar.xz 1434100 BLAKE2B ca6bf78fc07f387b7244a52ef648b0

21

 DIST compiler-rt-5.0.1.src.tar.xz 1498220 BLAKE2B 61503df8a4075c2fe1e42d480753b861321b5de127e340f48d648fc38d81c7967cead17e136beaa5235cc92540f158915fccec77cf39aa7c336d106c9d265222 SHA512 61e23775db78bdeed3003a509b45ae609287db31302fed186f3210d481ecf062d1828571e63482215ab00ff732df8f3fa6c77334dfb677e4b76eb555d476b8c4

22

 DIST compiler-rt-5.0.2.src.tar.xz 1543256 BLAKE2B 09fa84b8f3e9b8627a14387bc6eaa3d6b4588b9c8f1ac5a0114135fd830e3d45922408b237866789eb81bf38defde1186e0f7430a69f825bee12776b7cd9f74e SHA512 605a6d064877a860d6c9097e0220896dfceafed0a2392ad495c97aa347b97899d89f7e21932e29d3274f396615837414a3e730a915fe4f53eaa858ce3642a666

23

 DIST compiler-rt-6.0.0.src.tar.xz 1633096 BLAKE2B d5df9b16ad474f687507013fb6eda8c7c3bbe479c85aab6ce428b93bbef2467538c0ba59c54dd9266b978da53c8c312a59e3b7abac843702048900f5cdbc1011 SHA512 717bed116ef43ebb2e18daf6fb737472edf57564947f53fe6368d3bbb080f63e986c0d1b94dbd087be998196ad7be54f4361854f8eb5214600b82449ba02c9c1

24

+DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963

25

 DIST compiler-rt-sanitizers-4.0.1-patchset.tar.xz 2384 BLAKE2B 6f9eee711c83570767f0bb634d0f91c18ee7f2af93a478938b8d5b6ce6f2c2fbaadb7bd5c7ee94a14dc1834359a046187db6bc7005b7c2efa539325dc0701ad9 SHA512 72d7357b4c27bbf8fa8b34803ddea905a9f1054e8fc7bf99a4ead9dc00408989ea2709f04be9cf45a27eeb4b9386c89feeb25b53a84f3cac9739196b89813887

26

+DIST compiler-rt-sanitizers-6.0.1-patchset.tar.xz 8820 BLAKE2B d53ca357e060d058c7f20c51e74684f4c032fdf3ccec4c9f227dc7a5757206f331b9eda25a72c5c66faf4c44b2cc63eb439bd21bdd55d37a93918ab428fd7cd4 SHA512 782a34c56134bd061da30c1f598ddb9e90cb34a4e4ef058fa9634f6da372fd8693ff5e6cf98b59700942273240f83052b89ee2736b22f4e19bc8b519fbec8cad

27

 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d

28

 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb

29

 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1

30

 DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c

31

+DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9

32

33

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild

34

index 6616e20..7537996 100644

35

--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild

36

+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild

37

@@ -21,7 +21,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz

38

39

 LICENSE="|| ( UoI-NCSA MIT )"

40

 SLOT="${PV%_*}"

41

-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"

42

+KEYWORDS="~amd64 ~x86"

43

 IUSE="+clang test elibc_glibc"

44

 RESTRICT="!test? ( test ) !clang? ( test )"

45

46

47

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild

48

similarity index 94%

49

copy from sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild

50

copy to sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild

51

index 6616e20..d2a3805 100644

52

--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild

53

+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild

54

@@ -17,11 +17,12 @@ LLVM_P=llvm-${PV/_/}.src

55

 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"

56

 HOMEPAGE="https://llvm.org/"

57

 SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz

58

+	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.xz

59

 	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"

60

61

 LICENSE="|| ( UoI-NCSA MIT )"

62

 SLOT="${PV%_*}"

63

-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"

64

+KEYWORDS="~amd64 ~x86"

65

 IUSE="+clang test elibc_glibc"

66

 RESTRICT="!test? ( test ) !clang? ( test )"

67

68

@@ -39,7 +40,7 @@ DEPEND="

69

70

 S=${WORKDIR}/${MY_P}

71

72

-PATCHES=( "${FILESDIR}"/${PN}-6.0.0-musl-patches.patch )

73

+PATCHES=( "${FILESDIR}"/${PN}-6.0.1-musl-patches.patch )

74

75

 # least intrusive of all

76

 CMAKE_BUILD_TYPE=RelWithDebInfo

77

@@ -64,6 +65,8 @@ pkg_setup() {

78

 src_unpack() {

79

 	einfo "Unpacking ${MY_P}.tar.xz ..."

80

 	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die

81

+	einfo "Unpacking ${P}-patchset.tar.xz ..."

82

+	tar -xf "${DISTDIR}/${P}-patchset.tar.xz" || die

83

84

 	if use test; then

85

 		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."

86

@@ -76,6 +79,9 @@ src_unpack() {

87

 src_prepare() {

88

 	cmake-utils_src_prepare

89

90

+	# apply the patchset (new glibc fixes)

91

+	eapply "${WORKDIR}/${P}-patchset"

92

+

93

 	if use test; then

94

 		# remove tests that are broken by new glibc

95

 		# https://bugs.llvm.org/show_bug.cgi?id=36065

96

97

diff --git a/sys-libs/compiler-rt-sanitizers/files/compiler-rt-sanitizers-6.0.1-musl-patches.patch b/sys-libs/compiler-rt-sanitizers/files/compiler-rt-sanitizers-6.0.1-musl-patches.patch

98

new file mode 100644

99

index 0000000..fb76e07

100

--- /dev/null

101

+++ b/sys-libs/compiler-rt-sanitizers/files/compiler-rt-sanitizers-6.0.1-musl-patches.patch

102

@@ -0,0 +1,287 @@

103

+diff -Naur compiler-rt-6.0.1.src.orig/lib/asan/asan_linux.cc compiler-rt-6.0.1.src/lib/asan/asan_linux.cc

104

+--- compiler-rt-6.0.1.src.orig/lib/asan/asan_linux.cc	2018-02-07 11:51:13.000000000 -0800

105

++++ compiler-rt-6.0.1.src/lib/asan/asan_linux.cc	2018-06-27 13:01:11.942744865 -0700

106

+@@ -46,7 +46,7 @@

107

+ #include <link.h>

108

+ #endif

109

+

110

+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS

111

++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU

112

+ #include <ucontext.h>

113

+ extern "C" void* _DYNAMIC;

114

+ #elif SANITIZER_NETBSD

115

+@@ -139,7 +139,7 @@

116

+   UNIMPLEMENTED();

117

+ }

118

+

119

+-#if SANITIZER_ANDROID

120

++#if SANITIZER_ANDROID || SANITIZER_NONGNU

121

+ // FIXME: should we do anything for Android?

122

+ void AsanCheckDynamicRTPrereqs() {}

123

+ void AsanCheckIncompatibleRT() {}

124

+diff -Naur compiler-rt-6.0.1.src.orig/lib/interception/interception_linux.cc compiler-rt-6.0.1.src/lib/interception/interception_linux.cc

125

+--- compiler-rt-6.0.1.src.orig/lib/interception/interception_linux.cc	2017-12-14 12:14:29.000000000 -0800

126

++++ compiler-rt-6.0.1.src/lib/interception/interception_linux.cc	2018-06-27 13:01:11.942744865 -0700

127

+@@ -43,7 +43,7 @@

128

+ }

129

+

130

+ // Android and Solaris do not have dlvsym

131

+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS

132

++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && defined(__GLIBC__)

133

+ void *GetFuncAddrVer(const char *func_name, const char *ver) {

134

+   return dlvsym(RTLD_NEXT, func_name, ver);

135

+ }

136

+diff -Naur compiler-rt-6.0.1.src.orig/lib/msan/msan_interceptors.cc compiler-rt-6.0.1.src/lib/msan/msan_interceptors.cc

137

+--- compiler-rt-6.0.1.src.orig/lib/msan/msan_interceptors.cc	2017-12-13 17:20:16.000000000 -0800

138

++++ compiler-rt-6.0.1.src/lib/msan/msan_interceptors.cc	2018-06-27 13:01:11.942744865 -0700

139

+@@ -1438,6 +1438,7 @@

140

+   return cbdata->callback(info, size, cbdata->data);

141

+ }

142

+

143

++/* does not compile with musl

144

+ INTERCEPTOR(void *, shmat, int shmid, const void *shmaddr, int shmflg) {

145

+   ENSURE_MSAN_INITED();

146

+   void *p = REAL(shmat)(shmid, shmaddr, shmflg);

147

+@@ -1450,6 +1451,7 @@

148

+   }

149

+   return p;

150

+ }

151

++*/

152

+

153

+ INTERCEPTOR(int, dl_iterate_phdr, dl_iterate_phdr_cb callback, void *data) {

154

+   void *ctx;

155

+@@ -1668,7 +1670,7 @@

156

+   INTERCEPT_FUNCTION(pthread_join);

157

+   INTERCEPT_FUNCTION(tzset);

158

+   INTERCEPT_FUNCTION(__cxa_atexit);

159

+-  INTERCEPT_FUNCTION(shmat);

160

++  // INTERCEPT_FUNCTION(shmat); // does not compile with musl

161

+   INTERCEPT_FUNCTION(fork);

162

+   INTERCEPT_FUNCTION(openpty);

163

+   INTERCEPT_FUNCTION(forkpty);

164

+diff -Naur compiler-rt-6.0.1.src.orig/lib/msan/msan_linux.cc compiler-rt-6.0.1.src/lib/msan/msan_linux.cc

165

+--- compiler-rt-6.0.1.src.orig/lib/msan/msan_linux.cc	2017-11-07 15:51:22.000000000 -0800

166

++++ compiler-rt-6.0.1.src/lib/msan/msan_linux.cc	2018-06-27 13:01:11.943744865 -0700

167

+@@ -13,7 +13,7 @@

168

+ //===----------------------------------------------------------------------===//

169

+

170

+ #include "sanitizer_common/sanitizer_platform.h"

171

+-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD

172

++#if SANITIZER_FREEBSD || SANITIZER_LINUX && !SANITIZER_NONGNU || SANITIZER_NETBSD

173

+

174

+ #include "msan.h"

175

+ #include "msan_thread.h"

176

+diff -Naur compiler-rt-6.0.1.src.orig/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc compiler-rt-6.0.1.src/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

177

+--- compiler-rt-6.0.1.src.orig/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc	2017-12-14 12:14:29.000000000 -0800

178

++++ compiler-rt-6.0.1.src/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc	2018-06-27 13:01:11.944744865 -0700

179

+@@ -102,7 +102,7 @@

180

+   _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);

181

+ #endif

182

+

183

+-#if SANITIZER_LINUX

184

++#if SANITIZER_LINUX && !SANITIZER_NONGNU

185

+   // Conflicting request ids.

186

+   // _(CDROMAUDIOBUFSIZ, NONE, 0);

187

+   // _(SNDCTL_TMR_CONTINUE, NONE, 0);

188

+@@ -363,7 +363,7 @@

189

+   _(VT_WAITACTIVE, NONE, 0);

190

+ #endif

191

+

192

+-#if SANITIZER_LINUX && !SANITIZER_ANDROID

193

++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU

194

+   // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE

195

+   _(CYGETDEFTHRESH, WRITE, sizeof(int));

196

+   _(CYGETDEFTIMEOUT, WRITE, sizeof(int));

197

+diff -Naur compiler-rt-6.0.1.src.orig/lib/sanitizer_common/sanitizer_common_syscalls.inc compiler-rt-6.0.1.src/lib/sanitizer_common/sanitizer_common_syscalls.inc

198

+--- compiler-rt-6.0.1.src.orig/lib/sanitizer_common/sanitizer_common_syscalls.inc	2016-06-24 16:09:44.000000000 -0700

199

++++ compiler-rt-6.0.1.src/lib/sanitizer_common/sanitizer_common_syscalls.inc	2018-06-27 13:01:11.945744865 -0700

200

+@@ -2038,7 +2038,7 @@

201

+   }

202

+ }

203

+

204

+-#if !SANITIZER_ANDROID

205

++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU

206

+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,

207

+                        void *old_rlim) {

208

+   if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);

209

+diff -Naur compiler-rt-6.0.1.src.orig/lib/sanitizer_common/sanitizer_platform.h compiler-rt-6.0.1.src/lib/sanitizer_common/sanitizer_platform.h

210

+--- compiler-rt-6.0.1.src.orig/lib/sanitizer_common/sanitizer_platform.h	2017-12-14 12:14:29.000000000 -0800

211

++++ compiler-rt-6.0.1.src/lib/sanitizer_common/sanitizer_platform.h	2018-06-27 13:01:11.945744865 -0700

212

+@@ -25,6 +25,12 @@

213

+ # define SANITIZER_LINUX   0

214

+ #endif

215

+

216

++#if defined(__linux__) && !defined(__GLIBC__)

217

++# define SANITIZER_NONGNU 1

218

++#else

219

++# define SANITIZER_NONGNU 0

220

++#endif

221

++

222

+ #if defined(__FreeBSD__)

223

+ # define SANITIZER_FREEBSD 1

224

+ #else

225

+diff -Naur compiler-rt-6.0.1.src.orig/lib/sanitizer_common/sanitizer_platform_interceptors.h compiler-rt-6.0.1.src/lib/sanitizer_common/sanitizer_platform_interceptors.h

226

+--- compiler-rt-6.0.1.src.orig/lib/sanitizer_common/sanitizer_platform_interceptors.h	2017-12-28 15:06:51.000000000 -0800

227

++++ compiler-rt-6.0.1.src/lib/sanitizer_common/sanitizer_platform_interceptors.h	2018-06-27 13:01:11.945744865 -0700

228

+@@ -38,7 +38,7 @@

229

+ # include "sanitizer_platform_limits_solaris.h"

230

+ #endif

231

+

232

+-#if SANITIZER_LINUX && !SANITIZER_ANDROID

233

++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU

234

+ # define SI_LINUX_NOT_ANDROID 1

235

+ #else

236

+ # define SI_LINUX_NOT_ANDROID 0

237

+diff -Naur compiler-rt-6.0.1.src.orig/lib/sanitizer_common/sanitizer_platform_limits_posix.cc compiler-rt-6.0.1.src/lib/sanitizer_common/sanitizer_platform_limits_posix.cc

238

+--- compiler-rt-6.0.1.src.orig/lib/sanitizer_common/sanitizer_platform_limits_posix.cc	2018-06-14 15:33:33.000000000 -0700

239

++++ compiler-rt-6.0.1.src/lib/sanitizer_common/sanitizer_platform_limits_posix.cc	2018-06-27 13:03:17.471742617 -0700

240

+@@ -138,12 +138,14 @@

241

+

242

+ #if SANITIZER_LINUX && !SANITIZER_ANDROID

243

+ #include <glob.h>

244

+-#include <obstack.h>

245

++#if !SANITIZER_NONGNU

246

++# include <obstack.h>

247

++#endif

248

+ #include <mqueue.h>

249

+-#include <net/if_ppp.h>

250

+-#include <netax25/ax25.h>

251

+-#include <netipx/ipx.h>

252

+-#include <netrom/netrom.h>

253

++#include <linux/if_ppp.h>

254

++#include <linux/ax25.h>

255

++#include <linux/ipx.h>

256

++#include <linux/netrom.h>

257

+ #if HAVE_RPC_XDR_H

258

+ # include <rpc/xdr.h>

259

+ #elif HAVE_TIRPC_RPC_XDR_H

260

+@@ -251,7 +253,7 @@

261

+   unsigned struct_itimerspec_sz = sizeof(struct itimerspec);

262

+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD

263

+

264

+-#if SANITIZER_LINUX && !SANITIZER_ANDROID

265

++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU

266

+   // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which

267

+   // has been removed from glibc 2.28.

268

+ #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \

269

+@@ -286,9 +288,9 @@

270

+ #endif

271

+

272

+

273

+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID

274

++#if (SANITIZER_LINUX && !SANITIZER_NONGNU || SANITIZER_FREEBSD) && !SANITIZER_ANDROID

275

+   unsigned struct_shminfo_sz = sizeof(struct shminfo);

276

+-  unsigned struct_shm_info_sz = sizeof(struct shm_info);

277

++  unsigned struct_shm_info_sz = sizeof(nstruct shm_info);

278

+   int shmctl_ipc_stat = (int)IPC_STAT;

279

+   int shmctl_ipc_info = (int)IPC_INFO;

280

+   int shmctl_shm_info = (int)SHM_INFO;

281

+@@ -322,7 +324,7 @@

282

+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);

283

+ #endif

284

+

285

+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID

286

++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU

287

+   int glob_nomatch = GLOB_NOMATCH;

288

+   int glob_altdirfunc = GLOB_ALTDIRFUNC;

289

+ #endif

290

+@@ -416,7 +418,7 @@

291

+   unsigned struct_termios_sz = sizeof(struct termios);

292

+   unsigned struct_winsize_sz = sizeof(struct winsize);

293

+

294

+-#if SANITIZER_LINUX

295

++#if SANITIZER_LINUX  && !SANITIZER_NONGNU

296

+   unsigned struct_arpreq_sz = sizeof(struct arpreq);

297

+   unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);

298

+   unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);

299

+@@ -466,7 +468,7 @@

300

+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);

301

+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD

302

+

303

+-#if SANITIZER_LINUX && !SANITIZER_ANDROID

304

++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU

305

+   unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);

306

+   unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);

307

+ #if EV_VERSION > (0x010000)

308

+@@ -834,7 +836,7 @@

309

+   unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;

310

+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD

311

+

312

+-#if SANITIZER_LINUX && !SANITIZER_ANDROID

313

++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU

314

+   unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;

315

+   unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;

316

+   unsigned IOCTL_CYGETMON = CYGETMON;

317

+@@ -989,7 +991,7 @@

318

+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);

319

+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD

320

+

321

+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID

322

++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU

323

+ CHECK_TYPE_SIZE(glob_t);

324

+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);

325

+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);

326

+@@ -1023,6 +1025,7 @@

327

+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);

328

+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);

329

+

330

++#if  !SANITIZER_NONGNU

331

+ CHECK_TYPE_SIZE(msghdr);

332

+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);

333

+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);

334

+@@ -1036,6 +1039,7 @@

335

+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);

336

+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);

337

+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);

338

++#endif

339

+

340

+ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));

341

+ CHECK_SIZE_AND_OFFSET(dirent, d_ino);

342

+@@ -1138,7 +1142,7 @@

343

+

344

+ CHECK_TYPE_SIZE(ether_addr);

345

+

346

+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID

347

++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU

348

+ CHECK_TYPE_SIZE(ipc_perm);

349

+ # if SANITIZER_FREEBSD

350

+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);

351

+@@ -1199,7 +1203,7 @@

352

+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);

353

+ #endif

354

+

355

+-#if SANITIZER_LINUX

356

++#if SANITIZER_LINUX && !SANITIZER_NONGNU

357

+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));

358

+ #endif

359

+

360

+@@ -1249,7 +1253,7 @@

361

+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);

362

+ #endif

363

+

364

+-#if SANITIZER_LINUX && !SANITIZER_ANDROID

365

++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU

366

+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));

367

+ CHECK_SIZE_AND_OFFSET(FILE, _flags);

368

+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);

369

+@@ -1268,7 +1272,7 @@

370

+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);

371

+ #endif

372

+

373

+-#if SANITIZER_LINUX && !SANITIZER_ANDROID

374

++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU

375

+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));

376

+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);

377

+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);

378

+diff -Naur compiler-rt-6.0.1.src.orig/lib/tsan/rtl/tsan_platform_linux.cc compiler-rt-6.0.1.src/lib/tsan/rtl/tsan_platform_linux.cc

379

+--- compiler-rt-6.0.1.src.orig/lib/tsan/rtl/tsan_platform_linux.cc	2017-11-28 08:28:54.000000000 -0800

380

++++ compiler-rt-6.0.1.src/lib/tsan/rtl/tsan_platform_linux.cc	2018-06-27 13:01:11.946744865 -0700

381

+@@ -285,7 +285,7 @@

382

+ // This is required to properly "close" the fds, because we do not see internal

383

+ // closes within glibc. The code is a pure hack.

384

+ int ExtractResolvFDs(void *state, int *fds, int nfd) {

385

+-#if SANITIZER_LINUX && !SANITIZER_ANDROID

386

++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU

387

+   int cnt = 0;

388

+   struct __res_state *statp = (struct __res_state*)state;

389

+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {

Gentoo Archives: gentoo-commits