[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r8686 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/alpha/ sysdeps/unix/sysv/linux/alpha/nptl/ sysdeps/unix/sysv/linux/a...

To: commits@xxxxxxxxxx
Subject: [commits] r8686 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/alpha/ sysdeps/unix/sysv/linux/alpha/nptl/ sysdeps/unix/sysv/linux/a...
From: eglibc@xxxxxxxxxx
Date: Mon, 20 Jul 2009 07:08:18 -0000
Author: eglibc
Date: Mon Jul 20 00:08:18 2009
New Revision: 8686

Log:
Import glibc-ports-mainline for 2009-07-20

Modified:
    fsf/trunk/ports/ChangeLog.alpha
    fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/getdents64.c
    fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c
    fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/fork.c
    fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c
    fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c
    fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c
    fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c
    fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c
    fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c
    fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/sys/procfs.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/sysconf.c

Modified: fsf/trunk/ports/ChangeLog.alpha
==============================================================================
--- fsf/trunk/ports/ChangeLog.alpha (original)
+++ fsf/trunk/ports/ChangeLog.alpha Mon Jul 20 00:08:18 2009
@@ -1,3 +1,30 @@
+2009-07-13  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
+
+	[BZ #10158]
+        * sysdeps/unix/sysv/linux/alpha/getsysstats.c (GET_NPROCS_PARSER):
+        Change parameters and use next_line.
+
+	[BZ #10160]
+	* sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h: Define
+	FUTEX_WAIT_BITSET, FUTEX_WAKE_BITSET, FUTEX_CLOCK_REALTIME and
+	FUTEX_BITSET_MATCH_ANY.
+
+	[BZ #10161]
+	* sysdeps/unix/sysv/linux/alpha/getdents64.c: Adjust include path.
+	* sysdeps/unix/sysv/linux/alpha/nptl/fork.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/sysconf.c: Likewise.
+
+	[BZ #6507]
+	* sysdeps/unix/sysv/linux/alpha/sys/procfs.h (ELF_NGREG,
+	ELF_NFPREG, elf_greg_t, elf_gregset_t, elf_fpreg_t,
+	elf_fpregset_t): Define. Don't include asm/elf.h.
+
 2008-11-26  Roland McGrath  <roland@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/alpha/wordexp.c: Contents moved to main

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/getdents64.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/getdents64.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/getdents64.c Mon Jul 20 00:08:18 2009
@@ -1,1 +1,1 @@
-#include "../getdents64.c"
+#include <sysdeps/unix/sysv/linux/getdents64.c>

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/getsysstats.c Mon Jul 20 00:08:18 2009
@@ -20,15 +20,16 @@
 
 
 /* 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									   \
     {									   \
       /* Find the line that contains the information about the number of   \
 	 active cpus.  We don't have to fear extremely long lines since	   \
 	 the kernel will not generate them.  8192 bytes are really enough. \
 	 If there is no "CPUs ..." line then we are on a UP system.  */	   \
+      char *l;								   \
       (RESULT) = 1;							   \
-      while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL)	   \
+      while ((l = next_line (FD, BUFFER, &CP, &RE, BUFFER_END)) != NULL)  \
 	if ((sscanf (BUFFER, "cpus active : %d", &(RESULT)) == 1)	   \
 	    || (sscanf (BUFFER, "CPUs probed %*d active %d",		   \
 			&(RESULT)) == 1))  				   \

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/fork.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/fork.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/fork.c Mon Jul 20 00:08:18 2009
@@ -27,4 +27,4 @@
 		  CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD,	\
 		  NULL, NULL, &THREAD_SELF->tid, NULL)
 
-#include "../fork.c"
+#include <sysdeps/unix/sysv/linux/fork.c>

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h Mon Jul 20 00:08:18 2009
@@ -37,7 +37,12 @@
 #define FUTEX_LOCK_PI		6
 #define FUTEX_UNLOCK_PI		7
 #define FUTEX_TRYLOCK_PI	8
+#define FUTEX_WAIT_BITSET	9
+#define FUTEX_WAKE_BITSET	10
 #define FUTEX_PRIVATE_FLAG	128
+#define FUTEX_CLOCK_REALTIME	256
+
+#define FUTEX_BITSET_MATCH_ANY	0xffffffff
 
 /* Values for 'private' parameter of locking macros.  Yes, the
    definition seems to be backwards.  But it is not.  The bit will be

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c Mon Jul 20 00:08:18 2009
@@ -2,4 +2,4 @@
    the acquire/release semantics of atomic_exchange_and_add.  And even if
    we don't do this, we should be using atomic_full_barrier or otherwise.  */
 #define __lll_rel_instr  "mb"
-#include "../sem_post.c"
+#include <nptl/sysdeps/unix/sysv/linux/sem_post.c>

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c Mon Jul 20 00:08:18 2009
@@ -1,1 +1,1 @@
-#include "../x86_64/timer_create.c"
+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c>

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c Mon Jul 20 00:08:18 2009
@@ -1,1 +1,1 @@
-#include "../x86_64/timer_delete.c"
+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c>

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c Mon Jul 20 00:08:18 2009
@@ -1,1 +1,1 @@
-#include "../x86_64/timer_getoverr.c"
+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c>

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c Mon Jul 20 00:08:18 2009
@@ -1,1 +1,1 @@
-#include "../x86_64/timer_gettime.c"
+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c Mon Jul 20 00:08:18 2009
@@ -1,1 +1,1 @@
-#include "../x86_64/timer_settime.c"
+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/sys/procfs.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/sys/procfs.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/sys/procfs.h Mon Jul 20 00:08:18 2009
@@ -29,9 +29,22 @@
 #include <sys/types.h>
 #include <sys/ucontext.h>
 #include <sys/user.h>
-#include <asm/elf.h>
 
 __BEGIN_DECLS
+
+/*
+ * The OSF/1 version of <sys/procfs.h> makes gregset_t 46 entries long.
+ * I have no idea why that is so.  For now, we just leave it at 33
+ * (32 general regs + processor status word).
+ */
+#define ELF_NGREG       33
+#define ELF_NFPREG      32
+
+typedef unsigned long elf_greg_t;
+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
+
+typedef double elf_fpreg_t;
+typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 
 struct elf_siginfo
   {

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/sysconf.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/sysconf.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/alpha/sysconf.c Mon Jul 20 00:08:18 2009
@@ -149,4 +149,4 @@
 /* Now the generic Linux version.  */
 #undef __sysconf
 #define __sysconf static linux_sysconf
-#include "../sysconf.c"
+#include <sysdeps/unix/sysv/linux/sysconf.c>
Prev by Date: [commits] r8685 - in /fsf/trunk/libc/nptl: ./ sysdeps/unix/sysv/linux/x86_64/
Next by Date: [commits] r8688 - in /fsf/trunk/libc: ./ locale/ locale/programs/ nptl/ nptl/sysdeps/unix/sysv/linux/x86_64/ string/ sysdeps/x86_64/mu...
Previous by thread: [commits] r8685 - in /fsf/trunk/libc/nptl: ./ sysdeps/unix/sysv/linux/x86_64/
Next by thread: [commits] r8688 - in /fsf/trunk/libc: ./ locale/ locale/programs/ nptl/ nptl/sysdeps/unix/sysv/linux/x86_64/ string/ sysdeps/x86_64/mu...
Index(es):
- Date
- Thread