r1591 - in glibc-package/branches/glibc-2.4/debian: . patches patches/i386
Author: aurel32
Date: 2006-05-30 20:20:36 +0000 (Tue, 30 May 2006)
New Revision: 1591
Removed:
glibc-package/branches/glibc-2.4/debian/patches/i386/local-i486_ldt_support.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
* Remove i386/local-i486_ldt_support.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-05-30 20:17:07 UTC (rev 1590)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-30 20:20:36 UTC (rev 1591)
@@ -72,6 +72,7 @@
* Update any/local-version-sanity.diff.
* Remove any/submitted-eh-frame-terminator.diff (merged upstream).
* Update any/submitted-nis-netgrp.diff.
+ * Remove i386/local-i486_ldt_support.diff (merged upstream).
* Remove hppa/cvs-linesep.diff (merged upstream).
* Update hppa/cvs-no-ldbl-128.diff to reflect the new port add-on.
* Update hppa/cvs-pie-relocs.diff to reflect the new port add-on.
Deleted: glibc-package/branches/glibc-2.4/debian/patches/i386/local-i486_ldt_support.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/i386/local-i486_ldt_support.diff 2006-05-30 20:17:07 UTC (rev 1590)
+++ glibc-package/branches/glibc-2.4/debian/patches/i386/local-i486_ldt_support.diff 2006-05-30 20:20:36 UTC (rev 1591)
@@ -1,79 +0,0 @@
---- libc/linuxthreads/sysdeps/i386/i486/pt-machine.h 2003-01-05 00:24:33.937401424 +0100
-+++ libc/linuxthreads/sysdeps/i386/i486/pt-machine.h 2004-10-19 07:12:59.000000000 +0200
-@@ -0,0 +1,76 @@
-+/* Machine-dependent pthreads configuration and inline functions.
-+ i486 version.
-+ Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+ Contributed by Richard Henderson <rth@tamu.edu>.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public License as
-+ published by the Free Software Foundation; either version 2.1 of the
-+ License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; see the file COPYING.LIB. If not,
-+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA. */
-+
-+#ifndef _PT_MACHINE_H
-+#define _PT_MACHINE_H 1
-+
-+#ifndef PT_EI
-+# define PT_EI extern inline __attribute__ ((always_inline))
-+#endif
-+#include "kernel-features.h"
-+
-+#ifndef __ASSEMBLER__
-+extern long int testandset (int *spinlock);
-+extern int __compare_and_swap (long int *p, long int oldval, long int newval);
-+
-+/* Get some notion of the current stack. Need not be exactly the top
-+ of the stack, just something somewhere in the current frame. */
-+#define CURRENT_STACK_FRAME __builtin_frame_address (0)
-+
-+
-+/* Spinlock implementation; required. */
-+PT_EI long int
-+testandset (int *spinlock)
-+{
-+ long int ret;
-+
-+ __asm__ __volatile__ (
-+ "xchgl %0, %1"
-+ : "=r" (ret), "=m" (*spinlock)
-+ : "0" (1), "m" (*spinlock)
-+ : "memory");
-+
-+ return ret;
-+}
-+
-+
-+/* Compare-and-swap for semaphores. It's always available on i686. */
-+#define HAS_COMPARE_AND_SWAP
-+
-+PT_EI int
-+__compare_and_swap (long int *p, long int oldval, long int newval)
-+{
-+ char ret;
-+ long int readval;
-+
-+ __asm__ __volatile__ ("lock; cmpxchgl %3, %1; sete %0"
-+ : "=q" (ret), "=m" (*p), "=a" (readval)
-+ : "r" (newval), "m" (*p), "a" (oldval)
-+ : "memory");
-+ return ret;
-+}
-+#endif
-+
-+#if __ASSUME_LDT_WORKS > 0
-+#include "../useldt.h"
-+#endif
-+
-+#endif /* pt-machine.h */
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-30 20:17:07 UTC (rev 1590)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-30 20:20:36 UTC (rev 1591)
@@ -74,7 +74,6 @@
hurd-i386/submitted-ioctl-decode-argument.diff -p0
hurd-i386/submitted-sysvshm.diff -p1
-i386/local-i486_ldt_support.diff -p1
i386/local-biarch.diff -p1
i386/local-cmov.diff -p0
i386/submitted-i686-timing.diff -p1
Reply to: