Author: aurel32 Date: 2006-08-15 10:18:12 +0000 (Tue, 15 Aug 2006) New Revision: 1731
Removed: glibc-package/branches/glibc-2.4/debian/patches/hppa/local-remove-mallocdef.diff Modified: glibc-package/branches/glibc-2.4/debian/changelog glibc-package/branches/glibc-2.4/debian/patches/series Log: * Remove hppa/local-remove-mallocdef.diff (not necessary anymore as spinlock ldcw fix has been applied). Modified: glibc-package/branches/glibc-2.4/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.4/debian/changelog 2006-08-15 10:13:23 UTC (rev 1730) +++ glibc-package/branches/glibc-2.4/debian/changelog 2006-08-15 10:18:12 UTC (rev 1731) @@ -88,6 +88,8 @@ to remove merged part. * Remove hppa/local-gcc-4-profile.diff (not necessary anymore). * Update hppa/local-inlining.diff to reflect the new port add-on. + * Remove hppa/local-remove-mallocdef.diff (not necessary anymore as + spinlock ldcw fix has been applied). * Update hppa/submitted-drop-utimes.diff. * Remove hppa/submitted-fenv-align.diff (merged upstream). * Remove hppa/submitted-fpu.diff (merged upstream). Deleted: glibc-package/branches/glibc-2.4/debian/patches/hppa/local-remove-mallocdef.diff =================================================================== --- glibc-package/branches/glibc-2.4/debian/patches/hppa/local-remove-mallocdef.diff 2006-08-15 10:13:23 UTC (rev 1730) +++ glibc-package/branches/glibc-2.4/debian/patches/hppa/local-remove-mallocdef.diff 2006-08-15 10:18:12 UTC (rev 1731) @@ -1,85 +0,0 @@ -# DP: Description: malloc-machine.h should be removed until spinlock ldcw -# fix is applied. workaround for compilation. -# DP: Related bugs: -# DP: Dpatch author: GOTO Masanori <[EMAIL PROTECTED]> -# DP: Patch author: GOTO Masanori <[EMAIL PROTECTED]> -# DP: Upstream status: Debian-Specific -# DP: Status Details: -# DP: Date: 2005-03-09 - ---- linuxthreads/sysdeps/unix/sysv/linux/hppa/malloc-machine.h 15 Oct 2003 04:40:10 -0000 1.1 -+++ /dev/null 9 Mar 2005 06:45:46 -0000 -@@ -1,73 +0,0 @@ --/* HP-PARISC macro definitions for mutexes, thread-specific data -- and parameters for malloc. -- Copyright (C) 2003 Free Software Foundation, Inc. -- This file is part of the GNU C Library. -- Contributed by Carlos O'Donell <[EMAIL PROTECTED]>, 2003. -- -- 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; if not, write to the Free -- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -- 02111-1307 USA. */ -- --#ifndef _MALLOC_MACHINE_H --#define _MALLOC_MACHINE_H -- --#undef thread_atfork_static -- --#include <atomic.h> --#include <bits/libc-lock.h> -- --__libc_lock_define (typedef, mutex_t) -- --/* Since our lock structure does not tolerate being initialized to zero, we must -- modify the standard function calls made by malloc */ --# define mutex_init(m) \ -- __libc_maybe_call (__pthread_mutex_init, (m, NULL), \ -- (((m)->__m_lock.__spinlock = __LT_SPINLOCK_INIT),(*(int *)(m))) ) --# define mutex_lock(m) \ -- __libc_maybe_call (__pthread_mutex_lock, (m), \ -- (__load_and_clear(&((m)->__m_lock.__spinlock)), 0)) --# define mutex_trylock(m) \ -- __libc_maybe_call (__pthread_mutex_trylock, (m), \ -- (*(int *)(m) ? 1 : (__load_and_clear(&((m)->__m_lock.__spinlock)), 0))) --# define mutex_unlock(m) \ -- __libc_maybe_call (__pthread_mutex_unlock, (m), \ -- (((m)->__m_lock.__spinlock = __LT_SPINLOCK_INIT), (*(int *)(m))) ) -- --/* This is defined by newer gcc version unique for each module. */ --extern void *__dso_handle __attribute__ ((__weak__)); -- --#include <fork.h> -- --#ifdef SHARED --# define thread_atfork(prepare, parent, child) \ -- __register_atfork (prepare, parent, child, __dso_handle) --#else --# define thread_atfork(prepare, parent, child) \ -- __register_atfork (prepare, parent, child, \ -- &__dso_handle == NULL ? NULL : __dso_handle) --#endif -- --/* thread specific data for glibc */ -- --#include <bits/libc-tsd.h> -- --typedef int tsd_key_t[1]; /* no key data structure, libc magic does it */ --__libc_tsd_define (static, MALLOC) /* declaration/common definition */ --#define tsd_key_create(key, destr) ((void) (key)) --#define tsd_setspecific(key, data) __libc_tsd_set (MALLOC, (data)) --#define tsd_getspecific(key, vptr) ((vptr) = __libc_tsd_get (MALLOC)) -- --#include <sysdeps/generic/malloc-machine.h> -- --#endif /* !defined(_MALLOC_MACHINE_H) */ Modified: glibc-package/branches/glibc-2.4/debian/patches/series =================================================================== --- glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-15 10:13:23 UTC (rev 1730) +++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-15 10:18:12 UTC (rev 1731) @@ -58,7 +58,6 @@ hppa/cvs-portshead.patch hppa/local-Rminkernel.diff -p0 hppa/submitted-drop-utimes.diff -p1 -#hppa/local-remove-mallocdef.diff -p0 # g: this should be replaced by Carlos' new patch. hppa/submitted-lt.diff -p1 #hppa/submitted-sysdeps.diff -p0 hppa/cvs-pie-relocs.diff -p0 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]