This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-234-ga35cbf2
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 20 Aug 2012 14:40:05 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-234-ga35cbf2
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via a35cbf28fb4ecfa2d36c1466b4068a7223ffe34f (commit)
from 445f7ecd666e29fed3fd429f8d808bc5e8277b0a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a35cbf28fb4ecfa2d36c1466b4068a7223ffe34f
commit a35cbf28fb4ecfa2d36c1466b4068a7223ffe34f
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Aug 20 14:39:53 2012 +0000
Remove __ASSUME_SWAPCONTEXT_SYSCALL.
diff --git a/ChangeLog b/ChangeLog
index df7f090..111503e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2012-08-20 Joseph Myers <joseph@codesourcery.com>
+ * sysdeps/unix/sysv/linux/kernel-features.h
+ (__ASSUME_SWAPCONTEXT_SYSCALL): Remove.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S
+ [__ASSUME_SWAPCONTEXT_SYSCALL]: Make code unconditional.
+ [!__ASSUME_SWAPCONTEXT_SYSCALL]: Remove conditional code.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
+ [__ASSUME_SWAPCONTEXT_SYSCALL]: Make code unconditional.
+ [!__ASSUME_SWAPCONTEXT_SYSCALL]: Remove conditional code.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S
+ [__ASSUME_SWAPCONTEXT_SYSCALL]: Make code unconditional.
+ [!__ASSUME_SWAPCONTEXT_SYSCALL]: Remove conditional code.
+
* sysdeps/unix/sysv/linux/kernel-features.h [__s390__ &&
__LINUX_KERNEL_VERSION >= 0x020616] (__ASSUME_UTIMES): Define.
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 13adaad..2e45915 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -106,13 +106,6 @@
# define __ASSUME_FADVISE64_64_SYSCALL 1
#endif
-/* Starting with 2.6.0 PowerPC adds signal/swapcontext support for Vector
- SIMD (AKA Altivec, VMX) instructions and register state. This changes
- the overall size of the sigcontext and adds the swapcontext syscall. */
-#ifdef __powerpc__
-# define __ASSUME_SWAPCONTEXT_SYSCALL 1
-#endif
-
/* On sparc64 stat64/lstat64/fstat64 syscalls were introduced in 2.6.12. */
#if defined __sparc__ && defined __arch64__
# define __ASSUME_STAT64_SYSCALL 1
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S
index 2d36df4..27f2348 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S
@@ -32,7 +32,6 @@
/* Size of ucontext in GLIBC_2.3.4 and later. */
#define _UC_SIZE_2_3_4 1184
-#ifdef __ASSUME_SWAPCONTEXT_SYSCALL
.section ".text";
ENTRY (__getcontext)
li r4,0
@@ -45,9 +44,6 @@ ENTRY (__getcontext)
1:
b __syscall_error@local
END(__getcontext)
-#else
-# include "getcontext-common.S"
-#endif
versioned_symbol (libc, __getcontext, getcontext, GLIBC_2_3_4)
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
index fa7d05f..b96b040 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
@@ -1,5 +1,5 @@
/* Jump to a new context.
- Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2002-2012 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
@@ -32,7 +32,6 @@
/* Size of ucontext in GLIBC_2.3.4 and later. */
#define _UC_SIZE_2_3_4 1184
-#ifdef __ASSUME_SWAPCONTEXT_SYSCALL
.section ".text";
ENTRY (__setcontext)
mr r4,r3
@@ -46,9 +45,6 @@ ENTRY (__setcontext)
1:
b __syscall_error@local
END(__setcontext)
-#else
-# include "setcontext-common.S"
-#endif
versioned_symbol (libc, __setcontext, setcontext, GLIBC_2_3_4)
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S
index 0189af8..556c802 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S
@@ -1,5 +1,5 @@
/* Save current context and jump to a new context.
- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002-2012 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
@@ -32,7 +32,6 @@
/* Size of ucontext in GLIBC_2.3.4 and later. */
#define _UC_SIZE_2_3_4 1184
-#ifdef __ASSUME_SWAPCONTEXT_SYSCALL
.section ".text";
ENTRY (__swapcontext)
li r5,_UC_SIZE_2_3_4;
@@ -44,9 +43,6 @@ ENTRY (__swapcontext)
1:
b __syscall_error@local
END(__swapcontext)
-#else
-# include "swapcontext-common.S"
-#endif
versioned_symbol (libc, __swapcontext, swapcontext, GLIBC_2_3_4)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 12 ++++++++++++
sysdeps/unix/sysv/linux/kernel-features.h | 7 -------
.../unix/sysv/linux/powerpc/powerpc32/getcontext.S | 4 ----
.../unix/sysv/linux/powerpc/powerpc32/setcontext.S | 6 +-----
.../sysv/linux/powerpc/powerpc32/swapcontext.S | 6 +-----
5 files changed, 14 insertions(+), 21 deletions(-)
hooks/post-receive
--
GNU C Library master sources