r892 - in glibc-package/branches/glibc-2.3.4/debian: . patches
Author: gotom
Date: 2005-04-16 14:18:59 +0000 (Sat, 16 Apr 2005)
New Revision: 892
Modified:
glibc-package/branches/glibc-2.3.4/debian/changelog
glibc-package/branches/glibc-2.3.4/debian/patches/glibc23-mips-lazy-eval.dpatch
Log:
- debian/patches/glibc23-mips-lazy-eval.dpatch: Added, drop dl-machine.h
because the recent upstream should not need such change.
Modified: glibc-package/branches/glibc-2.3.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/changelog 2005-04-16 12:40:05 UTC (rev 891)
+++ glibc-package/branches/glibc-2.3.4/debian/changelog 2005-04-16 14:18:59 UTC (rev 892)
@@ -12,7 +12,8 @@
* Merge with 2.3.2.ds1-21, added:
- debian/patches/linuxthreads-sizefix.dpatch: Added.
- debian/po/fi.po: Added.
- - debian/patches/glibc23-mips-lazy-eval.dpatch: Added.
+ - debian/patches/glibc23-mips-lazy-eval.dpatch: Added, drop dl-machine.h
+ because the recent upstream should not need such change.
- debian/patches/glibc232-tls-crashfix.dpatch: Added, remove some parts
that are applied in the recent version.
Modified: glibc-package/branches/glibc-2.3.4/debian/patches/glibc23-mips-lazy-eval.dpatch
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/patches/glibc23-mips-lazy-eval.dpatch 2005-04-16 12:40:05 UTC (rev 891)
+++ glibc-package/branches/glibc-2.3.4/debian/patches/glibc23-mips-lazy-eval.dpatch 2005-04-16 14:18:59 UTC (rev 892)
@@ -7,7 +7,7 @@
# DP: Patch author: Thiemo Seufer <ths@debian.org>
# DP: Upstream status: Debian-Specific
# DP: Status Details: The correct fix will be done to modify toolchains in etch.
-# DP: Date: 2005-04-11
+# DP: Date: 2005-04-11, 2005-04-16 updated by gotom
PATCHLEVEL=2
@@ -25,6 +25,15 @@
exit 0
# append the patch here and adjust the -p? flag in the patch calls.
+2005-04-16 GOTO Masanori <gotom@debian.org>
+
+ * sysdeps/mips/dl-machine.h: Drop due to _dl_lookup_versioned_symbol
+ and _dl_lookup_symbol are changed into _dl_lookup_symbol_x.
+
+2005-04-11 Thiemo Seufer <ths@debian.org>
+
+ * first version.
+
diff -upr build-tree.orig/glibc-2.3.2/elf/do-lookup.h build-tree/glibc-2.3.2/elf/do-lookup.h
--- build-tree.orig/glibc-2.3.2/elf/do-lookup.h 2005-02-28 23:42:31.000000000 +0100
+++ build-tree/glibc-2.3.2/elf/do-lookup.h 2005-04-11 18:19:20.000000000 +0200
@@ -42,65 +51,3 @@
/* Global definition. Just what we need. */
result->s = sym;
result->m = map;
-diff -upr build-tree.orig/glibc-2.3.2/sysdeps/mips/dl-machine.h build-tree/glibc-2.3.2/sysdeps/mips/dl-machine.h
---- build-tree.orig/glibc-2.3.2/sysdeps/mips/dl-machine.h 2005-02-28 23:42:36.000000000 +0100
-+++ build-tree/glibc-2.3.2/sysdeps/mips/dl-machine.h 2005-04-10 22:39:15.000000000 +0200
-@@ -347,5 +347,6 @@ __dl_runtime_resolve (ElfW(Word) sym_ind
- const ElfW(Word) gotsym \
- = (const ElfW(Word)) l->l_info[DT_MIPS (GOTSYM)]->d_un.d_val; \
- const ElfW(Sym) *sym = &symtab[sym_index]; \
-+ lookup_t result; \
- ElfW(Addr) value; \
- \
-@@ -363,30 +364,37 @@ __dl_runtime_resolve (ElfW(Word) sym_ind
- \
- if (version->hash != 0) \
- { \
-- value = _dl_lookup_versioned_symbol(strtab + sym->st_name, l, \
-- &sym, l->l_scope, version,\
-- ELF_RTYPE_CLASS_PLT, 0); \
-+ result = INTUSE(_dl_lookup_versioned_symbol) (strtab \
-+ + sym->st_name, \
-+ l, &sym, \
-+ l->l_scope, \
-+ version, \
-+ ELF_RTYPE_CLASS_PLT,\
-+ 0);\
- break; \
- } \
- /* Fall through. */ \
- } \
- case 0: \
-- value = _dl_lookup_symbol (strtab + sym->st_name, l, &sym, \
-- l->l_scope, ELF_RTYPE_CLASS_PLT, \
-- DL_LOOKUP_ADD_DEPENDENCY); \
-+ result = INTUSE(_dl_lookup_symbol) (strtab + sym->st_name, l, &sym, \
-+ l->l_scope, ELF_RTYPE_CLASS_PLT,\
-+ DL_LOOKUP_ADD_DEPENDENCY); \
- } \
- \
-- /* Currently value contains the base load address of the object \
-- that defines sym. Now add in the symbol offset. */ \
-- value = (sym ? value + sym->st_value : 0); \
-+ /* Currently result contains the base load address (or link map) \
-+ of the object that defines sym. Now add in the symbol \
-+ offset. */ \
-+ value = (sym ? result + sym->st_value : 0); \
- } \
- else \
-- /* We already found the symbol. The module (and therefore its load \
-- address) is also known. */ \
-- value = l->l_addr + sym->st_value; \
-+ { \
-+ /* We already found the symbol. The module (and therefore its load \
-+ address) is also known. */ \
-+ value = l->l_addr + sym->st_value; \
-+ } \
- \
- /* Apply the relocation with that value. */ \
-- *(got + local_gotno + sym_index - gotsym) = value; \
-+ *(got + local_gotno + sym_index - gotsym) = value; \
- \
- return value; \
- } \
-
Reply to: