about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--conform/data/signal.h-data6
-rw-r--r--conform/data/ucontext.h-data3
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile5
4 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 99ee480b23..6defb8d53d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2017-06-20  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #21635]
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
+	[$(subdir) = conform] (conformtest-xfail-conds): New variable.
+	* conform/data/signal.h-data (uc_mcontext): XFAIL for
+	powerpc32-linux.
+	* conform/data/ucontext.h-data (uc_mcontext): Likewise.
+
 	[BZ #21634]
 	* sysdeps/unix/sysv/linux/ia64/Makefile [$(subdir) = conform]
 	(conformtest-xfail-conds): New variable.
diff --git a/conform/data/signal.h-data b/conform/data/signal.h-data
index 08635d2c6b..fa841cfdbe 100644
--- a/conform/data/signal.h-data
+++ b/conform/data/signal.h-data
@@ -27,7 +27,8 @@ element ucontext_t {ucontext_t*} uc_link
 // Bug 21634: uc_sigmask has wrong type.
 xfail[ia64-linux]-element ucontext_t sigset_t uc_sigmask
 element ucontext_t stack_t uc_stack
-element ucontext_t mcontext_t uc_mcontext
+// Bug 21635: uc_mcontext has wrong type.
+xfail[powerpc32-linux]-element ucontext_t mcontext_t uc_mcontext
 
 type {struct timespec}
 element {struct timespec} __time_t tv_sec
@@ -139,7 +140,8 @@ element ucontext_t {ucontext_t*} uc_link
 // Bug 21634: uc_sigmask has wrong type.
 xfail[ia64-linux]-element ucontext_t sigset_t uc_sigmask
 element ucontext_t stack_t uc_stack
-element ucontext_t mcontext_t uc_mcontext
+// Bug 21635: uc_mcontext has wrong type.
+xfail[powerpc32-linux]-element ucontext_t mcontext_t uc_mcontext
 
 type stack_t
 
diff --git a/conform/data/ucontext.h-data b/conform/data/ucontext.h-data
index 7e0b4a7f68..a840f464fc 100644
--- a/conform/data/ucontext.h-data
+++ b/conform/data/ucontext.h-data
@@ -7,7 +7,8 @@ element ucontext_t {ucontext_t*} uc_link
 // Bug 21634: uc_sigmask has wrong type.
 xfail[ia64-linux]-element ucontext_t sigset_t uc_sigmask
 element ucontext_t stack_t uc_stack
-element ucontext_t mcontext_t uc_mcontext
+// Bug 21635: uc_mcontext has wrong type.
+xfail[powerpc32-linux]-element ucontext_t mcontext_t uc_mcontext
 
 type sigset_t
 type stack_t
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
index 1f45659ed1..b2d7c8f6cc 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
@@ -8,3 +8,8 @@ shared-only-routines += divdi3
 CPPFLAGS-divdi3.c = -Din_divdi3_c
 endif
 endif
+
+ifeq ($(subdir),conform)
+# For bug 21635.
+conformtest-xfail-conds += powerpc32-linux
+endif