From 32084f7ec1d8a9b0ea66e491dfc6cae8b49646af Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Sat, 11 Jun 2022 11:07:01 -0600
Subject: [PATCH] fixup: fix ci

---
 libc-test/build.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libc-test/build.rs b/libc-test/build.rs
index f7a2043f0c100..becc9d4c19f80 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -1409,7 +1409,7 @@ fn test_dragonflybsd(target: &str) {
         // just insert some padding.
         (struct_ == "siginfo_t" && field == "_pad") ||
         // sigev_notify_thread_id is actually part of a sigev_un union
-        (struct_ == "sigevent" && field == "sigev_notify_thread_id")
+        (struct_ == "sigevent_0_2_126" && field == "sigev_notify_thread_id")
     });
 
     cfg.generate("../src/lib.rs", "main.rs");
@@ -1806,6 +1806,8 @@ fn test_android(target: &str) {
         (struct_ == "sigaction" && field == "sa_sigaction") ||
         // union field
         (struct_ == "sigevent" && field == "_sigev_un") ||
+        // union field on the backwards-compat struct definition
+        (struct_ == "sigevent_0_2_126" && field == "sigev_notify_thread_id") ||
         // signalfd had SIGSYS fields added in Android 4.19, but CI does not have that version yet.
         (struct_ == "signalfd_siginfo" && (field == "ssi_syscall" ||
                                            field == "ssi_call_addr" ||
@@ -2521,6 +2523,8 @@ fn test_emscripten(target: &str) {
         (struct_ == "statvfs" && field == "__f_unused") ||
         // union field
         (struct_ == "sigevent" && field == "_sigev_un") ||
+        // union field on the backwards-compat struct definition
+        (struct_ == "sigevent_0_2_126" && field == "sigev_notify_thread_id") ||
         // signalfd had SIGSYS fields added in Linux 4.18, but no libc release has them yet.
         (struct_ == "signalfd_siginfo" && (field == "ssi_addr_lsb" ||
                                            field == "_pad2" ||
@@ -3324,6 +3328,8 @@ fn test_linux(target: &str) {
         (musl && struct_ == "statvfs" && field == "__f_unused") ||
         // union field
         (struct_ == "sigevent" && field == "_sigev_un") ||
+        // union field on the backwards-compat struct definition
+        (struct_ == "sigevent_0_2_126" && field == "sigev_notify_thread_id") ||
         // signalfd had SIGSYS fields added in Linux 4.18, but no libc release
         // has them yet.
         (struct_ == "signalfd_siginfo" && (field == "ssi_addr_lsb" ||