about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-05-11 08:33:48 +0000
committerUlrich Drepper <drepper@redhat.com>2005-05-11 08:33:48 +0000
commit151c317ff73653504e06aad7516aacd930ba2282 (patch)
tree1280b21b5814cce1c1608680bb2435b86432f852
parent6ba85a6dceaf3d0a9e85bbba650431b5674423b7 (diff)
downloadglibc-151c317ff73653504e06aad7516aacd930ba2282.tar.gz
glibc-151c317ff73653504e06aad7516aacd930ba2282.tar.xz
glibc-151c317ff73653504e06aad7516aacd930ba2282.zip
(Elf32_auxv_t): Make cross-compile safe. (Elf64_auxv_t): Likewise.
-rw-r--r--elf/elf.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/elf/elf.h b/elf/elf.h
index 8a9f7fd482..e246519fab 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -899,23 +899,25 @@ typedef struct
 
 typedef struct
 {
-  int a_type;			/* Entry type */
+  uint32_t a_type;		/* Entry type */
   union
     {
-      long int a_val;		/* Integer value */
-      void *a_ptr;		/* Pointer value */
-      void (*a_fcn) (void);	/* Function pointer value */
+      uint32_t a_val;		/* Integer value */
+      /* We use to have pointer elements added here.  We cannot do that,
+	 though, since it does not work when using 32-bit definitions
+	 on 64-bit platforms and vice versa.  */
     } a_un;
 } Elf32_auxv_t;
 
 typedef struct
 {
-  long int a_type;		/* Entry type */
+  uint64_t a_type;		/* Entry type */
   union
     {
-      long int a_val;		/* Integer value */
-      void *a_ptr;		/* Pointer value */
-      void (*a_fcn) (void);	/* Function pointer value */
+      uint64_t a_val;		/* Integer value */
+      /* We use to have pointer elements added here.  We cannot do that,
+	 though, since it does not work when using 32-bit definitions
+	 on 64-bit platforms and vice versa.  */
     } a_un;
 } Elf64_auxv_t;