Changeset bd4cb06 in git

Timestamp:

Jun 18, 2020, 4:13:16 PM (3 years ago)

Author:

Max Horn <max@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

4c1fc06f2d81e12a8e75a5419444cb157fbe45e9

Parents:

29b4ca5d4228a541041f482cfb466f618a3201bd

Message:

Unify access to sigcontext on Linux + x86

This fixes compatibility on 32 bit systems with the muslc C library

File:

• Singular/cntrlc.cc (modified) (2 diffs)

Singular/cntrlc.cc

@@ -5 +5 @@
 * ABSTRACT - interupt handling
 */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
 #include "kernel/mod2.h"
 
@@ -155 +160 @@
 
 /*---------------------------------------------------------------------*/
-#if defined(__linux__) && defined(__i386)
-  #if !defined(HAVE_SIGCONTEXT) && !defined(HAVE_ASM_SIGCONTEXT_H)
-// we need the following structure sigcontext_struct.
-// if configure finds asm/singcontext.h we assume
-// that this file contains the structure and is included
-// via signal.h
-struct sigcontext_struct {
-        unsigned short gs, __gsh;
-        unsigned short fs, __fsh;
-        unsigned short es, __esh;
-        unsigned short ds, __dsh;
-        unsigned long edi;
-        unsigned long esi;
-        unsigned long ebp;
-        unsigned long esp;
-        unsigned long ebx;
-        unsigned long edx;
-        unsigned long ecx;
-        unsigned long eax;
-        unsigned long trapno;
-        unsigned long err;
-        unsigned long eip;
-        unsigned short cs, __csh;
-        unsigned long eflags;
-        unsigned long esp_at_signal;
-        unsigned short ss, __ssh;
-        unsigned long i387;
-        unsigned long oldmask;
-        unsigned long cr2;
-};
-#endif
-#define HAVE_SIGSTRUCT
-typedef struct sigcontext_struct sigcontext;
-#endif
-
-#if defined(__linux__) && defined(__amd64)
-#define HAVE_SIGSTRUCT
-#endif
-
-
-#if defined(HAVE_SIGSTRUCT)
+#if defined(__linux__) && (defined(__i386) || defined(__amd64))
 /*2---------------------------------------------------------------------*/
 /**