This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: bring mips*-linux back to a buildable state


On Jul 19, 2004, Andreas Jaeger <aj@suse.de> wrote:

> Can you send them separtly, so that it's easier to comment on them?

_dl_lookup_versioned_symbol and _dl_lookup_symbol were removed from
the generic code, unified into _dl_lookup_symbol_x.  Also,
_dl_signal_error is no longer available as an _INTUSE symbol.  This
patch fixes these errors, that would be reported when linking ld.so.

Index: ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* sysdeps/mips/dl-machine.h (__dl_runtime_resolve): Update to use
	_dl_lookup_symbol_x.
	(elf_machine_runtime_link_map): Don't INTUSE _dl_signal_error.

Index: sysdeps/mips/dl-machine.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mips/dl-machine.h,v
retrieving revision 1.72
diff -u -p -r1.72 dl-machine.h
--- sysdeps/mips/dl-machine.h 20 May 2004 22:07:15 -0000 1.72
+++ sysdeps/mips/dl-machine.h 2 Jul 2004 05:35:49 -0000
@@ -254,7 +254,7 @@ elf_machine_runtime_link_map (ElfW(Addr)
 	}
     }
 
-  INTUSE (_dl_signal_error) (0, NULL, NULL, "cannot find runtime link map");
+  _dl_signal_error (0, NULL, NULL, "cannot find runtime link map");
   return NULL;
 }
 
@@ -366,17 +366,17 @@ __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);  \
+		value = _dl_lookup_symbol_x (strtab + sym->st_name, l, 	      \
+					     &sym, l->l_scope, version,	      \
+					     ELF_RTYPE_CLASS_PLT, 0, 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);		      \
+	  value = _dl_lookup_symbol_x (strtab + sym->st_name, l, &sym,	      \
+				       l->l_scope, 0, ELF_RTYPE_CLASS_PLT,    \
+				       DL_LOOKUP_ADD_DEPENDENCY, 0);	      \
 	}								      \
 									      \
       /* Currently value contains the base load address of the object	      \
-- 
Alexandre Oliva             http://www.ic.unicamp.br/~oliva/
Red Hat Compiler Engineer   aoliva@{redhat.com, gcc.gnu.org}
Free Software Evangelist  oliva@{lsd.ic.unicamp.br, gnu.org}

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]