From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 24 Aug 2001 14:20:11 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2-2-5~372
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4c4e6db680dd588700a8f1c5a6d75073d4d900b;p=thirdparty%2Fglibc.git

Update.

2001-08-24  Alexandre Oliva  <aoliva@redhat.com>

	* sysdeps/sh/dl-machine.h (elf_machine_rela): Fix typo.

	* elf/do-rel.h (elf_dynamic_do_rel): RELATIVE relocations comes
	first if RELCOUNT is set.
---

diff --git a/ChangeLog b/ChangeLog
index e0c8232ad19..2e97618a630 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-24  Alexandre Oliva  <aoliva@redhat.com>
+
+	* sysdeps/sh/dl-machine.h (elf_machine_rela): Fix typo.
+
 2001-08-24  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/ieee754/ldbl-128/e_j1l.c: New file, contributed by
@@ -5,6 +9,9 @@
 
 2001-08-24  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/do-rel.h (elf_dynamic_do_rel): RELATIVE relocations comes
+	first if RELCOUNT is set.
+
 	* elf/do-rel.h (elf_dynamic_do_rel): If not relocating lazily, don't
 	call elf_machine_rel for the last DT_RELCOUNT relocations but instead
 	elf_machine_rel_relative.
diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h
index a082e6edcaa..62f40d516a3 100644
--- a/sysdeps/sh/dl-machine.h
+++ b/sysdeps/sh/dl-machine.h
@@ -487,7 +487,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
 	}
     }
 #ifndef RTLD_BOOTSTRAP
-  else if (__builtin_expect (r_type 1= R_SH_NONE, 0))
+  else if (__builtin_expect (r_type != R_SH_NONE, 0))
     return;
 #endif
   else