From efedd9cf71dd21618635d5f52717a713505ad5d7 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 6 Apr 2003 18:58:09 +0000
Subject: Update.

2003-04-06  Jakub Jelinek  <jakub@redhat.com>

	* elf/rtld.c: Revert 2003-03-14 change.
	* elf/dl-conflict.c (_dl_resolve_conflicts): Move
	#if ! ELF_MACHINE_NO_RELA conditional into the routine.
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index d6371540d0..b5016ceab6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-06  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf/rtld.c: Revert 2003-03-14 change.
+	* elf/dl-conflict.c (_dl_resolve_conflicts): Move
+	#if ! ELF_MACHINE_NO_RELA conditional into the routine.
+
 2003-04-05  Ulrich Drepper  <drepper@redhat.com>
 
 	* sunrpc/xdr.c (xdr_string): Catch nodesize == 0 [PR libc/4999].
-- 
cgit v1.2.3