r1283 - in glibc-package/branches/glibc-2.4/debian: . patches
Author: schizo
Date: 2006-03-09 18:35:36 +0000 (Thu, 09 Mar 2006)
New Revision: 1283
Removed:
glibc-package/branches/glibc-2.4/debian/patches/glibc235-gcc4-elf.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
- Remove glibc235-gcc4-elf.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-03-09 18:01:47 UTC (rev 1282)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-03-09 18:35:36 UTC (rev 1283)
@@ -11,6 +11,7 @@
- Remove glibc-manual-memory.diff (merged upstream).
- Remove glibc-manual-string.diff (merged upstream).
- Remove divdi3-moddi3.diff (merged upstream).
+ - Remove glibc235-gcc4-elf.diff (merged upstream).
- debian/shlibver: Bump up to 2.4-1.
-- Clint Adams <schizo@debian.org> Mon, 6 Mar 2006 16:49:38 -0500
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc235-gcc4-elf.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/glibc235-gcc4-elf.diff 2006-03-09 18:01:47 UTC (rev 1282)
+++ glibc-package/branches/glibc-2.4/debian/patches/glibc235-gcc4-elf.diff 2006-03-09 18:35:36 UTC (rev 1283)
@@ -1,78 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Remove definition elf_machine_rel* to compile with gcc-4.0.
-# DP: Related bugs:
-# DP: Dpatch author: Clint Adams <schizo@debian.org>
-# DP: Patch author: Dan Kegel
-# DP: Upstream status: Debian-Specific
-# DP: Status Details:
-# DP: Date: 2006-01-29
-
-PATCHLEVEL=1
-
-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.
-http://kegel.com/crosstool/crosstool-0.35/patches/glibc-2.3.4/glibc-2.3.4-allow-gcc-4.0-elf.patch
-
---- elf/dynamic-link.h.old 2006-01-28 21:24:35.000000000 -0500
-+++ elf/dynamic-link.h 2006-01-28 21:24:58.000000000 -0500
-@@ -20,46 +20,6 @@
- #include <elf.h>
- #include <assert.h>
-
--#ifdef RESOLVE
--/* We pass reloc_addr as a pointer to void, as opposed to a pointer to
-- ElfW(Addr), because not all architectures can assume that the
-- relocated address is properly aligned, whereas the compiler is
-- entitled to assume that a pointer to a type is properly aligned for
-- the type. Even if we cast the pointer back to some other type with
-- less strict alignment requirements, the compiler might still
-- remember that the pointer was originally more aligned, thereby
-- optimizing away alignment tests or using word instructions for
-- copying memory, breaking the very code written to handle the
-- unaligned cases. */
--# if ! ELF_MACHINE_NO_REL
--auto inline void __attribute__((always_inline))
--elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
-- const ElfW(Sym) *sym, const struct r_found_version *version,
-- void *const reloc_addr);
--auto inline void __attribute__((always_inline))
--elf_machine_rel_relative (ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
-- void *const reloc_addr);
--# endif
--# if ! ELF_MACHINE_NO_RELA
--auto inline void __attribute__((always_inline))
--elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
-- const ElfW(Sym) *sym, const struct r_found_version *version,
-- void *const reloc_addr);
--auto inline void __attribute__((always_inline))
--elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc,
-- void *const reloc_addr);
--# endif
--# if ELF_MACHINE_NO_RELA || defined ELF_MACHINE_PLT_REL
--auto inline void __attribute__((always_inline))
--elf_machine_lazy_rel (struct link_map *map,
-- ElfW(Addr) l_addr, const ElfW(Rel) *reloc);
--# else
--auto inline void __attribute__((always_inline))
--elf_machine_lazy_rel (struct link_map *map,
-- ElfW(Addr) l_addr, const ElfW(Rela) *reloc);
--# endif
--#endif
--
- #include <dl-machine.h>
-
- #ifndef VERSYMIDX
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-03-09 18:01:47 UTC (rev 1282)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-03-09 18:35:36 UTC (rev 1283)
@@ -52,7 +52,6 @@
#linuxthreads-sizefix.diff -p1
#glibc232-tls-crashfix.diff -p1
glibc23-mips-lazy-eval.diff -p2
-#glibc235-gcc4-elf.diff -p0
glibc235-gcc4-wcstol_l.diff -p1
glibc235-gcc4-ppc-procfs.diff -p0
#glibc235-gcc4-arm-inline.diff -p1
Reply to: