[PATCH] D133556: [sanitizer_common] Restore sanitizer_procmaps_solaris.cpp compilation on Solaris 11.3

[Rainer Orth via Phabricator via llvm-commits]

ro created this revision.
ro added a reviewer: vitalybuka.
ro added a project: Sanitizers.
Herald added subscribers: Enna1, fedor.sergeev, jyknight.
Herald added a project: All.
ro requested review of this revision.
Herald added a subscriber: Sanitizers.

When upstream `compiler-rt` was recently imported into GCC's `libsanitizer`, Solaris 11.3 bootstrap broke because in 11.3 `<sys/procfs.h>` doesn't mix with largefile compilation.  I'd caused this in D129837 <https://reviews.llvm.org/D129837> where I forgot that the code still needs to support Solaris 11.3.

Fixed by restoring the `#undef _FILE_OFFSET_BITS`.

Tested on `sparc-sun-solaris2.11` and `amd64-pc-solaris2.11` (Solaris 11.4) in LLVM and both Solaris 11.3 and 11.4 in GCC.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D133556

Files:
  compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp


Index: compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp
+++ compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp
@@ -9,6 +9,8 @@
 // Information about the process mappings (Solaris-specific parts).
 //===----------------------------------------------------------------------===//
 
+// Before Solaris 11.4, <procfs.h> doesn't work in a largefile environment.
+#undef _FILE_OFFSET_BITS
 #include "sanitizer_platform.h"
 #if SANITIZER_SOLARIS
 #  include <fcntl.h>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D133556.458976.patch
Type: text/x-patch
Size: 625 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220909/04e5d3f8/attachment.bin>