[PATCH] D109193: [sanitizer_common] Define wordexp_wrde_dooffs for Solaris

[Rainer Orth via Phabricator via llvm-commits]

ro created this revision.
ro added reviewers: justincady, devnexen, vitalybuka.
ro added a project: Sanitizers.
Herald added subscribers: fedor.sergeev, jyknight.
ro requested review of this revision.
Herald added a subscriber: Sanitizers.

The Solaris buildbots have been broken for some time:

  In file included from /opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/compiler-rt/lib/asan/asan_interceptors.cpp:174:
  /opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/compiler-rt/lib/asan/../sanitizer_common/sanitizer_common_interceptors.inc:4000:19: error: use of undeclared identifier 'wordexp_wrde_dooffs'
          ((flags & wordexp_wrde_dooffs) ? p->we_offs : 0) + p->we_wordc;
                    ^

This was caused by D108646 <https://reviews.llvm.org/D108646>; the fix is equivalent to D108838 <https://reviews.llvm.org/D108838>.

Tested on `amd64-pc-solaris2.11` and `sparcv9-sun-solaris2.11`.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D109193

Files:
  compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.cpp
  compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.h


Index: compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.h
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.h
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.h
@@ -341,6 +341,7 @@
 
 extern int glob_nomatch;
 extern int glob_altdirfunc;
+extern const int wordexp_wrde_dooffs;
 
 extern unsigned path_max;
 
Index: compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.cpp
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.cpp
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.cpp
@@ -123,6 +123,7 @@
   unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
 
   int glob_nomatch = GLOB_NOMATCH;
+  const int wordexp_wrde_dooffs = WRDE_DOOFFS;
 
   unsigned path_max = PATH_MAX;
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D109193.370396.patch
Type: text/x-patch
Size: 930 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210902/94827cae/attachment.bin>