[uClibc-cvs] uClibc/ldso/ldso/sparc dl-syscalls.h, 1.7, 1.8 dl-sysdep.h, 1.7, 1.8 elfinterp.c, 1.16, 1.17
Erik Andersen,,,
andersen at uclibc.org
Sat Jun 12 08:38:42 UTC 2004
Update of /var/cvs/uClibc/ldso/ldso/sparc
In directory nail:/tmp/cvs-serv3470/ldso/sparc
Modified Files:
dl-syscalls.h dl-sysdep.h elfinterp.c
Log Message:
Jakub Bogusz from pld-linux dot org writes:
Hello,
I managed to get ldso (and thus shared linking to uClibc) to work on
sparc (actually sparc64 kernel with 32-bit userspace), at least on
simple "hello world" program (more complex ones not tested).
Some notes on attached patch (against 0.9.26, would require some work
to apply on current CVS - but I tested 0.9.26, not CVS):
- ELF magic cannot be examined by _dl_strncmp so early, probably because of
string constant, like on ppc/mips/sh
(note that early SEND_STDERR still crashes when trying to do _dl_strlen
- I suppose that string constants require relocation; but adding
load_addr didn't help, just ELF header was displayed instead of crash)
- mmap() is syscall6 like on ppc/mips/sh, not old i386 mmap()
- for generic sparc (i.e. not sparcv8/sparcv9) gcc produces .udiv/.urem
calls for unsigned integer / and % operators - so these operations
must be avoided. I copied do_rem definition from arm header.
But / and % are used also in _dl_simple_ltoa() and
_dl_simple_ltoahex(); in ltoahex gcc optimizes it to shifts (but
I think it's safer to use shifts explicitly, not rely on
optimization...).
I changed % in ltoa to do_rem, but as there was no do_div definition,
I changed all "%d" specifiers to "%x" to avoid crashes (this changes
wouldn't be needed if _dl_simple_ltoa() were fixed to not use
division on sparc).
- "#define SOLARIS_COMPATIBLE" in ld_sysdep.h broke ldso on Linux
because of redefining _dl_linux_resolve only in some places (it was
still referenced in INIT_GOT before redefinition). So
_dl_linux_resolve redefinition should be moved before INIT_GOT
definition or removed.
- sparc64 kernel requires mmap() addresses to be aligned to 8192, not
4096, otherwise mmap() call failed
- reloc_entry must be shifted by 10, not 12 (I found similar operation
in glibc sources)
Aside of sparc-specific fixes:
- I moved some _dl_dprintf()s inside if(_dl_debug_*) conditions (to avoid
debugging messages when LD_DEBUG is not defined)
- it seems that there was possible off-by-one in ltoa and ltoahex?
they are called with char[22] as 1st argument, and then '\0' is stored
in local[22] (_before_ p decrementation)... or am I missing something?
If not, fix is included in patch.
Index: dl-sysdep.h
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/sparc/dl-sysdep.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/dl-sysdep.h 17 Feb 2004 10:55:59 -0000 1.7
+++ b/dl-sysdep.h 12 Jun 2004 08:38:39 -0000 1.8
@@ -41,9 +41,51 @@
/*
* Define this if you want a dynamic loader that works on Solaris.
*/
+#ifndef __linux__
#define SOLARIS_COMPATIBLE
+#endif
-#define do_rem(result, n, base) result = (n % base)
+#ifndef COMPILE_ASM
+/* Cheap modulo implementation, taken from arm/ld_sysdep.h. */
+static inline unsigned long
+sparc_mod(unsigned long m, unsigned long p)
+{
+ unsigned long i, t, inc;
+
+ i = p;
+ t = 0;
+
+ while (!(i & (1 << 31))) {
+ i <<= 1;
+ t++;
+ }
+
+ t--;
+
+ for (inc = t; inc > 2; inc--) {
+ i = p << inc;
+
+ if (i & (1 << 31))
+ break;
+
+ while (m >= i) {
+ m -= i;
+ i <<= 1;
+ if (i & (1 << 31))
+ break;
+ if (i < p)
+ break;
+ }
+ }
+
+ while (m >= p)
+ m -= p;
+
+ return m;
+}
+
+#define do_rem(result, n, base) result = sparc_mod(n, base);
+#endif
/*
* dbx wants the binder to have a specific name. Mustn't disappoint it.
@@ -53,9 +95,10 @@
#endif
/* 4096 bytes alignment */
-#define PAGE_ALIGN 0xfffff000
-#define ADDR_ALIGN 0xfff
-#define OFFS_ALIGN 0x7ffff000
+/* ...but 8192 is required for mmap() on sparc64 kernel */
+#define PAGE_ALIGN 0xffffe000
+#define ADDR_ALIGN 0x1fff
+#define OFFS_ALIGN 0x7fffe000
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
PLT entries should not be allowed to define the value.
Index: dl-syscalls.h
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/sparc/dl-syscalls.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/dl-syscalls.h 12 May 2004 22:54:59 -0000 1.7
+++ b/dl-syscalls.h 12 Jun 2004 08:38:39 -0000 1.8
@@ -158,3 +158,29 @@
_dl_errno = -__res; \
return -1; \
}
+
+#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
+ type5,arg5,type6,arg6) \
+type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
+{ \
+long __res; \
+register long __g1 __asm__ ("g1") = __NR_##name; \
+register long __o0 __asm__ ("o0") = (long)(arg1); \
+register long __o1 __asm__ ("o1") = (long)(arg2); \
+register long __o2 __asm__ ("o2") = (long)(arg3); \
+register long __o3 __asm__ ("o3") = (long)(arg4); \
+register long __o4 __asm__ ("o4") = (long)(arg5); \
+register long __o5 __asm__ ("o5") = (long)(arg6); \
+__asm__ __volatile__ ("t 0x10\n\t" \
+ "bcc 1f\n\t" \
+ "mov %%o0, %0\n\t" \
+ "sub %%g0, %%o0, %0\n\t" \
+ "1:\n\t" \
+ : "=r" (__res), "=&r" (__o0) \
+ : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__o3), "r" (__o4), "r" (__o5), "r" (__g1) \
+ : "cc"); \
+if (__res < -255 || __res>=0) \
+ return (type) __res; \
+/*errno = -__res; */\
+return -1; \
+}
Index: elfinterp.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/sparc/elfinterp.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- a/elfinterp.c 14 Feb 2004 11:54:09 -0000 1.16
+++ b/elfinterp.c 12 Jun 2004 08:38:39 -0000 1.17
@@ -72,7 +72,7 @@
/*
* Generate the correct relocation index into the .rela.plt section.
*/
- reloc_entry = (reloc_entry >> 12) - 0xc;
+ reloc_entry = (reloc_entry >> 10) - 0xc;
this_reloc = (Elf32_Rela *) ((char *) rel_addr + reloc_entry);
@@ -82,10 +82,14 @@
symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr);
strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
+#ifdef __SUPPORT_LD_DEBUG__
+ if (_dl_debug_symbols) {
_dl_dprintf(2, "tpnt = %x\n", tpnt);
_dl_dprintf(2, "reloc = %x\n", this_reloc);
_dl_dprintf(2, "symtab = %x\n", symtab);
_dl_dprintf(2, "strtab = %x\n", strtab);
+ }
+#endif
if (unlikely(reloc_type != R_SPARC_JMP_SLOT)) {
@@ -98,10 +102,10 @@
instr_addr = ((int)this_reloc->r_offset + (int)tpnt->loadaddr);
got_addr = (char **) instr_addr;
- _dl_dprintf(2, "symtab_index %d\n", symtab_index);
-
#ifdef __SUPPORT_LD_DEBUG__
if (_dl_debug_symbols) {
+ _dl_dprintf(2, "symtab_index %x\n", symtab_index);
+
_dl_dprintf(2, "Resolving symbol %s\n",
strtab + symtab[symtab_index].st_name);
}
More information about the uClibc-cvs
mailing list