WIP

Author: no92

.github/workflows/abi-check.yml

@@ -90,7 +90,7 @@ jobs:
       - name: Build mlibc
         run: |
           set -e
-          xbstrap install mlibc-static mlibc-headers-only
+          xbstrap install mlibc-headers-only
         working-directory: build/
 
       - name: Download glibc

abis/linux/signal.h

@@ -348,7 +348,12 @@ struct sigcontext {
 typedef struct {
 	unsigned long gregs[NGREG];
 	struct _fpstate *fpregs;
+#if defined(__x86_64__)
 	unsigned long __reserved1[8];
+#elif defined(__i386__)
+	unsigned long oldmask;
+	unsigned long cr2;
+#endif
 } mcontext_t;
 
 typedef struct __ucontext {
@@ -611,14 +616,14 @@ struct sigcontext {
 	unsigned long sc_pc;
 	unsigned long sc_regs[32];
 	unsigned sc_flags;
-	unsigned long sc_extcontext[1] __attribute__((__aligned__(16)));
+	__extension__ unsigned long sc_extcontext[0] __attribute__((__aligned__(16)));
 };
 
 typedef struct {
 	unsigned long pc;
 	unsigned long gregs[32];
 	unsigned flags;
-	unsigned long extcontext[1] __attribute__((__aligned__(16)));
+	__extension__ unsigned long extcontext[0] __attribute__((__aligned__(16)));
 } mcontext_t;
 
 struct sigaltstack {
@@ -633,7 +638,7 @@ typedef struct __ucontext {
 	stack_t uc_stack;
 	sigset_t uc_sigmask;
 	long __uc_pad;
-	mcontext_t uc_mcontext;
+	__extension__ mcontext_t uc_mcontext;
 } ucontext_t;
 
 #else

scripts/header-abi-compare-config.yml

@@ -131,6 +131,7 @@ ignored_macros:
   - _PATH_VARDB
   - _POSIX_OPEN_MAX
   - PTHREAD_DESTRUCTOR_ITERATIONS
+  - PTHREAD_STACK_MIN
   - MINSIGSTKSZ
   - SIGSTKSZ
   - _PC_FILESIZEBITS

scripts/header-abi-compare.py

@@ -401,7 +401,7 @@ def parse(
     clang_args += [f"-I{base_dir}"]
     clang_args += [f"-I{base_dir / f"{args.arch}-linux-gnu"}"]
     clang_args += [f"--target={f"{args.arch}-linux-gnu"}"]
-    clang_args += ["-D_GNU_SOURCE", "-Wno-macro-redefined"]
+    clang_args += ["-D_GNU_SOURCE", "-D_FILE_OFFSET_BITS=64", "-Wno-macro-redefined"]
 
     try:
         tu = index.parse(
@@ -607,6 +607,9 @@ def is_enum(obj):
                 "-o",
                 f"{tempdir.name}/test-a-preprocessed.hpp",
                 f"{tempdir.name}/test-a-primary.hpp",
+                "-D_GNU_SOURCE",
+                "-D_FILE_OFFSET_BITS=64",
+                "-Wno-macro-redefined",
             ],
             capture_output=True,
         )
@@ -624,6 +627,9 @@ def is_enum(obj):
                 "-o",
                 f"{tempdir.name}/test-b-preprocessed.hpp",
                 f"{tempdir.name}/test-b-primary.hpp",
+                "-D_GNU_SOURCE",
+                "-D_FILE_OFFSET_BITS=64",
+                "-Wno-macro-redefined",
             ],
             capture_output=True,
         )
@@ -680,6 +686,9 @@ def is_enum(obj):
                 "-o",
                 f"{tempdir.name}/test-a",
                 f"{tempdir.name}/test-a.cpp",
+                "-D_GNU_SOURCE",
+                "-D_FILE_OFFSET_BITS=64",
+                "-Wno-macro-redefined",
             ],
             capture_output=True,
         )
@@ -697,6 +706,9 @@ def is_enum(obj):
                 "-o",
                 f"{tempdir.name}/test-b",
                 f"{tempdir.name}/test-b.cpp",
+                "-D_GNU_SOURCE",
+                "-D_FILE_OFFSET_BITS=64",
+                "-Wno-macro-redefined",
             ],
             capture_output=True,
         )