[uClibc-cvs] uClibc/ldso/ldso/sparc elfinterp.c,1.15,1.16

[Erik Andersen]

Update of /var/cvs/uClibc/ldso/ldso/sparc
In directory nail:/home/andersen/CVS/uClibc/ldso/ldso/sparc

Modified Files:
	elfinterp.c 
Log Message:
Give gcc branch prediction some hits on obviously unlikely branches


Index: elfinterp.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/sparc/elfinterp.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- elfinterp.c	14 Feb 2004 11:30:38 -0000	1.15
+++ elfinterp.c	14 Feb 2004 11:54:09 -0000	1.16
@@ -88,7 +88,7 @@
   _dl_dprintf(2, "strtab = %x\n", strtab);
 
 
-  if (reloc_type != R_SPARC_JMP_SLOT) {
+  if (unlikely(reloc_type != R_SPARC_JMP_SLOT)) {
     _dl_dprintf(2, "%s: incorrect relocation type in jump relocations (%d)\n",
 		  _dl_progname, reloc_type);
     _dl_exit(30);
@@ -110,7 +110,7 @@
   /* Get the address of the GOT entry */
   new_addr = _dl_find_hash(strtab + symtab[symtab_index].st_name,
   			tpnt->symbol_scope, ELF_RTYPE_CLASS_PLT);
-  if(!new_addr) {
+  if(unlikely(!new_addr)) {
     _dl_dprintf(2, "%s: can't resolve symbol '%s'\n",
 	       _dl_progname, strtab + symtab[symtab_index].st_name);
     _dl_exit(31);
@@ -225,7 +225,7 @@
 
       symbol_addr = (unsigned int)
 	_dl_find_hash(strtab + symtab[symtab_index].st_name,
-		      tpnt->symbol_scope, elf_machine_type_class(reloc_type);
+		      tpnt->symbol_scope, elf_machine_type_class(reloc_type));
 
       if(!symbol_addr &&
 	 ELF32_ST_BIND(symtab [symtab_index].st_info) == STB_GLOBAL) {