diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-11-25 15:07:12 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-11-25 15:07:12 +0000 |
| commit | ef60aeabcdf04e69b277c9f2bbffc26130db6206 (patch) | |
| tree | 039d4ae7a8840d444b0600537f2d866009754004 | |
| parent | c112228a6f016e9c1c078033e03c5eba2c9eeb19 (diff) | |
| download | gcc-ef60aeabcdf04e69b277c9f2bbffc26130db6206.tar.gz | |
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
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/init.c | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index e5c24418f60..64c43fb3dad 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 @@ -1243,8 +1248,6 @@ 2015-11-12 Emmanuel Briot <briot@adacore.com> -2015-11-12 Emmanuel Briot <briot@adacore.com> - * s-os_lib.ads: Documentation update. 2015-11-12 Arnaud Charlet <charlet@adacore.com> diff --git a/gcc/ada/init.c b/gcc/ada/init.c index 4f7341e4e79..57b02a1475d 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; |