diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2004-05-17 21:54:57 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2004-05-17 21:54:57 +0000 |
| commit | 631eeff208608ed7b44459bd6c8ae905bcd7e8b6 (patch) | |
| tree | 7be124105a0929655708fbbc134f9c2e3189c3f3 /gnu/usr.bin/binutils/ld/emultempl/vanilla.em | |
| parent | a7c8e0ae4a4b349099d02bc9d56bcf1979c0f0c3 (diff) | |
Resolve merge conflicts, adjust method of W^X handing (.sh files)
remove testsuites (not useable) remove mmalloc (not part of new binutils).
Diffstat (limited to 'gnu/usr.bin/binutils/ld/emultempl/vanilla.em')
| -rw-r--r-- | gnu/usr.bin/binutils/ld/emultempl/vanilla.em | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/usr.bin/binutils/ld/emultempl/vanilla.em b/gnu/usr.bin/binutils/ld/emultempl/vanilla.em index 3e6aed92e39..8d4f6d4d32d 100644 --- a/gnu/usr.bin/binutils/ld/emultempl/vanilla.em +++ b/gnu/usr.bin/binutils/ld/emultempl/vanilla.em @@ -2,7 +2,8 @@ # It does some substitutions. cat >e${EMULATION_NAME}.c <<EOF /* A vanilla emulation with no defaults - Copyright 1991, 1992, 1994, 2000 Free Software Foundation, Inc. + Copyright 1991, 1992, 1994, 2000, 2001, 2002, 2003 + Free Software Foundation, Inc. Written by Steve Chamberlain steve@cygnus.com This file is part of GLD, the Gnu Linker. @@ -34,6 +35,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "ldfile.h" #include "ldemul.h" +static void vanilla_before_parse PARAMS ((void)); +static void vanilla_set_output_arch PARAMS ((void)); +static char *vanilla_get_script PARAMS ((int *)); + + static void vanilla_before_parse() { } @@ -74,9 +80,12 @@ struct ld_emulation_xfer_struct ld_vanilla_emulation = NULL, /* place orphan */ NULL, /* set symbols */ NULL, /* parse args */ + NULL, /* add_options */ + NULL, /* handle_option */ NULL, /* unrecognized file */ NULL, /* list options */ NULL, /* recognized file */ - NULL /* find_potential_libraries */ + NULL, /* find_potential_libraries */ + NULL /* new_vers_pattern */ }; EOF |