r2680 - in glibc-package/branches/glibc-2.7/debian: . patches patches/alpha
Author: aurel32
Date: 2007-11-18 12:14:19 +0000 (Sun, 18 Nov 2007)
New Revision: 2680
Added:
glibc-package/branches/glibc-2.7/debian/patches/alpha/local-dl-procinfo.diff
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/patches/series
Log:
* patches/alpha/local-dl-procinfo.diff: new patch to add platform
capabilities support on alpha.
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-11-16 22:56:16 UTC (rev 2679)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-11-18 12:14:19 UTC (rev 2680)
@@ -115,6 +115,8 @@
ISO-8859-15.
* patches/alpha/submitted-fpu-round.diff: restore the old version of
ceil/floor/rint functions. Closes: #442568.
+ * patches/alpha/local-dl-procinfo.diff: new patch to add platform
+ capabilities support on alpha.
[ Petr Salinger]
* any/local-linuxthreads-unwind.diff: provide unwind-resume routine for
@@ -138,7 +140,7 @@
[ Samuel Thibault ]
* hurd-i386/submitted-ptr-mangle.diff: Define PTR_MANGLE for assembly.
- -- Aurelien Jarno <aurel32@debian.org> Fri, 16 Nov 2007 23:55:00 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 18 Nov 2007 13:12:34 +0100
glibc (2.6.1-6) unstable; urgency=low
Added: glibc-package/branches/glibc-2.7/debian/patches/alpha/local-dl-procinfo.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/alpha/local-dl-procinfo.diff (rev 0)
+++ glibc-package/branches/glibc-2.7/debian/patches/alpha/local-dl-procinfo.diff 2007-11-18 12:14:19 UTC (rev 2680)
@@ -0,0 +1,133 @@
+--- /dev/null
++++ sysdeps/alpha/dl-procinfo.h
+@@ -0,0 +1,63 @@
++/* Alpha version of processor capability information handling macros.
++ Copyright (C) 2007 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++ Contributed by Aurelien Jarno <aurelien@aurel32.net>, 2007.
++
++ 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 _DL_PROCINFO_H
++#define _DL_PROCINFO_H 1
++
++#include <ldsodefs.h>
++
++
++/* Mask to filter out platforms. */
++#define _DL_HWCAP_PLATFORM (-1ULL)
++
++#define _DL_PLATFORMS_COUNT 5
++
++static inline const char *
++__attribute__ ((unused))
++_dl_platform_string (int idx)
++{
++ return GLRO(dl_alpha_platforms)[idx];
++};
++
++static inline int
++__attribute__ ((unused, always_inline))
++_dl_string_platform (const char *str)
++{
++ for (int i = 0; i < _DL_PLATFORMS_COUNT; ++i)
++ if (strcmp (str, _dl_platform_string (i)) == 0)
++ return i;
++ return -1;
++};
++
++/* We cannot provide a general printing function. */
++#define _dl_procinfo(word) -1
++
++/* There are no hardware capabilities defined. */
++#define _dl_hwcap_string(idx) ""
++
++/* By default there is no important hardware capability. */
++#define HWCAP_IMPORTANT (0)
++
++/* We don't have any hardware capabilities. */
++#define _DL_HWCAP_COUNT 0
++
++#define _dl_string_hwcap(str) (-1)
++
++#endif /* dl-procinfo.h */
+--- /dev/null
++++ sysdeps/alpha/dl-procinfo.c
+@@ -0,0 +1,64 @@
++/* Data for Alpha version of processor capability information.
++ Copyright (C) 2007 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++ Contributed by Aurelien Jarno <aurelien@aurel32.net>, 2007.
++
++ 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. */
++
++/* This information must be kept in sync with the _DL_PLATFORM_COUNT
++ definitions in procinfo.h.
++
++ If anything should be added here check whether the size of each string
++ is still ok with the given array size.
++
++ All the #ifdefs in the definitions are quite irritating but
++ necessary if we want to avoid duplicating the information. There
++ are three different modes:
++
++ - PROCINFO_DECL is defined. This means we are only interested in
++ declarations.
++
++ - PROCINFO_DECL is not defined:
++
++ + if SHARED is defined the file is included in an array
++ initializer. The .element = { ... } syntax is needed.
++
++ + if SHARED is not defined a normal array initialization is
++ needed.
++ */
++
++#ifndef PROCINFO_CLASS
++#define PROCINFO_CLASS
++#endif
++
++#if !defined PROCINFO_DECL && defined SHARED
++ ._dl_alpha_platforms
++#else
++PROCINFO_CLASS const char _dl_alpha_platforms[5][5]
++#endif
++#ifndef PROCINFO_DECL
++= {
++ "ev4", "ev5", "ev56", "ev6", "ev67"
++ }
++#endif
++#if !defined SHARED || defined PROCINFO_DECL
++;
++#else
++,
++#endif
++
++#undef PROCINFO_DECL
++#undef PROCINFO_CLASS
Modified: glibc-package/branches/glibc-2.7/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/series 2007-11-16 22:56:16 UTC (rev 2679)
+++ glibc-package/branches/glibc-2.7/debian/patches/series 2007-11-18 12:14:19 UTC (rev 2680)
@@ -50,6 +50,7 @@
localedata/cvs-locale-ug_CN.diff
alpha/local-gcc4.1.diff -p0
+alpha/local-dl-procinfo.diff -p0
alpha/submitted-fpu-round.diff -p0
alpha/submitted-xstat.diff -p0
alpha/submitted-PTR_MANGLE.diff
Reply to: