[Glibc-bsd-commits] r3607 - trunk/glibc-ports/kfreebsd

[Robert Millan]

Author: rmh
Date: 2011-07-17 13:15:16 +0000 (Sun, 17 Jul 2011)
New Revision: 3607

Modified:
   trunk/glibc-ports/kfreebsd/dl-support.c
   trunk/glibc-ports/kfreebsd/dl-sysdep.c
Log:
Comment out uses of AT_ macros that are not provided on powerpc.

Modified: trunk/glibc-ports/kfreebsd/dl-support.c
===================================================================
--- trunk/glibc-ports/kfreebsd/dl-support.c	2011-07-17 13:07:31 UTC (rev 3606)
+++ trunk/glibc-ports/kfreebsd/dl-support.c	2011-07-17 13:15:16 UTC (rev 3607)
@@ -43,6 +43,8 @@
       case AT_PHNUM:
 	GL(dl_phnum) = av->a_un.a_val;
 	break;
+#ifndef __powerpc__
+	/* For some odd reason these are not in sys/powerpc/include/elf.h.  */
       case AT_UID:
 	uid ^= av->a_un.a_val;
 	seen |= 1;
@@ -59,6 +61,7 @@
 	gid ^= av->a_un.a_val;
 	seen |= 8;
 	break;
+#endif
       }
   if (seen == 0xf)
     {

Modified: trunk/glibc-ports/kfreebsd/dl-sysdep.c
===================================================================
--- trunk/glibc-ports/kfreebsd/dl-sysdep.c	2011-07-17 13:07:31 UTC (rev 3606)
+++ trunk/glibc-ports/kfreebsd/dl-sysdep.c	2011-07-17 13:15:16 UTC (rev 3607)
@@ -92,6 +92,8 @@
 	break;
 #endif
 #ifndef HAVE_AUX_SECURE
+#ifndef __powerpc__
+	/* For some odd reason these are not in sys/powerpc/include/elf.h.  */
       case AT_UID:
       case AT_EUID:
 	uid ^= av->a_un.a_val;
@@ -101,6 +103,7 @@
 	gid ^= av->a_un.a_val;
 	break;
 #endif
+#endif
       }
 
 #ifndef HAVE_AUX_SECURE
@@ -196,11 +199,14 @@
 	  [AT_BASE - 2] =		{ "BASE:         0x", hex },
 	  [AT_FLAGS - 2] =		{ "FLAGS:        0x", hex },
 	  [AT_ENTRY - 2] =		{ "ENTRY:        0x", hex },
+#ifndef __powerpc__
+	  /* For some odd reason these are not in sys/powerpc/include/elf.h.  */
 	  [AT_NOTELF - 2] =		{ "NOTELF:       ", hex },
 	  [AT_UID - 2] =		{ "UID:          ", dec },
 	  [AT_EUID - 2] =		{ "EUID:         ", dec },
 	  [AT_GID - 2] =		{ "GID:          ", dec },
 	  [AT_EGID - 2] =		{ "EGID:         ", dec },
+#endif
 	  [AT_EXECPATH - 2] =		{ "EXECPATH      ", str },
 	  [AT_CANARY - 2] =		{ "CANARY:       0x", hex },
 	  [AT_CANARYLEN - 2] =		{ "CANARYLEN:    ", dec },