[Glibc-bsd-commits] r4423 - in trunk/glibc-ports/kfreebsd: bits linuxthreads/bits

[Petr Salinger]

Author: ps-guest
Date: 2013-05-09 19:21:36 +0000 (Thu, 09 May 2013)
New Revision: 4423

Modified:
   trunk/glibc-ports/kfreebsd/bits/dirent.h
   trunk/glibc-ports/kfreebsd/bits/typesizes.h
   trunk/glibc-ports/kfreebsd/linuxthreads/bits/typesizes.h
Log:
update typesizes.h and dirent.h


Modified: trunk/glibc-ports/kfreebsd/bits/dirent.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/dirent.h	2013-05-09 12:10:36 UTC (rev 4422)
+++ trunk/glibc-ports/kfreebsd/bits/dirent.h	2013-05-09 19:21:36 UTC (rev 4423)
@@ -50,3 +50,6 @@
 #define _DIRENT_HAVE_D_RECLEN 1
 #define _DIRENT_HAVE_D_NAMLEN 1
 #define _DIRENT_HAVE_D_TYPE 1
+
+/* Inform libc code that these two types are effectively identical.  */
+# define _DIRENT_MATCHES_DIRENT64       1

Modified: trunk/glibc-ports/kfreebsd/bits/typesizes.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/typesizes.h	2013-05-09 12:10:36 UTC (rev 4422)
+++ trunk/glibc-ports/kfreebsd/bits/typesizes.h	2013-05-09 19:21:36 UTC (rev 4423)
@@ -1,5 +1,5 @@
 /* bits/typesizes.h -- underlying types for *_t.  kFreeBSD version.
-   Copyright (C) 2002, 2003, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -46,17 +46,9 @@
 #define	__FSFILCNT_T_TYPE	__ULONGWORD_TYPE
 #define	__FSFILCNT64_T_TYPE	__UQUAD_TYPE
 #define	__ID_T_TYPE		__U32_TYPE
+#define __CLOCK_T_TYPE		__S32_TYPE
 #define	__FSWORD_T_TYPE		__SWORD_TYPE
 
-#if defined(__arm__) || defined(__powerpc__)
-#define __CLOCK_T_TYPE		__U32_TYPE
-#elif defined(__i386__)
-/* clock_t is unsigned in FreeBSD/i386, but it's too late to fix that now... */
-#define __CLOCK_T_TYPE		__S32_TYPE
-#else
-#define __CLOCK_T_TYPE		__S32_TYPE
-#endif
-
 /*
  * This one is a bit tricky.  It needs to match the size
  * in the sys/${arch}/include/_types.h typedefs.
@@ -67,13 +59,12 @@
  * necessary to implement function overload), so it must stay
  * with __SLONGWORD_TYPE.
  */
-#if defined(__i386__) || defined(__amd64__)
+#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
 #define __TIME_T_TYPE		__SLONGWORD_TYPE
-#elif defined(__powerpc__) && !defined(__LP64__)
-#define __TIME_T_TYPE		__S32_TYPE
 #else
 #define __TIME_T_TYPE		__S64_TYPE
 #endif
+
 #define __USECONDS_T_TYPE	__U32_TYPE
 #define __SUSECONDS_T_TYPE	__SLONGWORD_TYPE
 #define __DADDR_T_TYPE		__SQUAD_TYPE
@@ -88,6 +79,11 @@
 #define __SYSCALL_SLONG_TYPE	__SLONGWORD_TYPE
 #define __SYSCALL_ULONG_TYPE	__ULONGWORD_TYPE
 
+/* Tell the libc code that off_t and off64_t are actually the same type
+   for all ABI purposes, even if possibly expressed as different base types
+   for C type-checking purposes.  */
+#define __OFF_T_MATCHES_OFF64_T 1
+
 /* Number of descriptors that can fit in an `fd_set'.  */
 #define	__FD_SETSIZE		1024
 

Modified: trunk/glibc-ports/kfreebsd/linuxthreads/bits/typesizes.h
===================================================================
--- trunk/glibc-ports/kfreebsd/linuxthreads/bits/typesizes.h	2013-05-09 12:10:36 UTC (rev 4422)
+++ trunk/glibc-ports/kfreebsd/linuxthreads/bits/typesizes.h	2013-05-09 19:21:36 UTC (rev 4423)
@@ -79,6 +79,11 @@
 #define __SYSCALL_SLONG_TYPE	__SLONGWORD_TYPE
 #define __SYSCALL_ULONG_TYPE	__ULONGWORD_TYPE
 
+/* Tell the libc code that off_t and off64_t are actually the same type
+   for all ABI purposes, even if possibly expressed as different base types
+   for C type-checking purposes.  */
+#define __OFF_T_MATCHES_OFF64_T 1
+
 /* Number of descriptors that can fit in an `fd_set'.  */
 #define	__FD_SETSIZE		1024