From: charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 25 Nov 2015 15:07:12 +0000 (+0000)
Subject: 2015-11-25  Tristan Gingold  <gingold@adacore.com>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef60aeabcdf04e69b277c9f2bbffc26130db6206;p=thirdparty%2Fgcc.git

2015-11-25  Tristan Gingold  <gingold@adacore.com>

	* init.c (__gnat_is_stack_guard): Do not use mach calls for
	IOS simulator.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230874 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e5c24418f606..64c43fb3dadf 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-25  Tristan Gingold  <gingold@adacore.com>
+
+	* init.c (__gnat_is_stack_guard): Do not use mach calls for
+	IOS simulator.
+
 2015-11-24  Pierre-Marie de Rodat  <derodat@adacore.com>
 
 	* gcc-interface/utils.c (gnat_write_global_declarations): Output
@@ -1241,8 +1246,6 @@
 	(gnat_write_global_declarations): Output debugging information
 	for top-level imported declarations.
 
-2015-11-12  Emmanuel Briot  <briot@adacore.com>
-
 2015-11-12  Emmanuel Briot  <briot@adacore.com>
 
 	* s-os_lib.ads: Documentation update.
diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index 4f7341e4e798..57b02a1475d2 100644
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -2276,6 +2276,7 @@ __gnat_install_handler (void)
 
 #elif defined(__APPLE__)
 
+#include <TargetConditionals.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/syscall.h>
@@ -2288,7 +2289,7 @@ char __gnat_alternate_stack[32 * 1024]; /* 1 * MINSIGSTKSZ */
    Tell the kernel to re-use alt stack when delivering a signal.  */
 #define	UC_RESET_ALT_STACK	0x80000000
 
-#if !(defined (__arm__) || defined (__arm64__))
+#if !(defined (__arm__) || defined (__arm64__) || TARGET_IPHONE_SIMULATOR)
 #include <mach/mach_vm.h>
 #include <mach/mach_init.h>
 #include <mach/vm_statistics.h>
@@ -2303,7 +2304,7 @@ char __gnat_alternate_stack[32 * 1024]; /* 1 * MINSIGSTKSZ */
 static int
 __gnat_is_stack_guard (mach_vm_address_t addr)
 {
-#if !(defined (__arm__) || defined (__arm64__))
+#if !(defined (__arm__) || defined (__arm64__) || TARGET_IPHONE_SIMULATOR)
   kern_return_t kret;
   vm_region_submap_info_data_64_t info;
   mach_vm_address_t start;