From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 5 Nov 2001 22:13:46 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~22382
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea41b9267dbd64faec6630e45fac87afb663ec11;p=external%2Fglibc.git

Update.

	* elf/dl-reloc.c (_dl_reloc_bad_type): Rewrite to not use writable
	strings.  Change type of second parameter.
	* sysdeps/generic/ldsodefs.h: Adjust _dl_reloc_bad_type prototype
	for last change.
---

diff --git a/ChangeLog b/ChangeLog
index 57de6dc..f28993a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-11-05  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/dl-reloc.c (_dl_reloc_bad_type): Rewrite to not use writable
+	strings.  Change type of second parameter.
+	* sysdeps/generic/ldsodefs.h: Adjust _dl_reloc_bad_type prototype
+	for last change.
+
 	* io/fts.h: Prevent using <fts.h> with _FILE_OFFSET_BITS=64.
 
 2001-11-04  Joseph S. Myers  <jsm28@cam.ac.uk>
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index 931c9f4..4ee0da0 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -187,28 +187,23 @@ cannot make segment writable for relocation"));
     }
 }
 
-#include "../stdio-common/_itoa.h"
-#define DIGIT(b)	_itoa_lower_digits[(b) & 0xf];
 
 void
 internal_function
-_dl_reloc_bad_type (struct link_map *map, uint_fast8_t type, int plt)
+_dl_reloc_bad_type (struct link_map *map, unsigned int type, int plt)
 {
   extern const char _itoa_lower_digits[];
-  if (plt)
-    {
-      /* XXX We cannot translate the message.  */
-      static char msg[] = "unexpected PLT reloc type 0x??";
-      msg[sizeof msg - 3] = DIGIT(type >> 4);
-      msg[sizeof msg - 2] = DIGIT(type);
-      _dl_signal_error (0, map->l_name, NULL, msg);
-    }
-  else
-    {
-      /* XXX We cannot translate the message.  */
-      static char msg[] = "unexpected reloc type 0x??";
-      msg[sizeof msg - 3] = DIGIT(type >> 4);
-      msg[sizeof msg - 2] = DIGIT(type);
-      _dl_signal_error (0, map->l_name, NULL, msg);
-    }
+#define DIGIT(b)	_itoa_lower_digits[(b) & 0xf];
+
+  /* XXX We cannot translate these messages.  */
+  static const char msg[2][32] = { "unexpected reloc type 0x",
+				   "unexpected PLT reloc type 0x" };
+  char msgbuf[sizeof (msg[0])];
+  char *cp;
+
+  cp = __stpcpy (msgbuf, msg[plt]);
+  *cp++ = DIGIT (type >> 4);
+  *cp = DIGIT (type);
+
+  _dl_signal_error (0, map->l_name, NULL, msgbuf);
 }
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index a06ec78..fd4d992 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -416,9 +416,8 @@ extern void _dl_relocate_object (struct link_map *map,
    TYPE is the result of ELFW(R_TYPE) (r_info), i.e. an R_<CPU>_* value.
    PLT is nonzero if this was a PLT reloc; it just affects the message.  */
 extern void _dl_reloc_bad_type (struct link_map *map,
-				uint_fast8_t type, int plt)
-     internal_function
-     __attribute__ ((__noreturn__));
+				unsigned int type, int plt)
+     internal_function __attribute__ ((__noreturn__));
 
 /* Check the version dependencies of all objects available through
    MAP.  If VERBOSE print some more diagnostics.  */