xlat: cleanup the aftermath of automatic conversion

file.c

@@ -211,6 +211,17 @@ struct kernel_dirent {
 	char            d_name[1];
 };
 
+#ifdef O_LARGEFILE
+# if O_LARGEFILE == 0          /* biarch platforms in 64-bit mode */
+#  undef O_LARGEFILE
+#  ifdef SPARC64
+#   define O_LARGEFILE 0x40000
+#  elif defined X86_64 || defined S390X
+#   define O_LARGEFILE 0100000
+#  endif
+# endif
+#endif
+
 #include "xlat/open_access_modes.h"
 
 #include "xlat/open_mode_flags.h"

xlat/mmap_flags.in

@@ -42,10 +42,14 @@ MAP_INHERIT
 MAP_FILE
 MAP_LOCKED
 /* FreeBSD ones */
+#if defined(MAP_ANON) && (!defined(MAP_ANONYMOUS) || MAP_ANON != MAP_ANONYMOUS)
 MAP_ANON
+#endif
 MAP_HASSEMAPHORE
 MAP_STACK
 MAP_HUGETLB
+#if defined MAP_UNINITIALIZED && MAP_UNINITIALIZED > 0
 MAP_UNINITIALIZED
+#endif
 MAP_NOSYNC
 MAP_NOCORE

xlat/open_mode_flags.in

@@ -8,7 +8,9 @@ O_SYNC
 O_ASYNC
 O_DSYNC
 O_RSYNC
+#if defined(O_NDELAY) && (O_NDELAY != O_NONBLOCK)
 O_NDELAY
+#endif
 O_PRIV
 O_DIRECT
 O_LARGEFILE

xlat/sigact_flags.in

@@ -3,9 +3,13 @@ SA_STACK
 SA_RESTART
 SA_INTERRUPT
 SA_NODEFER
+#if defined SA_NOMASK && SA_NODEFER != SA_NOMASK
 SA_NOMASK
+#endif
 SA_RESETHAND
+#if defined SA_ONESHOT && SA_ONESHOT != SA_RESETHAND
 SA_ONESHOT
+#endif
 SA_SIGINFO
 SA_RESETHAND
 SA_ONSTACK

xlat/wait4_options.in

@@ -1,5 +1,7 @@
 WNOHANG
+#ifndef WSTOPPED
 WUNTRACED
+#endif
 WEXITED
 WTRAPPED
 WSTOPPED