summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1999-07-10 23:01:25 +0000
committerRoland McGrath <roland@gnu.org>1999-07-10 23:01:25 +0000
commit8ef460f59cbc9ccab0f7567ffc8568b456048d90 (patch)
tree22f73c3ba4f3237addbe76c8d3de0fa41f0a4ffb
parentf49412d05376d8dbbd84e0985a5bd42d201becad (diff)
1999-07-10 Roland McGrath <roland@baalperazim.frob.com>
* exec.c (check_elf): Call elf_machine_matches_host instead of comparing against elf_machine. (load_section): #if 0 out no-op code that uses elf_machine. * priv.h (elf_machine_matches_host): Declare it. (elf_machine, mach_host_elf_machine): Remove decls. * main.c (main) [!BFD]: Don't call mach_host_elf_machine. (elf_machine): Variable removed. * priv.h: Add #include <sys/mman.h> for munmap decl.
-rw-r--r--exec/priv.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/exec/priv.h b/exec/priv.h
index a89858ce..f6889b32 100644
--- a/exec/priv.h
+++ b/exec/priv.h
@@ -1,5 +1,5 @@
/* GNU Hurd standard exec server, private declarations.
- Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1999 Free Software Foundation, Inc.
Written by Roland McGrath.
This file is part of the GNU Hurd.
@@ -9,7 +9,7 @@ it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
-The GNU Hurd is distributed in the hope that it will be useful,
+The GNU Hurd is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -22,6 +22,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/mman.h>
#include <hurd/trivfs.h>
#include <hurd/ports.h>
#include <hurd/lookup.h>
@@ -45,8 +46,6 @@ extern bfd_arch_info_type host_bfd_arch_info;
extern bfd host_bfd;
#endif
-extern Elf32_Half elf_machine; /* ELF e_machine for the host. */
-
/* Information kept around to be given to a new task
in response to a message on the task's bootstrap port. */
struct bootinfo
@@ -125,7 +124,7 @@ struct execdata
} info;
};
-error_t mach_host_elf_machine (host_t, Elf32_Half *);
+error_t elf_machine_matches_host (Elf32_Half e_machine);
void finish (struct execdata *, int dealloc_file_port);