about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--nptl/ChangeLog7
-rw-r--r--nptl/sysdeps/s390/tls.h2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/Versions2
-rw-r--r--sysdeps/powerpc/powerpc64/dl-machine.c4
5 files changed, 20 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 10ed7b714a..a68e4a1731 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-08  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/powerpc/powerpc64/dl-machine.c (_dl_reloc_overflow):
+	Don't use INTUSE with _dl_signal_error.
+
+2004-03-08  Steven Munroe  <sjmunroe@us.ibm.com>
+
+	* sysdeps/powerpc/powerpc64/dl-machine.c(_dl_reloc_overflow): Replace
+	INTUSE with GLRO.
+
 2004-03-08  Richard Henderson  <rth@redhat.com>
 
 	* sysdeps/alpha/soft-fp/ots_cvtxt.c (_OtsConvertFloatXT): Fix typo
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b5ee107e23..38cb75ae66 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,7 +1,12 @@
+2004-03-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/s390/tls.h (INIT_SYSINFO): _dl_sysinfo is now in
+	_rtld_global_ro.
+
 2004-03-07  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/ia64/tls.h (INIT_SYSINFO): _dl_sysinfo is now in
-	_rtlf_global_ro.
+	_rtld_global_ro.
 
 	* tst-once4.c: Remove unnecessary macro definition.
 
diff --git a/nptl/sysdeps/s390/tls.h b/nptl/sysdeps/s390/tls.h
index b038910387..c9b991df32 100644
--- a/nptl/sysdeps/s390/tls.h
+++ b/nptl/sysdeps/s390/tls.h
@@ -108,7 +108,7 @@ typedef struct
 
 #if defined NEED_DL_SYSINFO && defined SHARED
 # define INIT_SYSINFO \
-  _head->sysinfo = GL(dl_sysinfo)
+  _head->sysinfo = GLRO(dl_sysinfo)
 #else
 # define INIT_SYSINFO
 #endif
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/Versions b/nptl/sysdeps/unix/sysv/linux/powerpc/Versions
index f63cf41358..9977847984 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/Versions
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/Versions
@@ -1,5 +1,5 @@
 libpthread {
   GLIBC_2.3.4 {
-	longjmp; siglongjmp;
+    longjmp; siglongjmp;
   }
 }
diff --git a/sysdeps/powerpc/powerpc64/dl-machine.c b/sysdeps/powerpc/powerpc64/dl-machine.c
index 167af998a7..6d9a585d22 100644
--- a/sysdeps/powerpc/powerpc64/dl-machine.c
+++ b/sysdeps/powerpc/powerpc64/dl-machine.c
@@ -1,5 +1,5 @@
 /* Machine-dependent ELF dynamic relocation functions.  PowerPC64 version.
-   Copyright (C) 1995-2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -44,5 +44,5 @@ _dl_reloc_overflow (struct link_map *map,
       t = stpcpy (t, "'");
     }
   t = stpcpy (t, " out of range");
-  INTUSE (_dl_signal_error) (0, map->l_name, NULL, buffer);
+  _dl_signal_error (0, map->l_name, NULL, buffer);
 }