about summary refs log tree commit diff
path: root/sysdeps/generic
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-05-16 04:22:23 +0000
committerUlrich Drepper <drepper@redhat.com>2003-05-16 04:22:23 +0000
commit63c7a7e8a99489497572e0cf81aee5c3bc77d1c2 (patch)
treea398a2750f5a65cdedf9ab10aa4ceb637ec014e2 /sysdeps/generic
parent115a45a7209e380578d36d83016700c5a2d8252e (diff)
downloadglibc-63c7a7e8a99489497572e0cf81aee5c3bc77d1c2.tar.gz
glibc-63c7a7e8a99489497572e0cf81aee5c3bc77d1c2.tar.xz
glibc-63c7a7e8a99489497572e0cf81aee5c3bc77d1c2.zip
Update.
2003-05-15  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/powerpc/powerpc32/dl-machine.c (_dl_reloc_overflow):
	Remove sym argument, always use refsym.
	(__process_machine_rela): Adjust callers.
	* sysdeps/powerpc/powerpc64/dl-machine.c (_dl_reloc_overflow):
	Likewise.
	* sysdeps/powerpc/powerpc32/dl-machine.h (_dl_reloc_overflow):
	Adjust prototype.
	* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela): Likewise.
Diffstat (limited to 'sysdeps/generic')
-rw-r--r--sysdeps/generic/dl-sysdep.c29
1 files changed, 17 insertions, 12 deletions
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c
index a0e6736b22..166f4fadad 100644
--- a/sysdeps/generic/dl-sysdep.c
+++ b/sysdeps/generic/dl-sysdep.c
@@ -260,23 +260,28 @@ _dl_show_auxv (void)
 
       assert (AT_NULL == 0);
       assert (AT_IGNORE == 1);
+
+      if (av->a_type == AT_HWCAP)
+	{
+	  /* This is handled special.  */
+	  if (_dl_procinfo (av->a_un.a_val) == 0)
+	    continue;
+	}
+
       if (idx < sizeof (auxvars) / sizeof (auxvars[0]))
 	{
-	  if (av->a_type != AT_HWCAP || _dl_procinfo (av->a_un.a_val) < 0)
-	    {
-	      const char *val = av->a_un.a_ptr;
+	  const char *val = av->a_un.a_ptr;
 
-	      if (__builtin_expect (auxvars[idx].form, dec) == dec)
-		val = _itoa ((unsigned long int) av->a_un.a_val,
-			     buf + sizeof buf - 1, 10, 0);
-	      else if (__builtin_expect (auxvars[idx].form, hex) == hex)
-		val = _itoa ((unsigned long int) av->a_un.a_val,
-			     buf + sizeof buf - 1, 16, 0);
+	  if (__builtin_expect (auxvars[idx].form, dec) == dec)
+	    val = _itoa ((unsigned long int) av->a_un.a_val,
+			 buf + sizeof buf - 1, 10, 0);
+	  else if (__builtin_expect (auxvars[idx].form, hex) == hex)
+	    val = _itoa ((unsigned long int) av->a_un.a_val,
+			 buf + sizeof buf - 1, 16, 0);
 
-	      _dl_printf ("%s%s\n", auxvars[idx].label, val);
+	  _dl_printf ("%s%s\n", auxvars[idx].label, val);
 
-	      continue;
-	    }
+	  continue;
 	}
 
       /* Unknown value: print a generic line.  */