Author: qboosh Date: Sun Aug 28 07:20:21 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 0.9.28
---- Files affected:
SOURCES:
uClibc-newsoname.patch (1.2 -> 1.3) , uClibc-sparc.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/uClibc-newsoname.patch
diff -u SOURCES/uClibc-newsoname.patch:1.2 SOURCES/uClibc-newsoname.patch:1.3
--- SOURCES/uClibc-newsoname.patch:1.2 Tue Feb 3 20:30:54 2004
+++ SOURCES/uClibc-newsoname.patch Sun Aug 28 09:20:16 2005
@@ -1,6 +1,5 @@
-diff -urN uClibc-0.9.26.org/libpthread/Makefile
uClibc-0.9.26/libpthread/Makefile
---- uClibc-0.9.26.org/libpthread/Makefile 2004-01-25 15:20:49.547594064
+0100
-+++ uClibc-0.9.26/libpthread/Makefile 2004-01-25 15:33:34.026392026 +0100
+--- uClibc-0.9.28/libpthread/Makefile.orig 2005-08-18 00:49:49.000000000
+0200
++++ uClibc-0.9.28/libpthread/Makefile 2005-08-28 00:04:19.595072696 +0200
@@ -21,7 +21,8 @@
#Adjust the soname version to avoid namespace collisions with glibc's
libpthread
@@ -11,12 +10,12 @@
LIBPTHREAD_SHARED_FULLNAME=libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
LIBTHREAD_DB=libthread_db.a
-@@ -90,6 +91,8 @@
- $(TOPDIR)lib/$(LIBPTHREAD_SHARED); \
- $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
- $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \
-+ $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
-+ $(TOPDIR)lib/$(LIBPTHREAD_SHARED_ORG).$(MAJOR_VERSION);
\
- fi;
- if [ -f $(LIBTHREAD_DB) ] ; then \
- set -e; \
+@@ -84,6 +85,8 @@
+ $(TOPDIR)lib/$(LIBPTHREAD_SHARED)
+ $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
+ $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION)
++ $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
++ $(TOPDIR)lib/$(LIBPTHREAD_SHARED_ORG).$(MAJOR_VERSION)
+ endif
+ ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
+ $(LD) $(LIBTHREAD_DB_LDFLAGS) --warn-unresolved-symbols
-soname=$(LIBTHREAD_DB_SHARED).1 \
================================================================
Index: SOURCES/uClibc-sparc.patch
diff -u SOURCES/uClibc-sparc.patch:1.4 SOURCES/uClibc-sparc.patch:1.5
--- SOURCES/uClibc-sparc.patch:1.4 Sun Jan 16 17:36:25 2005
+++ SOURCES/uClibc-sparc.patch Sun Aug 28 09:20:16 2005
@@ -1,6 +1,6 @@
---- uClibc-0.9.27/ldso/ldso/sparc/elfinterp.c.orig 2005-01-16
10:50:58.798433255 +0000
-+++ uClibc-0.9.27/ldso/ldso/sparc/elfinterp.c 2005-01-16 10:57:08.966876531
+0000
-@@ -93,7 +93,7 @@
+--- uClibc-0.9.28/ldso/ldso/sparc/elfinterp.c.orig 2005-08-18
00:49:41.000000000 +0200
++++ uClibc-0.9.28/ldso/ldso/sparc/elfinterp.c 2005-08-28 00:19:02.940783736
+0200
+@@ -81,7 +81,7 @@
if (unlikely(reloc_type != R_SPARC_JMP_SLOT)) {
@@ -9,149 +9,51 @@
_dl_progname, reloc_type);
_dl_exit(30);
};
-@@ -140,8 +140,10 @@
+@@ -128,8 +128,10 @@
got_addr[2] = (char *) (0x81c06000 | ((unsigned int) new_addr & 0x3ff));
#endif
+#if defined (__SUPPORT_LD_DEBUG__)
-+ if (_dl_debug_bindings)
++ if (_dl_debug_bindings)
_dl_dprintf(2, "Address = %x\n",new_addr);
- _dl_exit(32);
+#endif
return (unsigned int) new_addr;
}
-@@ -154,20 +156,20 @@
- int reloc_type;
- int symtab_index;
- Elf32_Sym * symtab;
-- Elf32_Rela * rpnt;
-+ Elf32_Rela * relpnt;
- unsigned int * reloc_addr;
- struct elf_resolve * tpnt = rpnt->dyn;
-
- /* Now parse the relocation information */
-- rpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr);
-+ relpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr);
-
- symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr);
- strtab = ( char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
-
-- for(i=0; i< rel_size; i += sizeof(Elf32_Rela), rpnt++){
-- reloc_addr = (int *) (tpnt->loadaddr + (int)rpnt->r_offset);
-- reloc_type = ELF32_R_TYPE(rpnt->r_info);
-- symtab_index = ELF32_R_SYM(rpnt->r_info);
-+ for(i=0; i< rel_size; i += sizeof(Elf32_Rela), relpnt++){
-+ reloc_addr = (int *) (tpnt->loadaddr + (int)relpnt->r_offset);
-+ reloc_type = ELF32_R_TYPE(relpnt->r_info);
-+ symtab_index = ELF32_R_SYM(relpnt->r_info);
-
- switch(reloc_type){
- case R_SPARC_NONE:
-@@ -194,22 +196,22 @@
- int reloc_type;
- int goof = 0;
- Elf32_Sym * symtab;
-- Elf32_Rela * rpnt;
-+ Elf32_Rela * relpnt;
- unsigned int * reloc_addr;
- unsigned int symbol_addr;
- int symtab_index;
- struct elf_resolve * tpnt = rpnt->dyn;
- /* Now parse the relocation information */
-
-- rpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr);
-+ relpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr);
-
- symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr);
- strtab = ( char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
-
-- for(i=0; i< rel_size; i+= sizeof(Elf32_Rela), rpnt++){
-- reloc_addr = (int *) (tpnt->loadaddr + (int)rpnt->r_offset);
-- reloc_type = ELF32_R_TYPE(rpnt->r_info);
-- symtab_index = ELF32_R_SYM(rpnt->r_info);
-+ for(i=0; i< rel_size; i+= sizeof(Elf32_Rela), relpnt++){
-+ reloc_addr = (int *) (tpnt->loadaddr + (int)relpnt->r_offset);
-+ reloc_type = ELF32_R_TYPE(relpnt->r_info);
-+ symtab_index = ELF32_R_SYM(relpnt->r_info);
- symbol_addr = 0;
-
- if(symtab_index) {
-@@ -229,33 +231,33 @@
- case R_SPARC_NONE:
- break;
- case R_SPARC_32:
-- *reloc_addr = symbol_addr + rpnt->r_addend;
-+ *reloc_addr = symbol_addr + relpnt->r_addend;
- break;
- case R_SPARC_DISP32:
-- *reloc_addr = symbol_addr + rpnt->r_addend - (unsigned int) reloc_addr;
-+ *reloc_addr = symbol_addr + relpnt->r_addend - (unsigned int)
reloc_addr;
- break;
- case R_SPARC_GLOB_DAT:
-- *reloc_addr = symbol_addr + rpnt->r_addend;
-+ *reloc_addr = symbol_addr + relpnt->r_addend;
- break;
- case R_SPARC_JMP_SLOT:
- reloc_addr[1] = 0x03000000 | ((symbol_addr >> 10) & 0x3fffff);
- reloc_addr[2] = 0x81c06000 | (symbol_addr & 0x3ff);
- break;
- case R_SPARC_RELATIVE:
-- *reloc_addr += (unsigned int) tpnt->loadaddr + rpnt->r_addend;
-+ *reloc_addr += (unsigned int) tpnt->loadaddr + relpnt->r_addend;
- break;
- case R_SPARC_HI22:
- if (!symbol_addr)
-- symbol_addr = tpnt->loadaddr + rpnt->r_addend;
-+ symbol_addr = tpnt->loadaddr + relpnt->r_addend;
- else
-- symbol_addr += rpnt->r_addend;
-+ symbol_addr += relpnt->r_addend;
- *reloc_addr = (*reloc_addr & 0xffc00000)|(symbol_addr >> 10);
- break;
- case R_SPARC_LO10:
- if (!symbol_addr)
-- symbol_addr = tpnt->loadaddr + rpnt->r_addend;
-+ symbol_addr = tpnt->loadaddr + relpnt->r_addend;
- else
-- symbol_addr += rpnt->r_addend;
-+ symbol_addr += relpnt->r_addend;
- *reloc_addr = (*reloc_addr & ~0x3ff)|(symbol_addr & 0x3ff);
- break;
- case R_SPARC_WDISP30:
---- uClibc-0.9.27/ldso/ldso/ldso.c.orig 2005-01-12 07:59:21.000000000
+0000
-+++ uClibc-0.9.27/ldso/ldso/ldso.c 2005-01-16 11:21:49.751151256 +0000
-@@ -648,7 +648,7 @@
+--- uClibc-0.9.28/ldso/ldso/ldso.c.orig 2005-08-18 00:49:41.000000000
+0200
++++ uClibc-0.9.28/ldso/ldso/ldso.c 2005-08-28 00:19:31.295473168 +0200
+@@ -597,7 +597,7 @@
+ for (; runp; runp = runp->next) {
+ if (runp->tpnt == tcurr) {
struct elf_resolve *here =
init_fini_list[k];
- #ifdef __SUPPORT_LD_DEBUG__
- if(_dl_debug)
-- _dl_dprintf(2, "Move %s from
pos %d to %d in INIT/FINI list.\n", here->libname, k, j);
-+ _dl_dprintf(2, "Move %s from
pos %x to %x in INIT/FINI list.\n", here->libname, k, j);
- #endif
+- _dl_if_debug_dprint("Move %s from pos
%d to %d in INIT/FINI list\n", here->libname, k, j);
++ _dl_if_debug_dprint("Move %s from pos
%x to %x in INIT/FINI list\n", here->libname, k, j);
for (i = (k - j); i; --i)
init_fini_list[i+j] =
init_fini_list[i+j-1];
-@@ -911,7 +911,7 @@
+ init_fini_list[j] = here;
+@@ -837,7 +837,7 @@
+ void *retval;
#if 0
- #ifdef __SUPPORT_LD_DEBUG_EARLY__
-- _dl_dprintf(2, "malloc: request for %d bytes\n", size);
-+ _dl_dprintf(2, "malloc: request for %x bytes\n", size);
- #endif
+- _dl_debug_early("request for %d bytes\n", size);
++ _dl_debug_early("request for %x bytes\n", size);
#endif
---- uClibc-0.9.27/ldso/ldso/dl-elf.c.orig 2005-01-12 07:59:21.000000000
+0000
-+++ uClibc-0.9.27/ldso/ldso/dl-elf.c 2005-01-16 11:23:39.541794934 +0000
-@@ -827,7 +827,8 @@
+ if (_dl_malloc_function)
+--- uClibc-0.9.28/ldso/ldso/dl-elf.c.orig 2005-08-18 00:49:41.000000000
+0200
++++ uClibc-0.9.28/ldso/ldso/dl-elf.c 2005-08-28 00:20:16.525597144 +0200
+@@ -813,7 +813,8 @@
else
_dl_write(fd, string,
_dl_strlen(string));
break;
-
+#ifndef __sparc__
-+ /* _dl_simple_ltoa uses undefined .udiv */
++ /* _dl_simple_ltoa() uses undefined .udiv */
case 'i':
case 'd':
{
-@@ -838,6 +839,7 @@
+@@ -824,6 +825,7 @@
_dl_write(fd, string,
_dl_strlen(string));
break;
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/uClibc-newsoname.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/uClibc-sparc.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
