- revert wrong r24049

Makefile.in

@@ -315,13 +315,7 @@ ifneq ($(UCLIBC_LINUX_SPECIFIC),y)
 	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/inotify.h
 	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/perm.h
 	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/personality.h
-	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/prctl.h
-	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/reboot.h
-	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/sendfile.h
-	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/fsuid.h
 	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/signalfd.h
-	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/swap.h
-	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/sysctl.h
 endif
 ifneq ($(UCLIBC_SV4_DEPRECATED),y)
 	# Remove ustat.h since deprecated SV4 support was disabled upon request

include/sched.h

@@ -63,7 +63,7 @@ extern int sched_get_priority_min (int __algorithm) __THROW;
 extern int sched_rr_get_interval (__pid_t __pid, struct timespec *__t) __THROW;
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Access macros for `cpu_set'.  */
 #define CPU_SETSIZE __CPU_SETSIZE
 #define CPU_SET(cpu, cpusetp)	__CPU_SET (cpu, cpusetp)

include/sys/mman.h

@@ -157,13 +157,11 @@ extern int mincore (void *__start, size_t __len, unsigned char *__vec)
 extern void *mremap (void *__addr, size_t __old_len, size_t __new_len,
 		     int __flags, ...) __THROW;
 
-#ifdef __UCLIBC_LINUX_SPECIFIC__
 /* Remap arbitrary pages of a shared backing store within an existing
    VMA.  */
 extern int remap_file_pages (void *__start, size_t __size, int __prot,
 			     size_t __pgoff, int __flags) __THROW;
 #endif
-#endif
 
 
 /* Open shared memory segment.  */

include/sys/sysinfo.h

@@ -48,7 +48,7 @@ __BEGIN_DECLS
 /* Returns information on overall system statistics.  */
 extern int sysinfo (struct sysinfo *__info) __THROW;
 
-#if 0
+
 /* Return number of configured processors.  */
 extern int get_nprocs_conf (void) __THROW;
 
@@ -61,7 +61,6 @@ extern long int get_phys_pages (void) __THROW;
 
 /* Return number of available physical pages of memory in the system.  */
 extern long int get_avphys_pages (void) __THROW;
-#endif
 
 __END_DECLS
 

include/unistd.h

@@ -869,12 +869,10 @@ extern int setdomainname (__const char *__name, size_t __len)
      __THROW __nonnull ((1)) __wur;
 #endif
 
-#if defined __UCLIBC_LINUX_SPECIFIC__
 /* Revoke access permissions to all processes currently communicating
    with the control terminal, and then send a SIGHUP signal to the process
    group of the control terminal.  */
 extern int vhangup (void) __THROW;
-#endif
 
 #if 0
 /* Revoke the access of all descriptors currently open on FILE.  */

libc/sysdeps/linux/alpha/bits/fcntl.h

@@ -159,6 +159,7 @@ struct flock64
   };
 #endif
 
+
 /* Define some more compatibility macros to be backward compatible with
    BSD systems which did not managed to hide these kernel macros.  */
 #ifdef	__USE_BSD
@@ -180,7 +181,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -229,4 +230,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/arm/bits/fcntl.h

@@ -189,7 +189,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -237,4 +237,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/avr32/bits/fcntl.h

@@ -167,8 +167,8 @@ struct flock64 {
 # define POSIX_FADV_NOREUSE     5 /* Data will be accessed once.  */
 #endif
 
+#ifdef __USE_GNU
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing

libc/sysdeps/linux/bfin/bits/fcntl.h

@@ -185,7 +185,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -234,4 +234,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/cris/bits/fcntl.h

@@ -186,7 +186,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -235,4 +235,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/e1/bits/fcntl.h

@@ -182,7 +182,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -231,4 +231,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/frv/bits/fcntl.h

@@ -164,7 +164,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -213,4 +213,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/h8300/bits/fcntl.h

@@ -182,7 +182,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -231,4 +231,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/hppa/bits/fcntl.h

@@ -176,7 +176,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -225,4 +225,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/i386/bits/fcntl.h

@@ -189,7 +189,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -238,4 +238,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/i960/bits/fcntl.h

@@ -182,7 +182,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -231,4 +231,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/ia64/bits/fcntl.h

@@ -161,6 +161,7 @@ struct flock64
   };
 #endif
 
+
 /* Define some more compatibility macros to be backward compatible with
    BSD systems which did not managed to hide these kernel macros.  */
 #ifdef	__USE_BSD
@@ -182,7 +183,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -231,4 +232,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/m68k/bits/fcntl.h

@@ -185,7 +185,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -234,4 +234,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/microblaze/bits/fcntl.h

@@ -182,7 +182,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -231,4 +231,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/mips/bits/fcntl.h

@@ -209,7 +209,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -258,4 +258,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/nios/bits/fcntl.h

@@ -185,7 +185,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -234,4 +234,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/nios2/bits/fcntl.h

@@ -185,7 +185,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -234,4 +234,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/powerpc/bits/fcntl.h

@@ -189,7 +189,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -238,4 +238,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/sh/bits/fcntl.h

@@ -189,7 +189,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -238,4 +238,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/sh64/bits/fcntl.h

@@ -164,7 +164,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -213,4 +213,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/sparc/bits/fcntl.h

@@ -208,7 +208,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -257,4 +257,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/v850/bits/fcntl.h

@@ -182,7 +182,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -231,4 +231,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/vax/bits/fcntl.h

@@ -162,7 +162,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -211,4 +211,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/x86_64/bits/fcntl.h

@@ -203,7 +203,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -252,4 +252,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+

libc/sysdeps/linux/xtensa/bits/fcntl.h

@@ -186,7 +186,7 @@ struct flock64
 #endif
 
 
-#if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
+#ifdef __USE_GNU
 /* Flags for SYNC_FILE_RANGE.  */
 # define SYNC_FILE_RANGE_WAIT_BEFORE	1 /* Wait upon writeout of all pages
 					     in the range before performing the
@@ -235,4 +235,4 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len,
 
 #endif
 __END_DECLS
-#endif /* LINUX_SPECIFIC */
+