summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib
diff options
context:
space:
mode:
authorVitaly Buka <vitalybuka@google.com>2018-03-21 07:50:02 +0000
committerVitaly Buka <vitalybuka@google.com>2018-03-21 07:50:02 +0000
commitf1fc25eb747e12a0d4b81144d15e252f039c49ef (patch)
tree3df87ddeb33a04fce7ef618165283ca1a70688ec /compiler-rt/lib
parent5a69a0011b6aaaf14b0571398956368f4f43bbfb (diff)
downloadbcm5719-llvm-f1fc25eb747e12a0d4b81144d15e252f039c49ef.tar.gz
bcm5719-llvm-f1fc25eb747e12a0d4b81144d15e252f039c49ef.zip
Fix declaration of environ after r327923
llvm-svn: 328077
Diffstat (limited to 'compiler-rt/lib')
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_linux.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
index d652b3f0fc3..fc341a344ef 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
@@ -102,16 +102,14 @@ extern struct ps_strings *__ps_strings;
#if SANITIZER_SOLARIS
#include <stdlib.h>
#include <thread.h>
+#define environ _environ
#endif
#if !SANITIZER_ANDROID
#include <sys/signal.h>
#endif
-#if SANITIZER_SOLARIS
-#define environ _environ
-#endif
-extern char **_environ;
+extern char **environ;
#if SANITIZER_LINUX
// <linux/time.h>
OpenPOWER on IntegriCloud