about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--catgets/open_catalog.c4
-rw-r--r--sysdeps/alpha/dl-machine.h4
3 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 41b32438c0..618100d390 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-02-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/alpha/dl-machine.h (elf_machine_load_address, RTLD_START):
+	Work around an Alpha gas bug.
+
+2002-02-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* catgets/open_catalog.c (__open_catalog): Fix typo in code which
+	uses read to load the catalog.
+	Patch by Andy Isaacson <adi@unlimitedscale.com> [PR libc/3011].
+
 2002-02-26  Ulrich Drepper  <drepper@redhat.com>
 
 	* posix/Makefile (distribute): Add regcomp.c, regexec.c,
@@ -32,7 +43,7 @@
 2002-02-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* assert/assert-perr.c: Use INTUSE to reference functions and variables
-	inside libc itself.  Ise INTDEF and INTDEF2 to define appropriate
+	inside libc itself.  Use INTDEF and INTDEF2 to define appropriate
 	aliases.  Add prototypes for the new aliases.
 	* assert/assert.c: Likewise.
 	* include/libc-symbols.h: Likewise.
diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c
index c38719edb9..66f1bf2850 100644
--- a/catgets/open_catalog.c
+++ b/catgets/open_catalog.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper, <drepper@gnu.org>.
 
@@ -237,7 +237,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var,
       /* Save read, handle partial reads.  */
       do
 	{
-	  size_t now = __read (fd, (((char *) &catalog->file_ptr)
+	  size_t now = __read (fd, (((char *) catalog->file_ptr)
 				    + (st.st_size - todo)), todo);
 	  if (now == 0 || now == (size_t) -1)
 	    {
diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h
index 5feb46d69c..6024f135b7 100644
--- a/sysdeps/alpha/dl-machine.h
+++ b/sysdeps/alpha/dl-machine.h
@@ -74,7 +74,7 @@ elf_machine_load_address (void)
       "0:\n\t"
       "br $0, 2f\n"
       "1:\n\t"
-      ".data\n"
+      ".section\t.data\n"
       "2:\n\t"
       ".quad 0b\n\t"
       ".previous"
@@ -294,7 +294,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
    its return value is the user program's entry point.  */
 
 #define RTLD_START asm ("\
-.text								\n\
+	.section .text						\n\
 	.set at							\n\
 	.globl _start						\n\
 	.ent _start						\n\