r2402 - in glibc-package/trunk/debian: . patches/any patches/arm
Author: schizo
Date: 2007-07-07 16:27:52 +0000 (Sat, 07 Jul 2007)
New Revision: 2402
Added:
glibc-package/trunk/debian/patches/any/cvs-malloc.diff
glibc-package/trunk/debian/patches/any/local-linuxthreads-defines.diff
glibc-package/trunk/debian/patches/any/local-linuxthreads-fatalprepare.diff
glibc-package/trunk/debian/patches/any/local-linuxthreads-lowlevellock.diff
glibc-package/trunk/debian/patches/any/local-tst-mktime2.diff
Removed:
glibc-package/trunk/debian/patches/arm/cvs-procinfo-eabi.diff
Modified:
glibc-package/trunk/debian/changelog
Log:
more partial merging from glibc-2.6 branch
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-07-07 15:19:20 UTC (rev 2401)
+++ glibc-package/trunk/debian/changelog 2007-07-07 16:27:52 UTC (rev 2402)
@@ -42,6 +42,7 @@
- Remove any/cvs-glob-c.diff (obsolete).
- Remove any/cvs-scanf_hexfloat.diff (obsolete).
- Remove alpha/submitted-sigsuspend.diff (merged upstream).
+ - Remove arm/cvs-procinfo-eabi.diff (obsolete).
* debian/sysdeps/depflags.pl: Clean out relationships for packages
that do not exist in sarge or later.
* debian/debhelper.in/libc.install: do not hardcode the glibc
Added: glibc-package/trunk/debian/patches/any/cvs-malloc.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-malloc.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-malloc.diff 2007-07-07 16:27:52 UTC (rev 2402)
@@ -0,0 +1,179 @@
+2007-05-21 Jakub Jelinek <jakub@redhat.com>
+
+ * malloc/hooks.c (MALLOC_STATE_VERSION): Bump.
+ (public_sET_STATe): If ms->version < 3, put all chunks into
+ unsorted chunks and clear {fd,bk}_nextsize fields of largebin
+ chunks.
+ * malloc/malloc.c (do_check_malloc_state): Don't assert
+ n_mmaps is not greater than n_mmaps_max.
+
+ * malloc/malloc.c [MALLOC_DEBUG]: Revert 2007-05-13 changes.
+ * malloc/hooks.c: Likewise.
+ * malloc/arena.c: Likewise.
+ * malloc/Makefile (CFLAGS-malloc.c): Revert accidental
+ 2007-05-07 commit.
+
+Index: glibc-2.6/malloc/arena.c
+===================================================================
+--- glibc-2.6.orig/malloc/arena.c
++++ glibc-2.6/malloc/arena.c
+@@ -370,9 +370,6 @@
+ mp_.top_pad = DEFAULT_TOP_PAD;
+ #endif
+ mp_.n_mmaps_max = DEFAULT_MMAP_MAX;
+-#if MALLOC_DEBUG
+- mp_.n_mmaps_cmax = DEFAULT_MMAP_MAX;
+-#endif
+ mp_.mmap_threshold = DEFAULT_MMAP_THRESHOLD;
+ mp_.trim_threshold = DEFAULT_TRIM_THRESHOLD;
+ mp_.pagesize = malloc_getpagesize;
+Index: glibc-2.6/malloc/malloc.c
+===================================================================
+--- glibc-2.6.orig/malloc/malloc.c
++++ glibc-2.6/malloc/malloc.c
+@@ -2358,9 +2358,6 @@
+ /* Memory map support */
+ int n_mmaps;
+ int n_mmaps_max;
+-#if MALLOC_DEBUG
+- int n_mmaps_cmax;
+-#endif
+ int max_n_mmaps;
+ /* the mmap_threshold is dynamic, until the user sets
+ it manually, at which point we need to disable any
+@@ -2876,8 +2873,6 @@
+ assert(total <= (unsigned long)(mp_.max_total_mem));
+ assert(mp_.n_mmaps >= 0);
+ #endif
+- assert(mp_.n_mmaps <= mp_.n_mmaps_cmax);
+- assert(mp_.n_mmaps_max <= mp_.n_mmaps_cmax);
+ assert(mp_.n_mmaps <= mp_.max_n_mmaps);
+
+ assert((unsigned long)(av->system_mem) <=
+@@ -3475,13 +3470,6 @@
+ }
+
+ mp_.n_mmaps--;
+-#if MALLOC_DEBUG
+- if (mp_.n_mmaps_cmax > mp_.n_mmaps_max)
+- {
+- assert (mp_.n_mmaps_cmax == mp_.n_mmaps + 1);
+- mp_.n_mmaps_cmax = mp_.n_mmaps;
+- }
+-#endif
+ mp_.mmapped_mem -= total_size;
+
+ int ret __attribute__ ((unused)) = munmap((char *)block, total_size);
+@@ -5397,9 +5385,6 @@
+ mp_.n_mmaps_max = 0;
+ mem = _int_malloc(av, size);
+ mp_.n_mmaps_max = mmx; /* reset mmap */
+-#if MALLOC_DEBUG
+- mp_.n_mmaps_cmax = mmx;
+-#endif
+ if (mem == 0)
+ return 0;
+
+@@ -5725,17 +5710,8 @@
+ res = 0;
+ else
+ #endif
+- {
+-#if MALLOC_DEBUG
+- if (mp_.n_mmaps <= value)
+- mp_.n_mmaps_cmax = value;
+- else
+- mp_.n_mmaps_cmax = mp_.n_mmaps;
+-#endif
+-
+- mp_.n_mmaps_max = value;
+- mp_.no_dyn_threshold = 1;
+- }
++ mp_.n_mmaps_max = value;
++ mp_.no_dyn_threshold = 1;
+ break;
+
+ case M_CHECK_ACTION:
+Index: glibc-2.6/malloc/hooks.c
+===================================================================
+--- glibc-2.6.orig/malloc/hooks.c
++++ glibc-2.6/malloc/hooks.c
+@@ -496,7 +496,7 @@
+ then the hooks are reset to 0. */
+
+ #define MALLOC_STATE_MAGIC 0x444c4541l
+-#define MALLOC_STATE_VERSION (0*0x100l + 2l) /* major*0x100 + minor */
++#define MALLOC_STATE_VERSION (0*0x100l + 3l) /* major*0x100 + minor */
+
+ struct malloc_save_state {
+ long magic;
+@@ -507,9 +507,6 @@
+ unsigned long trim_threshold;
+ unsigned long top_pad;
+ unsigned int n_mmaps_max;
+-#if MALLOC_DEBUG
+- unsigned int n_mmaps_cmax;
+-#endif
+ unsigned long mmap_threshold;
+ int check_action;
+ unsigned long max_sbrked_mem;
+@@ -553,9 +550,6 @@
+ ms->trim_threshold = mp_.trim_threshold;
+ ms->top_pad = mp_.top_pad;
+ ms->n_mmaps_max = mp_.n_mmaps_max;
+-#if MALLOC_DEBUG
+- ms->n_mmaps_cmax = mp_.n_mmaps_cmax;
+-#endif
+ ms->mmap_threshold = mp_.mmap_threshold;
+ ms->check_action = check_action;
+ ms->max_sbrked_mem = main_arena.max_system_mem;
+@@ -601,8 +595,9 @@
+ assert(ms->av[2*i+3] == 0);
+ first(b) = last(b) = b;
+ } else {
+- if(i<NSMALLBINS || (largebin_index(chunksize(ms->av[2*i+2]))==i &&
+- largebin_index(chunksize(ms->av[2*i+3]))==i)) {
++ if(ms->version >= 3 &&
++ (i<NSMALLBINS || (largebin_index(chunksize(ms->av[2*i+2]))==i &&
++ largebin_index(chunksize(ms->av[2*i+3]))==i))) {
+ first(b) = ms->av[2*i+2];
+ last(b) = ms->av[2*i+3];
+ /* Make sure the links to the bins within the heap are correct. */
+@@ -622,14 +617,22 @@
+ }
+ }
+ }
++ if (ms->version < 3) {
++ /* Clear fd_nextsize and bk_nextsize fields. */
++ b = unsorted_chunks(&main_arena)->fd;
++ while (b != unsorted_chunks(&main_arena)) {
++ if (!in_smallbin_range(chunksize(b))) {
++ b->fd_nextsize = NULL;
++ b->bk_nextsize = NULL;
++ }
++ b = b->fd;
++ }
++ }
+ mp_.sbrk_base = ms->sbrk_base;
+ main_arena.system_mem = ms->sbrked_mem_bytes;
+ mp_.trim_threshold = ms->trim_threshold;
+ mp_.top_pad = ms->top_pad;
+ mp_.n_mmaps_max = ms->n_mmaps_max;
+-#if MALLOC_DEBUG
+- mp_.n_mmaps_cmax = ms->n_mmaps_cmax;
+-#endif
+ mp_.mmap_threshold = ms->mmap_threshold;
+ check_action = ms->check_action;
+ main_arena.max_system_mem = ms->max_sbrked_mem;
+Index: glibc-2.6/malloc/Makefile
+===================================================================
+--- glibc-2.6.orig/malloc/Makefile
++++ glibc-2.6/malloc/Makefile
+@@ -104,7 +104,6 @@
+ include ../Rules
+
+ CFLAGS-mcheck-init.c = $(PIC-ccflag)
+-CFLAGS-malloc.c += -DMALLOC_DEBUG
+
+ $(objpfx)libmcheck.a: $(objpfx)mcheck-init.o
+ -rm -f $@
Added: glibc-package/trunk/debian/patches/any/local-linuxthreads-defines.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-linuxthreads-defines.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/local-linuxthreads-defines.diff 2007-07-07 16:27:52 UTC (rev 2402)
@@ -0,0 +1,20 @@
+
+ linuxthreads still uses these defines
+ apply only for glibc 2.6 and above
+
+Index: config.make.in
+===================================================================
+--- config.make.in.orig
++++ config.make.in
+@@ -38,6 +38,11 @@
+ all-warnings = @all_warnings@
+
+ elf = @elf@
++have-protected = yes
++have-z-nodelete = yes
++have-z-nodlopen = yes
++have-z-initfirst = yes
++have-z-relro = yes
+ have-z-combreloc = @libc_cv_z_combreloc@
+ have-z-execstack = @libc_cv_z_execstack@
+ have-initfini = @libc_cv_have_initfini@
Added: glibc-package/trunk/debian/patches/any/local-linuxthreads-fatalprepare.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-linuxthreads-fatalprepare.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/local-linuxthreads-fatalprepare.diff 2007-07-07 16:27:52 UTC (rev 2402)
@@ -0,0 +1,44 @@
+Index: linuxthreads/sysdeps/unix/sysv/linux/fatal-prepare.h
+===================================================================
+--- /dev/null
++++ linuxthreads/sysdeps/unix/sysv/linux/fatal-prepare.h
+@@ -0,0 +1,39 @@
++/* Copyright (C) 2003, 2007 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
++ 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. */
++
++#include <pthread.h>
++
++/* We have to completely disable cancellation. assert() must not be a
++ cancellation point but the implementation uses write() etc. */
++#ifdef SHARED
++# include <pthread-functions.h>
++# define FATAL_PREPARE \
++ { \
++ int (*fp) (int, int *); \
++ fp = __libc_pthread_functions.ptr_pthread_setcancelstate; \
++ if (fp != NULL) \
++ fp (PTHREAD_CANCEL_DISABLE, NULL); \
++ }
++#else
++# pragma weak pthread_setcancelstate
++# define FATAL_PREPARE \
++ { \
++ if (pthread_setcancelstate != NULL) \
++ pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL); \
++ }
++#endif
Added: glibc-package/trunk/debian/patches/any/local-linuxthreads-lowlevellock.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-linuxthreads-lowlevellock.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/local-linuxthreads-lowlevellock.diff 2007-07-07 16:27:52 UTC (rev 2402)
@@ -0,0 +1,158 @@
+Index: linuxthreads/sysdeps/unix/sysv/linux/rtld-lowlevel.h
+===================================================================
+--- /dev/null
++++ linuxthreads/sysdeps/unix/sysv/linux/rtld-lowlevel.h
+@@ -0,0 +1,153 @@
++/* Defintions for lowlevel handling in ld.so.
++ Copyright (C) 2006 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
++ 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 _RTLD_LOWLEVEL_H
++#define _RTLD_LOWLEVEL_H 1
++
++#include <atomic.h>
++#include <lowlevellock.h>
++
++
++/* Special multi-reader lock used in ld.so. */
++#define __RTLD_MRLOCK_WRITER 1
++#define __RTLD_MRLOCK_RWAIT 2
++#define __RTLD_MRLOCK_WWAIT 4
++#define __RTLD_MRLOCK_RBITS \
++ ~(__RTLD_MRLOCK_WRITER | __RTLD_MRLOCK_RWAIT | __RTLD_MRLOCK_WWAIT)
++#define __RTLD_MRLOCK_INC 8
++#define __RTLD_MRLOCK_TRIES 5
++
++
++typedef int __rtld_mrlock_t;
++
++
++#define __rtld_mrlock_define(CLASS,NAME) \
++ CLASS __rtld_mrlock_t NAME;
++
++
++#define _RTLD_MRLOCK_INITIALIZER 0
++#define __rtld_mrlock_initialize(NAME) \
++ (void) ((NAME) = 0)
++
++
++#define __rtld_mrlock_lock(lock) \
++ do { \
++ __label__ out; \
++ while (1) \
++ { \
++ int oldval; \
++ for (int tries = 0; tries < __RTLD_MRLOCK_TRIES; ++tries) \
++ { \
++ oldval = lock; \
++ while (__builtin_expect ((oldval \
++ & (__RTLD_MRLOCK_WRITER \
++ | __RTLD_MRLOCK_WWAIT)) \
++ == 0, 1)) \
++ { \
++ int newval = ((oldval & __RTLD_MRLOCK_RBITS) \
++ + __RTLD_MRLOCK_INC); \
++ int ret = atomic_compare_and_exchange_val_acq (&(lock), \
++ newval, \
++ oldval); \
++ if (__builtin_expect (ret == oldval, 1)) \
++ goto out; \
++ oldval = ret; \
++ } \
++ atomic_delay (); \
++ } \
++ if ((oldval & __RTLD_MRLOCK_RWAIT) == 0) \
++ { \
++ atomic_or (&(lock), __RTLD_MRLOCK_RWAIT); \
++ oldval |= __RTLD_MRLOCK_RWAIT; \
++ } \
++ lll_futex_wait (lock, oldval); \
++ } \
++ out:; \
++ } while (0)
++
++
++#define __rtld_mrlock_unlock(lock) \
++ do { \
++ int oldval = atomic_exchange_and_add (&(lock), -__RTLD_MRLOCK_INC); \
++ if (__builtin_expect ((oldval \
++ & (__RTLD_MRLOCK_RBITS | __RTLD_MRLOCK_WWAIT)) \
++ == (__RTLD_MRLOCK_INC | __RTLD_MRLOCK_WWAIT), 0)) \
++ /* We have to wake all threads since there might be some queued \
++ readers already. */ \
++ lll_futex_wake (&(lock), 0x7fffffff); \
++ } while (0)
++
++
++/* There can only ever be one thread trying to get the exclusive lock. */
++#define __rtld_mrlock_change(lock) \
++ do { \
++ __label__ out; \
++ while (1) \
++ { \
++ int oldval; \
++ for (int tries = 0; tries < __RTLD_MRLOCK_TRIES; ++tries) \
++ { \
++ oldval = lock; \
++ while (__builtin_expect ((oldval & __RTLD_MRLOCK_RBITS) == 0, 1)) \
++ { \
++ int newval = ((oldval & __RTLD_MRLOCK_RWAIT) \
++ + __RTLD_MRLOCK_WRITER); \
++ int ret = atomic_compare_and_exchange_val_acq (&(lock), \
++ newval, \
++ oldval); \
++ if (__builtin_expect (ret == oldval, 1)) \
++ goto out; \
++ oldval = ret; \
++ } \
++ atomic_delay (); \
++ } \
++ atomic_or (&(lock), __RTLD_MRLOCK_WWAIT); \
++ oldval |= __RTLD_MRLOCK_WWAIT; \
++ lll_futex_wait (lock, oldval); \
++ } \
++ out:; \
++ } while (0)
++
++
++#define __rtld_mrlock_done(lock) \
++ do { \
++ int oldval = atomic_exchange_and_add (&(lock), -__RTLD_MRLOCK_WRITER); \
++ if (__builtin_expect ((oldval & __RTLD_MRLOCK_RWAIT) != 0, 0)) \
++ lll_futex_wake (&(lock), 0x7fffffff); \
++ } while (0)
++
++
++/* Function to wait for variable become zero. Used in ld.so for
++ reference counters. */
++#define __rtld_waitzero(word) \
++ do { \
++ while (1) \
++ { \
++ int val = word; \
++ if (val == 0) \
++ break; \
++ lll_futex_wait (&(word), val); \
++ } \
++ } while (0)
++
++
++#define __rtld_notify(word) \
++ lll_futex_wake (&(word), 1)
++
++#endif
Added: glibc-package/trunk/debian/patches/any/local-tst-mktime2.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-tst-mktime2.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/local-tst-mktime2.diff 2007-07-07 16:27:52 UTC (rev 2402)
@@ -0,0 +1,12 @@
+Index: time/tst-mktime2.c
+===================================================================
+--- time/tst-mktime2.c.orig
++++ time/tst-mktime2.c
+@@ -2,6 +2,7 @@
+ #include <time.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <limits.h>
+
+ static time_t time_t_max;
+ static time_t time_t_min;
Deleted: glibc-package/trunk/debian/patches/arm/cvs-procinfo-eabi.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/cvs-procinfo-eabi.diff 2007-07-07 15:19:20 UTC (rev 2401)
+++ glibc-package/trunk/debian/patches/arm/cvs-procinfo-eabi.diff 2007-07-07 16:27:52 UTC (rev 2402)
@@ -1,251 +0,0 @@
-2006-10-31 Joseph S. Myers <joseph@codesourcery.com>
-
- * sysdeps/arm/eabi/fclrexcpt.c: Include <sysdep.h> instead of
- <asm/procinfo.h>. Use HWCAP_ARM_VFP instead of HWCAP_VFP.
- * sysdeps/arm/eabi/fedisblxcpt.c: Likewise.
- * sysdeps/arm/eabi/feenablxcpt.c: Likewise.
- * sysdeps/arm/eabi/fegetenv.c: Likewise.
- * sysdeps/arm/eabi/fegetexcept.c: Likewise.
- * sysdeps/arm/eabi/fegetround.c: Likewise.
- * sysdeps/arm/eabi/feholdexcpt.c: Likewise.
- * sysdeps/arm/eabi/fesetenv.c: Likewise.
- * sysdeps/arm/eabi/fesetround.c: Likewise.
- * sysdeps/arm/eabi/fraiseexcpt.c: Likewise.
- * sysdeps/arm/eabi/fsetexcptflg.c: Likewise.
- * sysdeps/arm/eabi/ftestexcept.c: Likewise.
- * sysdeps/arm/eabi/setfpucw.c: Likewise.
-
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fclrexcpt.c ports/sysdeps/arm/eabi/fclrexcpt.c
---- ports.orig/sysdeps/arm/eabi/fclrexcpt.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/fclrexcpt.c 2006-10-31 18:20:42.000000000 +0100
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- int
- __feclearexcept (int excepts)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- unsigned long int temp;
-
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fedisblxcpt.c ports/sysdeps/arm/eabi/fedisblxcpt.c
---- ports.orig/sysdeps/arm/eabi/fedisblxcpt.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/fedisblxcpt.c 2006-10-31 18:20:42.000000000 +0100
-@@ -24,12 +24,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- int
- fedisableexcept (int excepts)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- unsigned long int new_exc, old_exc;
-
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/feenablxcpt.c ports/sysdeps/arm/eabi/feenablxcpt.c
---- ports.orig/sysdeps/arm/eabi/feenablxcpt.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/feenablxcpt.c 2006-10-31 18:20:42.000000000 +0100
-@@ -24,12 +24,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- int
- feenableexcept (int excepts)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- unsigned long int new_exc, old_exc;
-
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fegetenv.c ports/sysdeps/arm/eabi/fegetenv.c
---- ports.orig/sysdeps/arm/eabi/fegetenv.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/fegetenv.c 2006-10-31 18:20:42.000000000 +0100
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- int
- __fegetenv (fenv_t *envp)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- unsigned long int temp;
- _FPU_GETCW (temp);
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fegetexcept.c ports/sysdeps/arm/eabi/fegetexcept.c
---- ports.orig/sysdeps/arm/eabi/fegetexcept.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/fegetexcept.c 2006-10-31 18:20:42.000000000 +0100
-@@ -24,12 +24,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- int
- fegetexcept (void)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- unsigned long temp;
-
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fegetround.c ports/sysdeps/arm/eabi/fegetround.c
---- ports.orig/sysdeps/arm/eabi/fegetround.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/fegetround.c 2006-10-31 18:20:42.000000000 +0100
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- int
- fegetround (void)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- unsigned int temp;
-
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/feholdexcpt.c ports/sysdeps/arm/eabi/feholdexcpt.c
---- ports.orig/sysdeps/arm/eabi/feholdexcpt.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/feholdexcpt.c 2006-10-31 18:20:42.000000000 +0100
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- int
- feholdexcept (fenv_t *envp)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- unsigned long int temp;
-
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fesetenv.c ports/sysdeps/arm/eabi/fesetenv.c
---- ports.orig/sysdeps/arm/eabi/fesetenv.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/fesetenv.c 2006-10-31 18:20:42.000000000 +0100
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- int
- __fesetenv (const fenv_t *envp)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- unsigned int temp;
-
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fesetround.c ports/sysdeps/arm/eabi/fesetround.c
---- ports.orig/sysdeps/arm/eabi/fesetround.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/fesetround.c 2006-10-31 18:20:42.000000000 +0100
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- int
- fesetround (int round)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- fpu_control_t temp;
-
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fraiseexcpt.c ports/sysdeps/arm/eabi/fraiseexcpt.c
---- ports.orig/sysdeps/arm/eabi/fraiseexcpt.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/fraiseexcpt.c 2006-10-31 18:20:42.000000000 +0100
-@@ -24,12 +24,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- int
- feraiseexcept (int excepts)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- int fpscr;
- const float fp_zero = 0.0, fp_one = 1.0, fp_max = FLT_MAX,
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/fsetexcptflg.c ports/sysdeps/arm/eabi/fsetexcptflg.c
---- ports.orig/sysdeps/arm/eabi/fsetexcptflg.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/fsetexcptflg.c 2006-10-31 18:20:42.000000000 +0100
-@@ -24,12 +24,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- int
- __fesetexceptflag (const fexcept_t *flagp, int excepts)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- fexcept_t temp;
-
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/ftestexcept.c ports/sysdeps/arm/eabi/ftestexcept.c
---- ports.orig/sysdeps/arm/eabi/ftestexcept.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/ftestexcept.c 2006-10-31 18:20:42.000000000 +0100
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- int
- fetestexcept (int excepts)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- fexcept_t temp;
-
-diff -xCVS -Nurd ports.orig/sysdeps/arm/eabi/setfpucw.c ports/sysdeps/arm/eabi/setfpucw.c
---- ports.orig/sysdeps/arm/eabi/setfpucw.c 2005-10-10 17:29:32.000000000 +0200
-+++ ports/sysdeps/arm/eabi/setfpucw.c 2006-10-31 18:20:42.000000000 +0100
-@@ -23,12 +23,12 @@
- #include <unistd.h>
- #include <ldsodefs.h>
- #include <dl-procinfo.h>
--#include <asm/procinfo.h>
-+#include <sysdep.h>
-
- void
- __setfpucw (fpu_control_t set)
- {
-- if (GLRO (dl_hwcap) & HWCAP_VFP)
-+ if (GLRO (dl_hwcap) & HWCAP_ARM_VFP)
- {
- fpu_control_t cw;
-
Reply to: