about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--conform/Makefile2
-rw-r--r--conform/data/fcntl.h-data9
3 files changed, 14 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index a7dd3a72ff..b85a2938ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2016-05-12  Joseph Myers  <joseph@codesourcery.com>
+
+	* conform/data/fcntl.h-data [!POSIX] (S_IFMT): Do not expect.
+	[!POSIX] (S_IFBLK): Likewise.
+	[!POSIX] (S_IFCHR): Likewise.
+	[!POSIX] (S_IFIFO): Likewise.
+	[!POSIX] (S_IFREG): Likewise.
+	[!POSIX] (S_IFDIR): Likewise.
+	[!POSIX] (S_IFLNK): Likewise.
+	[!POSIX] (S_IFSOCK): Likewise.
+	* conform/Makefile (test-xfail-XPG3/fcntl.h/conform): Remove
+	variable.
+	(test-xfail-XPG4/fcntl.h/conform): Likewise.
+
 2016-05-12  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* sysdeps/aarch64/memset.S (__memset):
diff --git a/conform/Makefile b/conform/Makefile
index d93dba042d..b5a1ee86b1 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -163,7 +163,6 @@ test-xfail-XOPEN2K/ndbm.h/conform = yes
 test-xfail-XOPEN2K8/ndbm.h/conform = yes
 
 # Unsorted expected failures.
-test-xfail-XPG3/fcntl.h/conform = yes
 test-xfail-XPG3/ftw.h/conform = yes
 test-xfail-XPG3/limits.h/conform = yes
 test-xfail-XPG3/pwd.h/conform = yes
@@ -175,7 +174,6 @@ test-xfail-XPG3/sys/wait.h/conform = yes
 test-xfail-XPG3/time.h/conform = yes
 test-xfail-XPG3/unistd.h/conform = yes
 test-xfail-XPG4/arpa/inet.h/conform = yes
-test-xfail-XPG4/fcntl.h/conform = yes
 test-xfail-XPG4/netdb.h/conform = yes
 test-xfail-XPG4/netinet/in.h/conform = yes
 test-xfail-XPG4/signal.h/conform = yes
diff --git a/conform/data/fcntl.h-data b/conform/data/fcntl.h-data
index 1971d4a742..ccaf98f487 100644
--- a/conform/data/fcntl.h-data
+++ b/conform/data/fcntl.h-data
@@ -48,15 +48,6 @@ constant O_RDWR
 constant O_WRONLY
 
 #if !defined POSIX
-constant S_IFMT
-constant S_IFBLK
-constant S_IFCHR
-constant S_IFIFO
-constant S_IFREG
-constant S_IFDIR
-constant S_IFLNK
-constant S_IFSOCK
-
 constant S_IRWXU
 constant S_IRUSR
 constant S_IWUSR