X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Flinux-os.c;h=778f72cb2bc348eaf0bc74b1321d4c1f07f2223e;hb=732ad8030a354ff38af83a84173bfc919a4d7f1c;hp=ce900a7e5eaa912b0d3769bd75fb1df20fd0904d;hpb=fdccfb1135cb9eb89a094c83c443c71b5bb125e2;p=sbcl.git

diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
index ce900a7..778f72c 100644
--- a/src/runtime/linux-os.c
+++ b/src/runtime/linux-os.c
@@ -124,14 +124,17 @@ os_init(char *argv[], char *envp[])
     struct utsname name;
     int major_version;
     int minor_version;
+    int patch_version;
     char *p;
     uname(&name);
     p=name.release;
     major_version = atoi(p);
     p=strchr(p,'.')+1;
     minor_version = atoi(p);
+    p=strchr(p,'.')+1;
+    patch_version = atoi(p);
     if (major_version<2) {
-        lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)",
+        lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)\n",
              major_version);
     }
     if (!(major_version>2 || minor_version >= 4)) {
@@ -143,11 +146,14 @@ os_init(char *argv[], char *envp[])
 #ifdef LISP_FEATURE_SB_THREAD
     futex_wait(futex,-1);
     if(errno==ENOSYS) {
-       lose("This version of SBCL is compiled with threading support, but your kernel is too old to support this.\n\
-Please use a more recent kernel or a version of SBCL without threading support.\n");
+       lose("This version of SBCL is compiled with threading support, but your kernel\n"
+            "is too old to support this. Please use a more recent kernel or\n"
+            "a version of SBCL without threading support.\n");
     }
     if(! isnptl()) {
-       lose("This version of SBCL only works correctly with the NPTL threading library. Please use a newer glibc, use an older SBCL, or stop using LD_ASSUME_KERNEL");
+       lose("This version of SBCL only works correctly with the NPTL threading\n"
+            "library. Please use a newer glibc, use an older SBCL, or stop using\n"
+            "LD_ASSUME_KERNEL\n");
     }
 #endif
     os_vm_page_size = getpagesize();
@@ -161,7 +167,11 @@ Please use a more recent kernel or a version of SBCL without threading support.\
      * don't do this trick on other platforms.
      */
 #ifdef LISP_FEATURE_X86
-    if ((major_version == 2 && minor_version >= 6)
+    if ((major_version == 2
+         /* Some old kernels will apparently lose unsupported personality flags
+          * on exec() */
+         && ((minor_version == 6 && patch_version >= 11)
+             || (minor_version > 6)))
         || major_version >= 3)
     {
         int pers = personality(0xffffffffUL);
@@ -260,7 +270,7 @@ os_map(int fd, int offset, os_vm_address_t addr, os_vm_size_t len)
                   fd, (off_t) offset);
     if (actual == MAP_FAILED || (addr && (addr != actual))) {
         perror("mmap");
-        lose("unexpected mmap(..) failure");
+        lose("unexpected mmap(..) failure\n");
     }
 
     return actual;
@@ -305,34 +315,15 @@ is_valid_lisp_addr(os_vm_address_t addr)
  * any OS-dependent special low-level handling for signals
  */
 
-
-#if defined LISP_FEATURE_GENCGC
-
 /*
- * The GENCGC needs to be hooked into whatever signal is raised for
+ * The GC needs to be hooked into whatever signal is raised for
  * page fault on this OS.
  */
 static void
 sigsegv_handler(int signal, siginfo_t *info, void* void_context)
 {
     os_context_t *context = arch_os_get_context(&void_context);
-    void* fault_addr = (void*)info->si_addr;
-    if (!gencgc_handle_wp_violation(fault_addr))
-        if(!handle_guard_page_triggered(context,fault_addr))
-#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
-            arrange_return_to_lisp_function(context, SymbolFunction(MEMORY_FAULT_ERROR));
-#else
-            interrupt_handle_now(signal, info, context);
-#endif
-}
-
-#else
-
-static void
-sigsegv_handler(int signal, siginfo_t *info, void* void_context)
-{
-    os_context_t *context = arch_os_get_context(&void_context);
-    os_vm_address_t addr = arch_get_bad_addr(signal,info,context);
+    os_vm_address_t addr = arch_get_bad_addr(signal, info, context);
 
 #ifdef LISP_FEATURE_ALPHA
     /* Alpha stuff: This is the end of a pseudo-atomic section during
@@ -343,18 +334,25 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context)
        At the end of the atomic section we tried to write to reg_ALLOC,
        got a SIGSEGV (there's nothing mapped there) so ended up here. */
     if (addr != NULL &&
-        *os_context_register_addr(context,reg_ALLOC) & (1L<<63)){
-        *os_context_register_addr(context,reg_ALLOC) -= (1L<<63);
+        *os_context_register_addr(context, reg_ALLOC) & (1L<<63)) {
+        *os_context_register_addr(context, reg_ALLOC) -= (1L<<63);
         interrupt_handle_pending(context);
         return;
     }
 #endif
 
-    if(!interrupt_maybe_gc(signal, info, context))
-        if(!handle_guard_page_triggered(context,addr))
+#ifdef LISP_FEATURE_GENCGC
+    if (!gencgc_handle_wp_violation(addr))
+#else
+    if (!interrupt_maybe_gc(signal, info, context))
+#endif
+        if (!handle_guard_page_triggered(context, addr))
+#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
+            arrange_return_to_lisp_function(context, SymbolFunction(MEMORY_FAULT_ERROR));
+#else
             interrupt_handle_now(signal, info, context);
-}
 #endif
+}
 
 void
 os_install_interrupt_handlers(void)