llvm dev - Mar 2018 - r327904 / 5c4cd77db3a08587c6ac82a8e2c92cd4be0bc200 broke compiler-rt master

Hi,

It seems that r327904 / 5c4cd77db3a08587c6ac82a8e2c92cd4be0bc200 broke
master on FreeBSD:

A direct revert fixes the issue. I'd also be happy with an ifdef
though it seems unnecessary.

$uname -rms
FreeBSD 12.0-CURRENT amd64
$ninja
...

/srv/src/llvm/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc:504:25:
error: no member named 'environ' in the global namespace; did you mean
'_environ'?
    for (char **Env = ::environ; *Env != 0; Env++) {
                      ~~^~~~~~~
                        _environ
/srv/src/llvm/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc:114:15:
note: '_environ' declared here
extern char **_environ;
              ^
2 errors generated.
[3/53] Building CXX object
projects/compiler-rt/lib/sanitizer_common/CMakeFiles/RTSanitizerCommonNoHooks.x86_64.dir/sanitizer_linux.cc.o
FAILED:
projects/compiler-rt/lib/sanitizer_common/CMakeFiles/RTSanitizerCommonNoHooks.x86_64.dir/sanitizer_linux.cc.o
/usr/bin/c++  -DHAVE_RPC_XDR_H=0 -DHAVE_TIRPC_RPC_XDR_H=0 -D_DEBUG
-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
-Iprojects/compiler-rt/lib/sanitizer_common
-I/srv/src/llvm/llvm/projects/compiler-rt/lib/sanitizer_common
-Iinclude -I/srv/src/llvm/llvm/include -isystem /usr/local/include
-I/srv/src/llvm/llvm/projects/compiler-rt/lib/sanitizer_common/..
-fPIC -fvisibility-inlines-hidden -Werror=date-time -std=c++11 -Wall
-W -Wno-unused-parameter -Wwrite-strings -Wcast-qual
-Wmissing-field-initializers -pedantic -Wno-long-long
-Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor
-Wstring-conversion -fcolor-diagnostics -Wall -std=c++11
-Wno-unused-parameter -g     -fPIC -fvisibility-inlines-hidden
-Werror=date-time -std=c++11 -Wall -W -Wno-unused-parameter
-Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic
-Wno-long-long -Wcovered-switch-default -Wnon-virtual-dtor
-Wdelete-non-virtual-dtor -Wstring-conversion -fcolor-diagnostics
-Wall -std=c++11 -Wno-unused-parameter -m64 -fPIC -fno-builtin
-fno-exceptions -fomit-frame-pointer -funwind-tables
-fno-stack-protector -fno-sanitize=safe-stack -fvisibility=hidden
-fno-lto -O3 -gline-tables-only -Wno-gnu -Wno-variadic-macros
-Wno-c99-extensions -Wno-non-virtual-dtor -fno-rtti
-Wframe-larger-than=570 -Wglobal-constructors
-DSANITIZER_SUPPORTS_WEAK_HOOKS=0 -MD -MT
projects/compiler-rt/lib/sanitizer_common/CMakeFiles/RTSanitizerCommonNoHooks.x86_64.dir/sanitizer_linux.cc.o
-MF
projects/compiler-rt/lib/sanitizer_common/CMakeFiles/RTSanitizerCommonNoHooks.x86_64.dir/sanitizer_linux.cc.o.d
-o
projects/compiler-rt/lib/sanitizer_common/CMakeFiles/RTSanitizerCommonNoHooks.x86_64.dir/sanitizer_linux.cc.o
-c
/srv/src/llvm/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
/srv/src/llvm/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc:502:9:
error: no member named 'environ' in the global namespace; did you mean
'_environ'?
  if (::environ != 0) {
      ~~^~~~~~~
        _environ
/srv/src/llvm/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc:114:15:
note: '_environ' declared here
extern char **_environ;
              ^
/srv/src/llvm/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc:504:25:
error: no member named 'environ' in the global namespace; did you mean
'_environ'?
    for (char **Env = ::environ; *Env != 0; Env++) {
                      ~~^~~~~~~
                        _environ
/srv/src/llvm/llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc:114:15:
note: '_environ' declared here
extern char **_environ;
              ^
2 errors generated.
...



-- 
Eitan Adler