r1334 - in glibc-package/trunk/debian/patches: . sparc
Author: aurel32
Date: 2006-04-06 22:11:23 +0000 (Thu, 06 Apr 2006)
New Revision: 1334
Added:
glibc-package/trunk/debian/patches/sparc/cvs-gcc4-inline.diff
glibc-package/trunk/debian/patches/sparc/local-sparcv8-target.diff
glibc-package/trunk/debian/patches/sparc/submitted-socket-weakalias.diff
Removed:
glibc-package/trunk/debian/patches/glibc235-gcc4-sparc-inline.diff
glibc-package/trunk/debian/patches/sparc-socket-weakalias.diff
glibc-package/trunk/debian/patches/sparcv8-target.diff
Modified:
glibc-package/trunk/debian/patches/series
Log:
Move a few patches to sparc/
sort patches in series for locale and localedata
Deleted: glibc-package/trunk/debian/patches/glibc235-gcc4-sparc-inline.diff
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-gcc4-sparc-inline.diff 2006-04-06 21:31:03 UTC (rev 1333)
+++ glibc-package/trunk/debian/patches/glibc235-gcc4-sparc-inline.diff 2006-04-06 22:11:23 UTC (rev 1334)
@@ -1,181 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Make glibc-2.3.5 compile with gcc-4.0 on arm for inline
-# functions of dl-machine.h.
-# DP: Related bugs:
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: Jakub Jelinek <jakub@redhat.com>
-# GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: In CVS / Debian-Specific
-# DP: Status Details:
-# DP: Date: 2005-07-17, updated 2005-07-20
-
-PATCHLEVEL=0
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
-2005-07-20 GOTO Masanori <gotom@debian.org>
-
- * sysdeps/sparc/sparc64/dl-machine.h: Change static/auto depended on
- the definition of RESOLVE.
-
-2005-07-17 GOTO Masanori <gotom@debian.org>
-
- * sysdeps/sparc/sparc32/dl-machine.h: Use auto inline.
- * sysdeps/sparc/sparc64/dl-machine.h: Likewise.
-
---- sysdeps/sparc/sparc64/dl-machine.h.org 2004-03-05 19:27:55.000000000 +0900
-+++ sysdeps/sparc/sparc64/dl-machine.h 2005-07-20 11:21:06.000000000 +0900
-@@ -34,7 +34,18 @@
- #define ELF64_R_TYPE_DATA(info) ((info) >> 8)
-
- /* Return nonzero iff ELF header is compatible with the running host. */
--static inline int
-+#if __GNUC__ >= 4
-+# ifdef RESOLVE
-+ auto inline int
-+# else
-+ static inline int
-+# endif
-+#else
-+ static inline int
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_matches_host (const Elf64_Ehdr *ehdr)
- {
- return ehdr->e_machine == EM_SPARCV9;
-@@ -55,7 +66,18 @@
- /* Return the link-time address of _DYNAMIC. Conveniently, this is the
- first element of the GOT. This must be inlined in a function which
- uses global data. */
--static inline Elf64_Addr
-+#if __GNUC__ >= 4
-+# ifdef RESOLVE
-+ auto inline Elf64_Addr
-+# else
-+ static inline Elf64_Addr
-+# endif
-+#else
-+ static inline Elf64_Addr
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_dynamic (void)
- {
- register Elf64_Addr *elf_pic_register __asm__("%l7");
-@@ -66,7 +88,18 @@
- }
-
- /* Return the run-time load address of the shared object. */
--static inline Elf64_Addr
-+#if __GNUC__ >= 4
-+# ifdef RESOLVE
-+ auto inline Elf64_Addr
-+# else
-+ static inline Elf64_Addr
-+# endif
-+#else
-+ static inline Elf64_Addr
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_load_address (void)
- {
- register Elf32_Addr *pc __asm ("%o7");
-@@ -88,7 +121,18 @@
-
- /* We have 4 cases to handle. And we code different code sequences
- for each one. I love V9 code models... */
--static inline void
-+#if __GNUC__ >= 4
-+# ifdef RESOLVE
-+ auto inline void
-+# else
-+ static inline void
-+# endif
-+#else
-+ static inline void
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- sparc64_fixup_plt (struct link_map *map, const Elf64_Rela *reloc,
- Elf64_Addr *reloc_addr, Elf64_Addr value,
- Elf64_Addr high, int t)
-@@ -212,7 +256,18 @@
- }
- }
-
--static inline Elf64_Addr
-+#if __GNUC__ >= 4
-+# ifdef RESOLVE
-+ auto inline Elf64_Addr
-+# else
-+ static inline Elf64_Addr
-+# endif
-+#else
-+ static inline Elf64_Addr
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_fixup_plt (struct link_map *map, lookup_t t,
- const Elf64_Rela *reloc,
- Elf64_Addr *reloc_addr, Elf64_Addr value)
-@@ -223,7 +278,18 @@
- }
-
- /* Return the final value of a plt relocation. */
--static inline Elf64_Addr
-+#if __GNUC__ >= 4
-+# ifdef RESOLVE
-+ auto inline Elf64_Addr
-+# else
-+ static inline Elf64_Addr
-+# endif
-+#else
-+ static inline Elf64_Addr
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_plt_value (struct link_map *map, const Elf64_Rela *reloc,
- Elf64_Addr value)
- {
-@@ -476,7 +563,18 @@
- /* Set up the loaded object described by L so its unrelocated PLT
- entries will jump to the on-demand fixup code in dl-runtime.c. */
-
--static inline int
-+#if __GNUC__ >= 4
-+# ifdef RESOLVE
-+ auto inline int
-+# else
-+ static inline int
-+# endif
-+#else
-+ static inline int
-+#endif
-+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
-+ __attribute ((always_inline))
-+#endif
- elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
- {
- if (l->l_info[DT_JMPREL] && lazy)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-04-06 21:31:03 UTC (rev 1333)
+++ glibc-package/trunk/debian/patches/series 2006-04-06 22:11:23 UTC (rev 1334)
@@ -1,9 +1,56 @@
+locale/LC_COLLATE-keywords-ordering.diff
+locale/LC_IDENTIFICATION-optional-fields.diff
+#locale/check-unknown-symbols.diff # locales have to be fixed first
+locale/complex-collate.diff
+locale/cvs-iso4217.diff -p0
+locale/cvs-iso639.diff -p0
+locale/fix-C-first_weekday.diff -p0
+locale/fix-LC_COLLATE-rules.diff
+locale/fix-exhausted-memory.diff
+locale/iso4217-RON.diff -p0
+locale/locale-print-LANGUAGE.diff
+locale/preprocessor-collate.diff
+
localedata/cvs-localedata.diff -p0
-cvs-tzdata.diff -p0
+#localedata/discard-dz_BT.diff # not needed when complex-collate is applied
+localedata/dz_BT-collation.diff
+localedata/first_weekday.diff -p0
+localedata/fix-lang.diff
+localedata/fix-unknown-symbols.diff
+localedata/fo_FO-date_fmt.diff
+localedata/locale-csb_PL.diff
localedata/locale-de_CH.diff -p1
-locale-ru_RU.diff -p1
+localedata/locale-en_DK.diff
+localedata/locale-en_NZ.diff
localedata/locale-eo_EO.diff -p1
+localedata/locale-eu_FR.diff -p0
+localedata/locale-hy_AM.diff
+localedata/locale-ia.diff
+localedata/locale-ku_TR.diff -p0
localedata/locale-no_NO.diff -p0
+localedata/locale-nr_ZA.diff
+localedata/locale-pl_PL.diff -p0
+localedata/locale-ro_RO.diff -p0
+localedata/locale-sa_IN.diff -p0
+localedata/locale-te_IN.diff
+localedata/locale-wo_SN.diff -p0
+localedata/locales-fr.diff
+localedata/locales_CH.diff
+localedata/locales_GB.diff -p0
+localedata/new-catalan-locales.diff
+localedata/sort-UTF8-first.diff -p0
+localedata/supported.diff
+localedata/tailor-iso14651_t1.diff -p0
+localedata/tl_PH-yesexpr.diff
+localedata/update-ZA.diff
+
+sparc/cvs-datastart.diff -p0
+sparc/cvs-gcc4-inline.diff -p0
+sparc/local-sparcv8-target.diff -p0
+sparc/submitted-socket-weakalias.diff -p0
+
+cvs-tzdata.diff -p0
+locale-ru_RU.diff -p1
glibc-i686-timing.diff -p1
glibc-sparc-timing.diff -p1
makeconfig.diff -p0
@@ -29,7 +76,6 @@
libgcc-compat-other.diff -p1
hurd-enable-ldconfig.diff -p1
#30_glibc232-base.diff -p0 # g: suspended
-sparcv8-target.diff -p0
50_glibc232-arm-dwarf2-buildfix.diff -p0
50_glibc232-m68k-dwarf2-buildfix.diff -p0
#arm-output-format.diff -p0 # g: suspended
@@ -44,7 +90,6 @@
#glibc23-errno-hack.diff -p1 # g: untilsarge
90_glibc233_tcsetaddr.diff -p1
localedef-fix-trampoline.diff -p1
-localedata/locale-eu_FR.diff -p0
glibc232-m68k-reloc.diff -p1
#glibc232-globfree-clear.diff -p1 # g: suspended
hppa-drop-utimes.diff -p1
@@ -63,13 +108,8 @@
hurd-ioctl-pfinet.diff -p0
glibc235-hppa-lt.diff -p1
glibc235-hppa-sysdeps.diff -p1
-glibc235-gcc4-sparc-inline.diff -p0
glibc235-gcc4-alpha-profile.diff -p0
glibc235-gcc34-m68k-seccomment.diff -p0
-locale/cvs-iso4217.diff -p0
-locale/cvs-iso639.diff -p0
-locale/iso4217-RON.diff -p0
-localedata/locale-ro_RO.diff -p0
glibc235-gcc4-hppa-profile.diff -p0
glibc235-dl-execstack.diff -p0
amd64-i386-biarch.diff -p1
@@ -78,51 +118,14 @@
hppa-fenv-align.diff -p1
glibc235-hppa-fpu.diff -p1
eh-frame-terminator.diff -p1
-sparc-socket-weakalias.diff -p0
powerpc-socket-weakalias.diff -p0
arm-socket-weakalias.diff -p0
divdi3-moddi3.diff -p0
powerpc-executable-got.diff -p0
ctan.diff -p0
-glibc-235-sparc-datastart.diff -p0
glibc235-dash.diff -p0
glibc235-nis-netgrp.diff
-localedata/locale-ku_TR.diff -p0
-#localedata/discard-dz_BT.diff # not needed when complex-collate is applied
-locale/complex-collate.diff
-locale/fix-exhausted-memory.diff
-#locale/check-unknown-symbols.diff # locales have to be fixed first
-locale/fix-LC_COLLATE-rules.diff
forward-backward-collation.diff
-locale/preprocessor-collate.diff
-locale/LC_IDENTIFICATION-optional-fields.diff
-locale/LC_COLLATE-keywords-ordering.diff
-locale/locale-print-LANGUAGE.diff
-locale/fix-C-first_weekday.diff -p0
-localedata/tl_PH-yesexpr.diff
-localedata/fo_FO-date_fmt.diff
-localedata/locales_CH.diff
-localedata/locales-fr.diff
-localedata/locales_GB.diff -p0
-localedata/supported.diff
-localedata/locale-sa_IN.diff -p0
-localedata/locale-en_DK.diff
-localedata/locale-hy_AM.diff
-localedata/locale-pl_PL.diff -p0
-localedata/locale-wo_SN.diff -p0
-localedata/new-catalan-locales.diff
-localedata/locale-csb_PL.diff
-localedata/locale-te_IN.diff
-localedata/locale-nr_ZA.diff
-localedata/locale-en_NZ.diff
-localedata/dz_BT-collation.diff
-localedata/update-ZA.diff
-localedata/locale-ia.diff
-localedata/tailor-iso14651_t1.diff -p0
-localedata/fix-lang.diff
-localedata/fix-unknown-symbols.diff
-localedata/first_weekday.diff -p0
-localedata/sort-UTF8-first.diff -p0
hppa-pie-relocs.diff -p1
hurd-getresuid-dyslexia.diff -p0
hppa-no-ldbl-128.diff -p1
@@ -141,3 +144,4 @@
getcwd_c.diff -p1
siginfo_h.diff -p1
hurd-machrules-make.diff -p1
+
Copied: glibc-package/trunk/debian/patches/sparc/cvs-gcc4-inline.diff (from rev 1331, glibc-package/trunk/debian/patches/glibc235-gcc4-sparc-inline.diff)
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-gcc4-sparc-inline.diff 2006-04-06 20:10:36 UTC (rev 1331)
+++ glibc-package/trunk/debian/patches/sparc/cvs-gcc4-inline.diff 2006-04-06 22:11:23 UTC (rev 1334)
@@ -0,0 +1,162 @@
+# DP: Description: Make glibc-2.3.5 compile with gcc-4.0 on arm for inline
+# functions of dl-machine.h.
+# DP: Related bugs:
+# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
+# DP: Patch author: Jakub Jelinek <jakub@redhat.com>
+# GOTO Masanori <gotom@debian.org>
+# DP: Upstream status: In CVS / Debian-Specific
+# DP: Status Details:
+# DP: Date: 2005-07-17, updated 2005-07-20
+
+2005-07-20 GOTO Masanori <gotom@debian.org>
+
+ * sysdeps/sparc/sparc64/dl-machine.h: Change static/auto depended on
+ the definition of RESOLVE.
+
+2005-07-17 GOTO Masanori <gotom@debian.org>
+
+ * sysdeps/sparc/sparc32/dl-machine.h: Use auto inline.
+ * sysdeps/sparc/sparc64/dl-machine.h: Likewise.
+
+--- sysdeps/sparc/sparc64/dl-machine.h.org 2004-03-05 19:27:55.000000000 +0900
++++ sysdeps/sparc/sparc64/dl-machine.h 2005-07-20 11:21:06.000000000 +0900
+@@ -34,7 +34,18 @@
+ #define ELF64_R_TYPE_DATA(info) ((info) >> 8)
+
+ /* Return nonzero iff ELF header is compatible with the running host. */
+-static inline int
++#if __GNUC__ >= 4
++# ifdef RESOLVE
++ auto inline int
++# else
++ static inline int
++# endif
++#else
++ static inline int
++#endif
++#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
++ __attribute ((always_inline))
++#endif
+ elf_machine_matches_host (const Elf64_Ehdr *ehdr)
+ {
+ return ehdr->e_machine == EM_SPARCV9;
+@@ -55,7 +66,18 @@
+ /* Return the link-time address of _DYNAMIC. Conveniently, this is the
+ first element of the GOT. This must be inlined in a function which
+ uses global data. */
+-static inline Elf64_Addr
++#if __GNUC__ >= 4
++# ifdef RESOLVE
++ auto inline Elf64_Addr
++# else
++ static inline Elf64_Addr
++# endif
++#else
++ static inline Elf64_Addr
++#endif
++#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
++ __attribute ((always_inline))
++#endif
+ elf_machine_dynamic (void)
+ {
+ register Elf64_Addr *elf_pic_register __asm__("%l7");
+@@ -66,7 +88,18 @@
+ }
+
+ /* Return the run-time load address of the shared object. */
+-static inline Elf64_Addr
++#if __GNUC__ >= 4
++# ifdef RESOLVE
++ auto inline Elf64_Addr
++# else
++ static inline Elf64_Addr
++# endif
++#else
++ static inline Elf64_Addr
++#endif
++#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
++ __attribute ((always_inline))
++#endif
+ elf_machine_load_address (void)
+ {
+ register Elf32_Addr *pc __asm ("%o7");
+@@ -88,7 +121,18 @@
+
+ /* We have 4 cases to handle. And we code different code sequences
+ for each one. I love V9 code models... */
+-static inline void
++#if __GNUC__ >= 4
++# ifdef RESOLVE
++ auto inline void
++# else
++ static inline void
++# endif
++#else
++ static inline void
++#endif
++#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
++ __attribute ((always_inline))
++#endif
+ sparc64_fixup_plt (struct link_map *map, const Elf64_Rela *reloc,
+ Elf64_Addr *reloc_addr, Elf64_Addr value,
+ Elf64_Addr high, int t)
+@@ -212,7 +256,18 @@
+ }
+ }
+
+-static inline Elf64_Addr
++#if __GNUC__ >= 4
++# ifdef RESOLVE
++ auto inline Elf64_Addr
++# else
++ static inline Elf64_Addr
++# endif
++#else
++ static inline Elf64_Addr
++#endif
++#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
++ __attribute ((always_inline))
++#endif
+ elf_machine_fixup_plt (struct link_map *map, lookup_t t,
+ const Elf64_Rela *reloc,
+ Elf64_Addr *reloc_addr, Elf64_Addr value)
+@@ -223,7 +278,18 @@
+ }
+
+ /* Return the final value of a plt relocation. */
+-static inline Elf64_Addr
++#if __GNUC__ >= 4
++# ifdef RESOLVE
++ auto inline Elf64_Addr
++# else
++ static inline Elf64_Addr
++# endif
++#else
++ static inline Elf64_Addr
++#endif
++#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
++ __attribute ((always_inline))
++#endif
+ elf_machine_plt_value (struct link_map *map, const Elf64_Rela *reloc,
+ Elf64_Addr value)
+ {
+@@ -476,7 +563,18 @@
+ /* Set up the loaded object described by L so its unrelocated PLT
+ entries will jump to the on-demand fixup code in dl-runtime.c. */
+
+-static inline int
++#if __GNUC__ >= 4
++# ifdef RESOLVE
++ auto inline int
++# else
++ static inline int
++# endif
++#else
++ static inline int
++#endif
++#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)
++ __attribute ((always_inline))
++#endif
+ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
+ {
+ if (l->l_info[DT_JMPREL] && lazy)
Copied: glibc-package/trunk/debian/patches/sparc/local-sparcv8-target.diff (from rev 1331, glibc-package/trunk/debian/patches/sparcv8-target.diff)
===================================================================
--- glibc-package/trunk/debian/patches/sparcv8-target.diff 2006-04-06 20:10:36 UTC (rev 1331)
+++ glibc-package/trunk/debian/patches/sparc/local-sparcv8-target.diff 2006-04-06 22:11:23 UTC (rev 1334)
@@ -0,0 +1,34 @@
+# DP: Description: Optimizes the build for sparcv8
+# DP: Author: Ben Collins
+# DP: Upstream status: Debian-Specific
+# DP: Status Details:
+# DP: Date: June 17, 2003
+
+--- configure~ 2003-06-17 09:24:52.000000000 -0400
++++ configure 2003-06-17 09:25:19.000000000 -0400
+@@ -1796,6 +1796,11 @@
+ machine="powerpc"
+ fi
+
++# Force v8
++if test "$machine" = sparc; then
++ machine="sparcv8"
++fi
++
+ # Braindead PowerPC box with absolutely no FPU.
+ case "$machine-$host_os" in
+ powerpc*-*soft)
+--- configure.in~ 2003-06-17 09:24:55.000000000 -0400
++++ configure.in 2003-06-17 09:25:29.000000000 -0400
+@@ -337,6 +337,11 @@
+ machine="powerpc"
+ fi
+
++# Force v8
++if test "$machine" = sparc; then
++ machine="sparcv8"
++fi
++
+ # Braindead PowerPC box with absolutely no FPU.
+ case "$machine-$host_os" in
+ powerpc*-*soft)
Copied: glibc-package/trunk/debian/patches/sparc/submitted-socket-weakalias.diff (from rev 1331, glibc-package/trunk/debian/patches/sparc-socket-weakalias.diff)
===================================================================
--- glibc-package/trunk/debian/patches/sparc-socket-weakalias.diff 2006-04-06 20:10:36 UTC (rev 1331)
+++ glibc-package/trunk/debian/patches/sparc/submitted-socket-weakalias.diff 2006-04-06 22:11:23 UTC (rev 1334)
@@ -0,0 +1,52 @@
+# DP: Description: Fix __bind redefinition problem
+# DP: Related bugs:
+# DP: Dpatch author: Clint Adams
+# DP: Patch author: Clint Adams
+# DP: Upstream status: Not Submitted
+# DP: Status Details:
+# DP: Date: 2005-12-10
+
+--- sysdeps/unix/sysv/linux/sparc/sparc32/socket.S.old 2003-08-31 13:23:11.000000000 -0400
++++ sysdeps/unix/sysv/linux/sparc/sparc32/socket.S 2005-12-10 12:46:23.313930095 -0500
+@@ -40,7 +40,11 @@
+ The .S files for the other calls just #define socket and #include this. */
+
+ #ifndef __socket
+-#define __socket P(__,socket)
++# ifndef NO_WEAK_ALIAS
++# define __socket P(__,socket)
++# else
++# define __socket socket
++# endif
+ #endif
+
+ .globl __socket
+@@ -105,4 +109,6 @@
+
+ END (__socket)
+
++#ifndef NO_WEAK_ALIAS
+ weak_alias (__socket, socket)
++#endif
+--- sysdeps/unix/sysv/linux/sparc/sparc64/socket.S.old 2003-08-31 13:23:11.000000000 -0400
++++ sysdeps/unix/sysv/linux/sparc/sparc64/socket.S 2005-12-10 12:46:23.313930095 -0500
+@@ -40,7 +40,11 @@
+ The .S files for the other calls just #define socket and #include this. */
+
+ #ifndef __socket
+-#define __socket P(__,socket)
++# ifndef NO_WEAK_ALIAS
++# define __socket P(__,socket)
++# else
++# define __socket socket
++# endif
+ #endif
+
+ .globl __socket
+@@ -105,4 +109,6 @@
+
+ END (__socket)
+
++#ifndef NO_WEAK_ALIAS
+ weak_alias (__socket, socket)
++#endif
Deleted: glibc-package/trunk/debian/patches/sparc-socket-weakalias.diff
===================================================================
--- glibc-package/trunk/debian/patches/sparc-socket-weakalias.diff 2006-04-06 21:31:03 UTC (rev 1333)
+++ glibc-package/trunk/debian/patches/sparc-socket-weakalias.diff 2006-04-06 22:11:23 UTC (rev 1334)
@@ -1,72 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix __bind redefinition problem
-# DP: Related bugs:
-# DP: Dpatch author: Clint Adams
-# DP: Patch author: Clint Adams
-# DP: Upstream status: Not Submitted
-# DP: Status Details:
-# DP: Date: 2005-12-10
-
-PATCHLEVEL=0
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
-
---- sysdeps/unix/sysv/linux/sparc/sparc32/socket.S.old 2003-08-31 13:23:11.000000000 -0400
-+++ sysdeps/unix/sysv/linux/sparc/sparc32/socket.S 2005-12-10 12:46:23.313930095 -0500
-@@ -40,7 +40,11 @@
- The .S files for the other calls just #define socket and #include this. */
-
- #ifndef __socket
--#define __socket P(__,socket)
-+# ifndef NO_WEAK_ALIAS
-+# define __socket P(__,socket)
-+# else
-+# define __socket socket
-+# endif
- #endif
-
- .globl __socket
-@@ -105,4 +109,6 @@
-
- END (__socket)
-
-+#ifndef NO_WEAK_ALIAS
- weak_alias (__socket, socket)
-+#endif
---- sysdeps/unix/sysv/linux/sparc/sparc64/socket.S.old 2003-08-31 13:23:11.000000000 -0400
-+++ sysdeps/unix/sysv/linux/sparc/sparc64/socket.S 2005-12-10 12:46:23.313930095 -0500
-@@ -40,7 +40,11 @@
- The .S files for the other calls just #define socket and #include this. */
-
- #ifndef __socket
--#define __socket P(__,socket)
-+# ifndef NO_WEAK_ALIAS
-+# define __socket P(__,socket)
-+# else
-+# define __socket socket
-+# endif
- #endif
-
- .globl __socket
-@@ -105,4 +109,6 @@
-
- END (__socket)
-
-+#ifndef NO_WEAK_ALIAS
- weak_alias (__socket, socket)
-+#endif
Deleted: glibc-package/trunk/debian/patches/sparcv8-target.diff
===================================================================
--- glibc-package/trunk/debian/patches/sparcv8-target.diff 2006-04-06 21:31:03 UTC (rev 1333)
+++ glibc-package/trunk/debian/patches/sparcv8-target.diff 2006-04-06 22:11:23 UTC (rev 1334)
@@ -1,49 +0,0 @@
-#! /bin/sh -e
-
-# DP: Description: Optimizes the build for sparcv8
-# DP: Author: Ben Collins
-# DP: Upstream status: Debian-Specific
-# DP: Status Details:
-# DP: Date: June 17, 2003
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p0 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p0 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
---- configure~ 2003-06-17 09:24:52.000000000 -0400
-+++ configure 2003-06-17 09:25:19.000000000 -0400
-@@ -1796,6 +1796,11 @@
- machine="powerpc"
- fi
-
-+# Force v8
-+if test "$machine" = sparc; then
-+ machine="sparcv8"
-+fi
-+
- # Braindead PowerPC box with absolutely no FPU.
- case "$machine-$host_os" in
- powerpc*-*soft)
---- configure.in~ 2003-06-17 09:24:55.000000000 -0400
-+++ configure.in 2003-06-17 09:25:29.000000000 -0400
-@@ -337,6 +337,11 @@
- machine="powerpc"
- fi
-
-+# Force v8
-+if test "$machine" = sparc; then
-+ machine="sparcv8"
-+fi
-+
- # Braindead PowerPC box with absolutely no FPU.
- case "$machine-$host_os" in
- powerpc*-*soft)
Reply to: