Update.

2001-04-10  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>

	* elf/elf.h (AT_DCACHEBSIZE, AT_ICACHEBSIZE, AT_UCACHEBSIZE,
	AT_IGNOREPPC): New defines.
	* sysdeps/generic/dl-sysdep.c (_dl_show_auxv): Print them.
	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_STD_AUXV):
	Define for newer powerpc kernels.
	* sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Use the standard
	DL_FIND_ARG_COMPONENTS if __ASSUME_STD_AUXV is defined.

ChangeLog

@@ -1,3 +1,13 @@
+2001-04-10  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
+
+	* elf/elf.h (AT_DCACHEBSIZE, AT_ICACHEBSIZE, AT_UCACHEBSIZE,
+	AT_IGNOREPPC): New defines.
+	* sysdeps/generic/dl-sysdep.c (_dl_show_auxv): Print them.
+	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_STD_AUXV):
+	Define for newer powerpc kernels.
+	* sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Use the standard
+	DL_FIND_ARG_COMPONENTS if __ASSUME_STD_AUXV is defined.
+
 2000-4-10  kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
 	* sysdeps/sh/stackinfo.h: New file.

elf/elf.h

@@ -893,6 +893,15 @@ typedef struct
    performed by the kernel.  */
 #define AT_FPUCW	18		/* Used FPU control word.  */
 
+/* Cache block sizes.  */
+#define AT_DCACHEBSIZE	19		/* Data cache block size.  */
+#define AT_ICACHEBSIZE	20		/* Instruction cache block size.  */
+#define AT_UCACHEBSIZE	21		/* Unified cache block size.  */
+
+/* A special ignored value for PPC, used by the kernel to control the
+   interpretation of the AUXV. Must be > 16.  */
+#define AT_IGNOREPPC	22		/* Entry should be ignored */
+
 
 /* Note section contents.  Each entry in the note section begins with
    a header of a fixed form.  */

sysdeps/generic/dl-sysdep.c

@@ -226,7 +226,7 @@ _dl_show_auxv (void)
     {
       static const struct
       {
-	const char label[16];
+	const char label[20];
 	enum { dec, hex, str } form;
       } auxvars[] =
 	{
@@ -246,7 +246,10 @@ _dl_show_auxv (void)
 	  [AT_PLATFORM - 2] =		{ "AT_PLATFORM:    ", str },
 	  [AT_HWCAP - 2] =		{ "AT_HWCAP:       ", hex },
 	  [AT_CLKTCK - 2] =		{ "AT_CLKTCK:      ", dec },
-	  [AT_FPUCW - 2] =    { "AT_FPUCW:    ", hex }
+	  [AT_FPUCW - 2] =		{ "AT_FPUCW:       ", hex },
+	  [AT_DCACHEBSIZE - 2] =	{ "AT_DCACHEBSIZE: 0x", hex },
+	  [AT_ICACHEBSIZE - 2] =	{ "AT_ICACHEBSIZE: 0x", hex },
+	  [AT_UCACHEBSIZE - 2] =	{ "AT_UCACHEBSIZE: 0x", hex }
 	};
       unsigned int idx = (unsigned int) (av->a_type - 2);
 

sysdeps/unix/sysv/linux/kernel-features.h

@@ -163,3 +163,8 @@
 #if __LINUX_KERNEL_VERSION >= 132097
 # define __ASSUME_AT_PAGESIZE	1
 #endif
+
+/* Starting with 2.4.? kernels PPC passes the AUXV in the standard way.  */
+#if __LINUX_KERNEL_VERSION >= (132096+99) && defined __powerpc__
+# define __ASSUME_STD_AUXV	1
+#endif

sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c

@@ -1,5 +1,5 @@
 /* Operating system support for run-time dynamic linker.  Linux/PPC version.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2001 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
@@ -18,6 +18,11 @@
    Boston, MA 02111-1307, USA.  */
 
 
+#include "config.h"
+#include "kernel-features.h"
+
+#ifndef __ASSUME_STD_AUXV
+
 /* The PowerPC's auxiliary argument block gets aligned to a 16-byte
    boundary.  This is history and impossible to change compatibly.  */
 
@@ -25,7 +30,7 @@
   do {									      \
     char **_tmp;							      \
     size_t _test;							      \
-    (argc) = *(long *) cookie;					\
+    (argc) = *(long int *) cookie;					      \
     (argv) = (char **) cookie + 1;					      \
     (envp) = (argv) + (argc) + 1;					      \
     for (_tmp = (envp); *_tmp; ++_tmp)					      \
@@ -45,6 +50,6 @@
        _tmp = (char **)_test;						      \
     (auxp) = (ElfW(auxv_t) *) _tmp;					      \
   } while (0)
-
+#endif
 
 #include <sysdeps/unix/sysv/linux/dl-sysdep.c>