r3070 - in glibc-package/branches/glibc-2.8/debian/patches: . alpha
Author: aurel32
Date: 2008-08-10 06:28:46 +0000 (Sun, 10 Aug 2008)
New Revision: 3070
Added:
glibc-package/branches/glibc-2.8/debian/patches/alpha/submitted-dl-procinfo.diff
Removed:
glibc-package/branches/glibc-2.8/debian/patches/alpha/local-dl-procinfo.diff
Modified:
glibc-package/branches/glibc-2.8/debian/patches/series
Log:
alpha/dl-procinfo.diff has been submitted
Deleted: glibc-package/branches/glibc-2.8/debian/patches/alpha/local-dl-procinfo.diff
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/alpha/local-dl-procinfo.diff 2008-08-10 03:51:23 UTC (rev 3069)
+++ glibc-package/branches/glibc-2.8/debian/patches/alpha/local-dl-procinfo.diff 2008-08-10 06:28:46 UTC (rev 3070)
@@ -1,165 +0,0 @@
----
- sysdeps/alpha/dl-machine.h | 12 +++++++
- sysdeps/alpha/dl-procinfo.c | 64 +++++++++++++++++++++++++++++++++++++++++
- sysdeps/alpha/dl-procinfo.h | 68 ++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 144 insertions(+)
-
---- /dev/null
-+++ b/sysdeps/alpha/dl-procinfo.h
-@@ -0,0 +1,68 @@
-+/* 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)
-+{
-+ int i;
-+
-+ if (str != NULL)
-+ for (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
-+++ b/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
---- a/sysdeps/alpha/dl-machine.h
-+++ b/sysdeps/alpha/dl-machine.h
-@@ -249,6 +249,18 @@
- /* The alpha never uses Elf64_Rel relocations. */
- #define ELF_MACHINE_NO_REL 1
-
-+/* We define an initialization functions. This is called very early in
-+ * _dl_sysdep_start. */
-+#define DL_PLATFORM_INIT dl_platform_init ()
-+
-+static inline void __attribute__ ((unused))
-+dl_platform_init (void)
-+{
-+ if (GLRO(dl_platform) != NULL && *GLRO(dl_platform) == '\0')
-+ /* Avoid an empty string which would disturb us. */
-+ GLRO(dl_platform) = NULL;
-+}
-+
- /* Fix up the instructions of a PLT entry to invoke the function
- rather than the dynamic linker. */
- static inline Elf64_Addr
Copied: glibc-package/branches/glibc-2.8/debian/patches/alpha/submitted-dl-procinfo.diff (from rev 3060, glibc-package/branches/glibc-2.8/debian/patches/alpha/local-dl-procinfo.diff)
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/alpha/submitted-dl-procinfo.diff (rev 0)
+++ glibc-package/branches/glibc-2.8/debian/patches/alpha/submitted-dl-procinfo.diff 2008-08-10 06:28:46 UTC (rev 3070)
@@ -0,0 +1,165 @@
+---
+ sysdeps/alpha/dl-machine.h | 12 +++++++
+ sysdeps/alpha/dl-procinfo.c | 64 +++++++++++++++++++++++++++++++++++++++++
+ sysdeps/alpha/dl-procinfo.h | 68 ++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 144 insertions(+)
+
+--- /dev/null
++++ b/sysdeps/alpha/dl-procinfo.h
+@@ -0,0 +1,68 @@
++/* 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)
++{
++ int i;
++
++ if (str != NULL)
++ for (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
++++ b/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
+--- a/sysdeps/alpha/dl-machine.h
++++ b/sysdeps/alpha/dl-machine.h
+@@ -249,6 +249,18 @@
+ /* The alpha never uses Elf64_Rel relocations. */
+ #define ELF_MACHINE_NO_REL 1
+
++/* We define an initialization functions. This is called very early in
++ * _dl_sysdep_start. */
++#define DL_PLATFORM_INIT dl_platform_init ()
++
++static inline void __attribute__ ((unused))
++dl_platform_init (void)
++{
++ if (GLRO(dl_platform) != NULL && *GLRO(dl_platform) == '\0')
++ /* Avoid an empty string which would disturb us. */
++ GLRO(dl_platform) = NULL;
++}
++
+ /* Fix up the instructions of a PLT entry to invoke the function
+ rather than the dynamic linker. */
+ static inline Elf64_Addr
Property changes on: glibc-package/branches/glibc-2.8/debian/patches/alpha/submitted-dl-procinfo.diff
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: glibc-package/branches/glibc-2.8/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-10 03:51:23 UTC (rev 3069)
+++ glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-10 06:28:46 UTC (rev 3070)
@@ -37,7 +37,7 @@
localedata/locale-ks_IN.diff
alpha/local-gcc4.1.diff
-alpha/local-dl-procinfo.diff
+alpha/submitted-dl-procinfo.diff
alpha/submitted-fdatasync.diff
alpha/submitted-fpu-round.diff
alpha/submitted-PTR_MANGLE.diff
Reply to: