about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--conform/data/sys/stat.h-data3
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips32/Makefile2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b3ca80cc12..644cd482b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2017-03-20  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #21278]
+	* sysdeps/unix/sysv/linux/mips/mips32/Makefile
+	[$(subdir) = conform] (conformtest-xfail-conds): Update comment.
+	* conform/data/sys/stat.h-data (stat.st_rdev): XFAIL for
+	mips-o32-linux.
+
 	[BZ #21268]
 	* sysdeps/unix/sysv/linux/alpha/bits/termios.h (NL2): Define only
 	if [__USE_MISC]
diff --git a/conform/data/sys/stat.h-data b/conform/data/sys/stat.h-data
index 781cbb26b4..07d55e6bd4 100644
--- a/conform/data/sys/stat.h-data
+++ b/conform/data/sys/stat.h-data
@@ -34,7 +34,8 @@ element {struct stat} nlink_t st_nlink
 element {struct stat} uid_t st_uid
 element {struct stat} gid_t st_gid
 #if !defined POSIX && !defined POSIX2008
-element {struct stat} dev_t st_rdev
+// Bug 21278: st_rdev has wrong type.
+xfail[mips-o32-linux]-element {struct stat} dev_t st_rdev
 #endif
 element {struct stat} off_t st_size
 element {struct stat} time_t st_atime
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/Makefile b/sysdeps/unix/sysv/linux/mips/mips32/Makefile
index 0938f4097b..9439d29dea 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/Makefile
+++ b/sysdeps/unix/sysv/linux/mips/mips32/Makefile
@@ -1,4 +1,4 @@
 ifeq ($(subdir),conform)
-# For bug 17786.
+# For bugs 17786 and 21278.
 conformtest-xfail-conds += mips-o32-linux
 endif