Skip to content

Commit 79d58b4

Browse files
committed
[sanitizer_common] Define wordexp_wrde_dooffs for Solaris
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`. Differential Revision: https://reviews.llvm.org/D109193
1 parent dc5dd77 commit 79d58b4

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ namespace __sanitizer {
123123
unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
124124

125125
int glob_nomatch = GLOB_NOMATCH;
126+
const int wordexp_wrde_dooffs = WRDE_DOOFFS;
126127

127128
unsigned path_max = PATH_MAX;
128129

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_solaris.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ struct __sanitizer_glob_t {
341341

342342
extern int glob_nomatch;
343343
extern int glob_altdirfunc;
344+
extern const int wordexp_wrde_dooffs;
344345

345346
extern unsigned path_max;
346347

0 commit comments

Comments
 (0)