Fix sanitizer build without O_CLOEXEC

nikic · nikic · commit 22d0f1556bec · 2020-02-05T17:26:25.000+01:00
Define it to 0 if it doesn't exist.
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_posix.cpp
@@ -340,6 +340,9 @@ bool ShouldMockFailureToOpen(const char *path) {
 }
 
 #if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_GO
+# ifndef O_CLOEXEC
+#  define O_CLOEXEC 0
+# endif
 int GetNamedMappingFd(const char *name, uptr size, int *flags) {
   if (!common_flags()->decorate_proc_maps || !name)
     return -1;
diff --git a/compiler-rt/lib/xray/xray_x86_64.cpp b/compiler-rt/lib/xray/xray_x86_64.cpp
@@ -49,6 +49,9 @@ retryingReadSome(int Fd, char *Begin, char *End) XRAY_NEVER_INSTRUMENT {
   return std::make_pair(TotalBytesRead, true);
 }
 
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
 static bool readValueFromFile(const char *Filename,
                               long long *Value) XRAY_NEVER_INSTRUMENT {
   int Fd = open(Filename, O_RDONLY | O_CLOEXEC);

Original file line number	Diff line number	Diff line change
`@@ -340,6 +340,9 @@ bool ShouldMockFailureToOpen(const char *path) {`
`340`	`340`	`}`
`341`	`341`
`342`	`342`	`#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_GO`
	`343`	`+# ifndef O_CLOEXEC`
	`344`	`+# define O_CLOEXEC 0`
	`345`	`+# endif`
`343`	`346`	`int GetNamedMappingFd(const char name, uptr size, int flags) {`
`344`	`347`	`if (!common_flags()->decorate_proc_maps \|\| !name)`
`345`	`348`	`return -1;`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@ retryingReadSome(int Fd, char Begin, char End) XRAY_NEVER_INSTRUMENT {`
`49`	`49`	`return std::make_pair(TotalBytesRead, true);`
`50`	`50`	`}`
`51`	`51`
	`52`	`+#ifndef O_CLOEXEC`
	`53`	`+# define O_CLOEXEC 0`
	`54`	`+#endif`
`52`	`55`	`static bool readValueFromFile(const char *Filename,`
`53`	`56`	`long long *Value) XRAY_NEVER_INSTRUMENT {`
`54`	`57`	`int Fd = open(Filename, O_RDONLY \| O_CLOEXEC);`