Merge pull request #3015 from ibuclaw/sigaction-systemz

[SystemZ] Fix layout of struct sigaction_t merged-on-behalf-of: Mathias LANG <pro.mathias.lang@gmail.com>
dlang · Apr 6, 2020 · 4686718 · 4686718
2 parents eb6911e + d34744f
commit 4686718
Showing 1 changed file with 37 additions and 10 deletions.
diff --git a/src/core/sys/posix/signal.d b/src/core/sys/posix/signal.d
@@ -576,24 +576,51 @@ else
 
 version (CRuntime_Glibc)
 {
-    struct sigaction_t
+    version (SystemZ)
     {
-        static if ( true /* __USE_POSIX199309 */ )
+        struct sigaction_t
         {
-            union
+            static if ( true /* __USE_POSIX199309 */ )
+            {
+                union
+                {
+                    sigfn_t     sa_handler;
+                    sigactfn_t  sa_sigaction;
+                }
+            }
+            else
             {
                 sigfn_t     sa_handler;
-                sigactfn_t  sa_sigaction;
             }
+            int             __glibc_reserved0;
+            int             sa_flags;
+
+            void function() sa_restorer;
+
+            sigset_t        sa_mask;
         }
-        else
+    }
+    else
+    {
+        struct sigaction_t
         {
-            sigfn_t     sa_handler;
-        }
-        sigset_t        sa_mask;
-        int             sa_flags;
+            static if ( true /* __USE_POSIX199309 */ )
+            {
+                union
+                {
+                    sigfn_t     sa_handler;
+                    sigactfn_t  sa_sigaction;
+                }
+            }
+            else
+            {
+                sigfn_t     sa_handler;
+            }
+            sigset_t        sa_mask;
+            int             sa_flags;
 
-        void function() sa_restorer;
+            void function() sa_restorer;
+        }
     }
 }
 else version (CRuntime_Musl)