svn commit: trunk/uClibc/ldso/ldso/m68k

vapier at uclibc.org vapier at uclibc.org
Wed Jun 7 14:18:52 UTC 2006


Author: vapier
Date: 2006-06-07 07:18:51 -0700 (Wed, 07 Jun 2006)
New Revision: 15306

Log:
use unsigned long like every other port as pointed out by Peter S. Mazinger

Modified:
   trunk/uClibc/ldso/ldso/m68k/dl-sysdep.h
   trunk/uClibc/ldso/ldso/m68k/elfinterp.c


Changeset:
Modified: trunk/uClibc/ldso/ldso/m68k/dl-sysdep.h
===================================================================
--- trunk/uClibc/ldso/ldso/m68k/dl-sysdep.h	2006-06-07 13:31:59 UTC (rev 15305)
+++ trunk/uClibc/ldso/ldso/m68k/dl-sysdep.h	2006-06-07 14:18:51 UTC (rev 15306)
@@ -11,8 +11,8 @@
 /* Initialization sequence for a GOT.  */
 #define INIT_GOT(GOT_BASE,MODULE) \
 do { \
-	GOT_BASE[2] = (int) _dl_linux_resolve; \
-	GOT_BASE[1] = (int) (MODULE); \
+	GOT_BASE[2] = (unsigned long) _dl_linux_resolve; \
+	GOT_BASE[1] = (unsigned long) (MODULE); \
 } while(0)
 
 /* Here we define the magic numbers that this dynamic loader should accept */
@@ -23,7 +23,7 @@
 #define ELF_TARGET "m68k"
 
 struct elf_resolve;
-extern unsigned int _dl_linux_resolver (struct elf_resolve *, int);
+extern unsigned long _dl_linux_resolver (struct elf_resolve *, int);
 
 /* 4096 bytes alignment */
 #define PAGE_ALIGN 0xfffff000

Modified: trunk/uClibc/ldso/ldso/m68k/elfinterp.c
===================================================================
--- trunk/uClibc/ldso/ldso/m68k/elfinterp.c	2006-06-07 13:31:59 UTC (rev 15305)
+++ trunk/uClibc/ldso/ldso/m68k/elfinterp.c	2006-06-07 14:18:51 UTC (rev 15306)
@@ -44,7 +44,7 @@
 
 extern int _dl_linux_resolve(void);
 
-unsigned int
+unsigned long
 _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 {
 	int reloc_type;




More information about the uClibc-cvs mailing list