Don't use _NSGetEnviron on arm64.

diff --git a/eglib/src/gspawn.c b/eglib/src/gspawn.c
index 88f35ba40a196dcf604da8409126b42c739899f5..a01904e3e3440cffe35c1ce0383382d9e8ceb227 100644 (file)
--- a/eglib/src/gspawn.c
+++ b/eglib/src/gspawn.c
@@ -74,7 +74,7 @@
 #define NO_INTR(var,cmd) do { (var) = (cmd); } while ((var) == -1 && errno == EINTR)
 #define CLOSE_PIPE(p) do { close (p [0]); close (p [1]); } while (0)
 
-#if defined(__APPLE__) && !defined (__arm__)
+#if defined(__APPLE__) && !defined (__arm__) && !defined (__aarch64__)
 /* Apple defines this in crt_externs.h but doesn't provide that header for 
  * arm-apple-darwin9.  We'll manually define the symbol on Apple as it does
  * in fact exist on all implementations (so far) 

diff --git a/mono/io-layer/processes.c b/mono/io-layer/processes.c
index 82e85744f84b5c97d0b17d7c0b4c143b1ef9ae2f..ec91d7e13e6a98bfa43f6210c6e103d81a3e79b9 100644 (file)
--- a/mono/io-layer/processes.c
+++ b/mono/io-layer/processes.c
@@ -92,7 +92,7 @@
 #include <mono/utils/mono-signal-handler.h>
 
 /* The process' environment strings */
-#if defined(__APPLE__) && !defined (__arm__)
+#if defined(__APPLE__) && !defined (__arm__) && !defined (__aarch64__)
 /* Apple defines this in crt_externs.h but doesn't provide that header for 
  * arm-apple-darwin9.  We'll manually define the symbol on Apple as it does
  * in fact exist on all implementations (so far) 

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 16c4836e63acb3f25a80dc34411320954b3ac7bd..6370af429c74bb21d407012711753435418a151e 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -6219,7 +6219,7 @@ ves_icall_System_Environment_GetEnvironmentVariable (MonoString *name)
  */
 #ifndef _MSC_VER
 #ifndef __MINGW32_VERSION
-#if defined(__APPLE__) && !defined (__arm__)
+#if defined(__APPLE__) && !defined (__arm__) && !defined (__aarch64__)
 /* Apple defines this in crt_externs.h but doesn't provide that header for 
  * arm-apple-darwin9.  We'll manually define the symbol on Apple as it does
  * in fact exist on all implementations (so far)