diff options
author | Xavier Leroy <xavier.leroy@inria.fr> | 2012-02-17 10:43:50 +0000 |
---|---|---|
committer | Xavier Leroy <xavier.leroy@inria.fr> | 2012-02-17 10:43:50 +0000 |
commit | 5ad47ce4e67c9219d9de9c8470664f08cc962bf5 (patch) | |
tree | 16b334fbcfc6475c13a44a7c359252b21b72a74c | |
parent | 339bcbb2c603c22b99cf07daf5f8296d5ea8e940 (diff) |
Backtrack previous changes for PowerPC/Linux, which turns out to lack what we need for turning stack overflows into exceptions
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12160 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r-- | asmrun/power-elf.S | 10 | ||||
-rwxr-xr-x | configure | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/asmrun/power-elf.S b/asmrun/power-elf.S index 338afbed9..8618b50a1 100644 --- a/asmrun/power-elf.S +++ b/asmrun/power-elf.S @@ -42,11 +42,6 @@ caml_call_gc: /* Record lowest stack address */ addi 0, 1, 0x1A0 Storeglobal(0, caml_bottom_of_stack, 11) - /* Touch the stack to trigger a recoverable segfault - if insufficient space remains */ - addi 1, 1, -16384 - stw 0, 0(1) - addi 1, 1, 16384 /* Record pointer to register array */ addi 0, 1, 8*32 + 32 Storeglobal(0, caml_gc_regs, 11) @@ -197,11 +192,6 @@ caml_c_call: /* Record lowest stack address and return address */ Storeglobal(1, caml_bottom_of_stack, 12) Storeglobal(25, caml_last_return_address, 12) - /* Touch the stack to trigger a recoverable segfault - if insufficient space remains */ - addi 1, 1, -16384 - stw 0, 0(1) - addi 1, 1, 16384 /* Make the exception handler and alloc ptr available to the C code */ Storeglobal(31, caml_young_ptr, 11) Storeglobal(29, caml_exception_pointer, 11) @@ -1148,7 +1148,7 @@ fi # Determine if system stack overflows can be detected case "$arch,$system" in - i386,linux_elf|amd64,linux|power,elf|power,rhapsody|amd64,macosx|i386,macosx) + i386,linux_elf|amd64,linux|power,rhapsody|amd64,macosx|i386,macosx) echo "System stack overflow can be detected." echo "#define HAS_STACK_OVERFLOW_DETECTION" >> s.h;; *) |