From 8012d2b976f820d0dd1d01e2f9be9e5cec3272d5 Mon Sep 17 00:00:00 2001
From: Michael Banck <mbanck@debian.org>
Date: Sat, 7 Jun 2008 14:05:48 +0000
Subject:     + debian/patches/mmx.patch: Likewise.     +
 debian/patches/libpthread_stubs.patch: Updated, one hunk got applied      
 upstream.

---
 debian/changelog                      |  3 +++
 debian/patches/libpthread_stubs.patch |  8 ------
 debian/patches/mmx.patch              | 46 -----------------------------------
 3 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 debian/patches/mmx.patch

diff --git a/debian/changelog b/debian/changelog
index a0ebdbe3..45e62cc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ hurd (20080607-1) UNRELEASED; urgency=low
       changes.
     + debian/patches/libpthread_getattr.patch: Removed, applied upstream.
     + debian/patches/libpthread_inline.patch: Likewise.
+    + debian/patches/mmx.patch: Likewise.
+    + debian/patches/libpthread_stubs.patch: Updated, one hunk got applied
+      upstream.
 
  -- Michael Banck <mbanck@debian.org>  Mon, 19 May 2008 01:19:24 +0200
 
diff --git a/debian/patches/libpthread_stubs.patch b/debian/patches/libpthread_stubs.patch
index f00b672f..1d3932b9 100644
--- a/debian/patches/libpthread_stubs.patch
+++ b/debian/patches/libpthread_stubs.patch
@@ -58,14 +58,6 @@ retrieving revision 1.1
 diff -u -p -r1.1 libc-symbols.h
 --- libpthread/include/libc-symbols.h	10 Oct 2002 23:05:06 -0000	1.1
 +++ libpthread/include/libc-symbols.h	1 Jan 2008 15:21:50 -0000
-@@ -60,6 +60,7 @@
- #define HAVE_ELF
- #define HAVE_SECTION_QUOTES
- #define HAVE_VISIBILITY_ATTRIBUTE
-+#define HAVE_ASM_PREVIOUS_DIRECTIVE
- // #define SHARED
- 
- /* The symbols in all the user (non-_) macros are C symbols.
 @@ -250,6 +251,7 @@
  
  /* A canned warning for sysdeps/stub functions.  */
diff --git a/debian/patches/mmx.patch b/debian/patches/mmx.patch
deleted file mode 100644
index 3643209e..00000000
--- a/debian/patches/mmx.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-2008-02-29  Samuel Thibault  <samuel.thibault@ens-lyon.org
-
-	* sysdeps/l4/hurd/i386/pt-setup.c (stack_setup): Align stack on 0x10
-	for MMX operations.
-	* sysdeps/mach/hurd/i386/pt-setup.c (stack_setup): Likewise.
-
-Index: sysdeps/l4/hurd/i386/pt-setup.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/l4/hurd/i386/pt-setup.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 pt-setup.c
---- hurd/libpthread/sysdeps/l4/hurd/i386/pt-setup.c	10 Oct 2002 23:05:05 -0000	1.1
-+++ hurd/libpthread/sysdeps/l4/hurd/i386/pt-setup.c	29 Feb 2008 01:30:29 -0000
-@@ -47,8 +47,10 @@ stack_setup (struct __pthread *thread,
-   if (start_routine)
-     {
-       /* Set up call frame.  */
--      *--top = (L4_Word_t) arg;	/* Argument to START_ROUTINE.  */
--      *--top = (L4_Word_t) start_routine;
-+      top -= 2*sizeof(L4_Word_t);
-+      top = (unsigned long) top & ~0xf;
-+      top[1] = (L4_Word_t) arg;	/* Argument to START_ROUTINE.  */
-+      top[0] = (L4_Word_t) start_routine;
-       *--top = 0;		/* Fake return address.  */
-     }
- 
-Index: sysdeps/mach/hurd/i386/pt-setup.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/i386/pt-setup.c,v
-retrieving revision 1.4
-diff -u -p -r1.4 pt-setup.c
---- hurd/libpthread/sysdeps/mach/hurd/i386/pt-setup.c	12 May 2005 20:55:37 -0000	1.4
-+++ hurd/libpthread/sysdeps/mach/hurd/i386/pt-setup.c	29 Feb 2008 01:30:29 -0000
-@@ -63,8 +63,10 @@ stack_setup (struct __pthread *thread,
-   if (start_routine)
-     {
-       /* And then the call frame.  */
--      *--top = (uintptr_t) arg;	/* Argument to START_ROUTINE.  */
--      *--top = (uintptr_t) start_routine;
-+      top -= 2*sizeof(uintptr_t);
-+      top = (uintptr_t) top & ~0xf;
-+      top[1] = (uintptr_t) arg;	/* Argument to START_ROUTINE.  */
-+      top[0] = (uintptr_t) start_routine;
-       *--top = 0;		/* Fake return address.  */
-     }
- 
-- 
cgit v1.2.3