projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull hp-machvec into release branch
[powerpc.git]
/
arch
/
um
/
os-Linux
/
elf_aux.c
diff --git
a/arch/um/os-Linux/elf_aux.c
b/arch/um/os-Linux/elf_aux.c
index
9416e1c
..
5a99dd3
100644
(file)
--- a/
arch/um/os-Linux/elf_aux.c
+++ b/
arch/um/os-Linux/elf_aux.c
@@
-9,12
+9,13
@@
*/
#include <elf.h>
#include <stddef.h>
*/
#include <elf.h>
#include <stddef.h>
-#include <asm/elf.h>
#include "init.h"
#include "elf_user.h"
#include "mem_user.h"
#include "init.h"
#include "elf_user.h"
#include "mem_user.h"
+#include <kern_constants.h>
-#if ELF_CLASS == ELFCLASS32
+/* Use the one from the kernel - the host may miss it, if having old headers. */
+#if UM_ELF_CLASS == UM_ELFCLASS32
typedef Elf32_auxv_t elf_auxv_t;
#else
typedef Elf64_auxv_t elf_auxv_t;
typedef Elf32_auxv_t elf_auxv_t;
#else
typedef Elf64_auxv_t elf_auxv_t;
@@
-54,7
+55,8
@@
__init void scan_elf_aux( char **envp)
* a_un, so we have to use a_val, which is
* all that's left.
*/
* a_un, so we have to use a_val, which is
* all that's left.
*/
- elf_aux_platform = (char *) auxv->a_un.a_val;
+ elf_aux_platform =
+ (char *) (long) auxv->a_un.a_val;
break;
case AT_PAGESZ:
page_size = auxv->a_un.a_val;
break;
case AT_PAGESZ:
page_size = auxv->a_un.a_val;