[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r8122 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/arm/ sysdeps/unix/sysv/linux/m68k/ sysdeps/unix/sysv/linux/mips/ sys...
- To: commits@xxxxxxxxxx
- Subject: [commits] r8122 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/arm/ sysdeps/unix/sysv/linux/m68k/ sysdeps/unix/sysv/linux/mips/ sys...
- From: eglibc@xxxxxxxxxx
- Date: Wed, 18 Mar 2009 07:03:47 -0000
Author: eglibc
Date: Wed Mar 18 00:03:47 2009
New Revision: 8122
Log:
Import glibc-ports-mainline for 2009-03-18
Modified:
fsf/trunk/ports/ChangeLog.arm
fsf/trunk/ports/ChangeLog.m68k
fsf/trunk/ports/ChangeLog.mips
fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/getsysstats.c
fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/getsysstats.c
fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h
fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h
Modified: fsf/trunk/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/ports/ChangeLog.arm (original)
+++ fsf/trunk/ports/ChangeLog.arm Wed Mar 18 00:03:47 2009
@@ -1,3 +1,7 @@
+2009-03-16 Khem Raj <raj.khem@xxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/arm/sysdep.h: Include errno.h.
+
2009-03-15 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/arm/bits/link.h: Uglify function parameter names.
Modified: fsf/trunk/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/ports/ChangeLog.m68k (original)
+++ fsf/trunk/ports/ChangeLog.m68k Wed Mar 18 00:03:47 2009
@@ -1,3 +1,8 @@
+2009-03-17 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/m68k/getsysstats.c (GET_NPROCS_PARSER):
+ Change parameters and use next_line.
+
2009-03-15 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/m68k/bits/link.h: Uglify function parameter names.
Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Wed Mar 18 00:03:47 2009
@@ -1,3 +1,14 @@
+2009-03-17 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/mips/getsysstats.c (GET_NPROCS_PARSER):
+ Change parameters and use next_line.
+
+2009-03-17 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/mips/mips32/sysdep.h: Include errno.h.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h: Likewise.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h: Likewise.
+
2009-03-15 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/mips/bits/link.h: Uglify function parameter names.
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/sysdep.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/sysdep.h Wed Mar 18 00:03:47 2009
@@ -29,6 +29,11 @@
#include <dl-sysdep.h>
#include <tls.h>
+
+/* In order to get __set_errno() definition in INLINE_SYSCALL. */
+#ifndef __ASSEMBLER__
+#include <errno.h>
+#endif
/* For Linux we can use the system call table in the header file
/usr/include/asm/unistd.h
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/getsysstats.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/getsysstats.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/m68k/getsysstats.c Wed Mar 18 00:03:47 2009
@@ -1,5 +1,5 @@
/* Determine various system internal values, Linux/m68k version.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Schwab <schwab@xxxxxxx>
@@ -20,7 +20,7 @@
/* We need to define a special parser for /proc/cpuinfo. */
-#define GET_NPROCS_PARSER(FP, BUFFER, RESULT) \
+#define GET_NPROCS_PARSER(FD, BUFFER, CP, RE, BUFFER_END, RESULT) \
do \
{ \
(RESULT) = 0; \
@@ -28,8 +28,9 @@
"CPU:". We don't have to fear extremely long lines since \
the kernel will not generate them. 8192 bytes are really \
enough. */ \
- while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL) \
- if (strncmp (BUFFER, "CPU:", 4) == 0) \
+ char *l; \
+ while ((l = next_line (FD, BUFFER, &CP, &RE, BUFFER_END)) != NULL) \
+ if (strncmp (l, "CPU:", 4) == 0) \
++(RESULT); \
} \
while (0)
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/getsysstats.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/getsysstats.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/getsysstats.c Wed Mar 18 00:03:47 2009
@@ -1,5 +1,5 @@
/* Determine various system internal values, Linux/MIPS version.
- Copyright (C) 2001 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2009 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
@@ -19,7 +19,7 @@
/* We need to define a special parser for /proc/cpuinfo. */
-#define GET_NPROCS_PARSER(FP, BUFFER, RESULT) \
+#define GET_NPROCS_PARSER(FD, BUFFER, CP, RE, BUFFER_END, RESULT) \
do \
{ \
(RESULT) = 0; \
@@ -27,8 +27,9 @@
"cpu model". We don't have to fear extremely long lines since \
the kernel will not generate them. 8192 bytes are really \
enough. */ \
- while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL) \
- if (strncmp (BUFFER, "cpu model", 9) == 0) \
+ char *l; \
+ while ((l = next_line (FD, BUFFER, &CP, &RE, BUFFER_END)) != NULL) \
+ if (strncmp (l, "cpu model", 9) == 0) \
++(RESULT); \
} \
while (0)
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h Wed Mar 18 00:03:47 2009
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2002, 2003, 2004, 2005,
+ 2009 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
@@ -23,6 +24,11 @@
#include <sysdeps/unix/mips/mips32/sysdep.h>
#include <tls.h>
+
+/* In order to get __set_errno() definition in INLINE_SYSCALL. */
+#ifndef __ASSEMBLER__
+#include <errno.h>
+#endif
/* For Linux we can use the system call table in the header file
/usr/include/asm/unistd.h
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h Wed Mar 18 00:03:47 2009
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006
+/* Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -24,6 +24,11 @@
#include <sysdeps/unix/mips/mips64/n32/sysdep.h>
#include <tls.h>
+
+/* In order to get __set_errno() definition in INLINE_SYSCALL. */
+#ifndef __ASSEMBLER__
+#include <errno.h>
+#endif
/* For Linux we can use the system call table in the header file
/usr/include/asm/unistd.h
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h Wed Mar 18 00:03:47 2009
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006
+/* Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -24,6 +24,11 @@
#include <sysdeps/unix/mips/mips64/n64/sysdep.h>
#include <tls.h>
+
+/* In order to get __set_errno() definition in INLINE_SYSCALL. */
+#ifndef __ASSEMBLER__
+#include <errno.h>
+#endif
/* For Linux we can use the system call table in the header file
/usr/include/asm/unistd.h