diff options
author | Ian Lance Taylor <ian@airs.com> | 1993-12-30 19:51:41 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@airs.com> | 1993-12-30 19:51:41 +0000 |
commit | 4a6afc88bb00a7da893e2437d1d3c068c435a85e (patch) | |
tree | 7c15b83d41350f8d615b564bb20f9c52093f8dcf /ld/ldgram.y | |
parent | 9a0418eb7b625b7381965fd850786e06e34e1816 (diff) | |
download | binutils-4a6afc88bb00a7da893e2437d1d3c068c435a85e.zip binutils-4a6afc88bb00a7da893e2437d1d3c068c435a85e.tar.gz binutils-4a6afc88bb00a7da893e2437d1d3c068c435a85e.tar.bz2 |
A major rewrite to move the bulk of the linker into BFD so that
more efficient backend code can be written for specific object
files.
* lderror.c, lderror.h, ldindr.c, ldindr.h, ldsym.c, ldsym.h,
ldwarn.c, ldwarn.h, relax.c, relax.h: Removed.
* ldctor.c, ldctor.h: Complete rewrite.
* ldwrite.c, ldwrite.h: Complete rewrite.
* ld.h (strip_symbols_type, strip_symbols): Removed. Use
link_info.strip instead. Changed all uses.
(discard_locals_type, discard_locals): Removed. Use
link_info.discard instead. Changed all uses.
(ld_config_type): Removed relocateable_output field; use
link_info.relocateable instead; changed all uses. Added stats
field.
(set_asymbol_chain, get_asymbol_chain, get_loader_symbol,
set_loader_symbol): Removed.
* ldexp.h (node_class): Added etree_rel.
(etree_type): Added rel field.
* ldexp.c (exp_print_token): Bracketed table initialization.
(exp_relop): New function.
(fold_name): Use linker hash table rather than ldsym functions.
(exp_fold_tree): Likewise. Also, handle etree_rel case.
(exp_print_tree): Handle etree_rel.
* ldgram.y (strip_symbols, discard_locals): Removed.
(OPTION_stats, OPTION_no_keep_memory): New tokens. Handle them.
(REL): New token. Does not appear in grammar, but needed for
expression code.
(file): Don't call lang_final; it's called by main anyhow.
* ldlex.l: Accept -stats and -no-keep-memory options.
* ldlang.h (fill_type): Make unsigned int, not unsigned short.
* ldlang.c: Consistently use fill_type for fill argument.
(lang_init_script_file, script_file): Removed.
(create_object_symbols): Removed. Use
link_info.create_object_symbols_section instead. Changed all
uses.
(lang_add_keepsyms_file): Removed.
(lookup_name): Call bfd_link_add_symbols instead of
ldmain_open_file_read_symbol.
(wild): Don't iterate over script_file.
(open_output): Create link hash table.
(lang_place_undefineds): Rewrote.
(lang_size_sections): Handle relaxing (doesn't work yet).
(lang_relocate_globals): Removed.
(lang_finish): Use link hash table rather than ldsym functions.
(lang_common): Rewrote.
(lang_one_common): New function.
(ldlang_add_file): Add file to link_info.input_bfds list. Set
usrdata.
(create_symbol): Removed.
(lang_process): Don't call lang_init_script_file. Call
ldctor_build_sets rather than find_constructors. Don't call
lang_relocate_globals.
(lang_abs_symbol_at_beginning_of): Rewrote.
(lang_abs_symbol_at_end_of): Rewrote.
* ldmain.c (had_y): Removed.
(lprefix, lprefix_len): Removed; use link_info fields instead.
Changed all uses.
(multiple_def_count, commons_pending, undefined_global_sym_count,
total_symbols_seen, total_files_seen): Removed.
(link_callbacks, link_info): New variables.
(main): Initialize link_info. Don't call init_bfd_error_vector or
ldsym_init. Don't set now unused variables. Handle -stats.
(get_emulation): Removed obsolete and nonfunctional GNU960 code.
(add_ysym): Rewrote.
(read_entry_symbols, refize, enter_global_ref, enter_file_symbols,
search_library, gnu960_check_format, decode_library_subfile,
linear_library, symdef_library, clear_syms, subfile_wanted_p):
Removed.
(add_keepsyms_file, add_archive_element, multiple_definition,
multiple_common, add_to_set, warning_callback, undefined_symbol,
reloc_overflow, reloc_dangerous, unattached_reloc, notice_ysym):
New functions.
* ldmisc.c (vfinfo): Accept a string for %T, not a symbol. Don't
require symbols for %C; look them up instead.
* emultempl/hppaosf.em: Pass link_info to
hppa_look_for_stubs_in_section.
* Makefile.in: Rebuilt dependencies.
(CFILES): Removed lderror.c, ldindr.c, ldsym.c, ldwarn.c, and
relax.c.
(HFILES): Removed lderror.h, ldindr.h, ldsym.h, ldwarn.h, and
relax.h.
(EMULATION_OFILES): Depend on bfdlink.h, ldmain.h, ldexp.h,
ldlang.h and ldctor.h.
* Makefile.in (ldlex.c): Don't depend on ldgram.h. Remove
declarations of free and malloc from flex output. Change malloc
to ldmalloc in flex output.
Diffstat (limited to 'ld/ldgram.y')
-rw-r--r-- | ld/ldgram.y | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/ld/ldgram.y b/ld/ldgram.y index d5726d1..705d739 100644 --- a/ld/ldgram.y +++ b/ld/ldgram.y @@ -1,5 +1,5 @@ /* A YACC grammer to parse a superset of the AT&T linker scripting languaue. - Copyright (C) 1991 Free Software Foundation, Inc. + Copyright (C) 1991, 1993 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support (steve@cygnus.com). This file is part of GNU ld. @@ -27,6 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "bfd.h" #include "sysdep.h" +#include "bfdlink.h" #include "ld.h" #include "ldexp.h" #include "ldver.h" @@ -34,7 +35,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "ldemul.h" #include "ldfile.h" #include "ldmisc.h" -#include "ldsym.h" #include "ldmain.h" #include "mri.h" #include "ldlex.h" @@ -42,8 +42,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define YYDEBUG 1 static int typebits; -strip_symbols_type strip_symbols=STRIP_NONE; -discard_locals_type discard_locals=DISCARD_NONE; static char *dirlist_ptr; @@ -133,7 +131,7 @@ static int error_index; %token LENGTH CREATE_OBJECT_SYMBOLS INPUT OUTPUT CONSTRUCTORS %token OPTION_RETAIN_SYMBOLS_FILE ALIGNMOD AT %token OPTION_Qy OPTION_Y OPTION_dn OPTION_call_shared OPTION_non_shared -%token OPTION_Oval +%token OPTION_Oval OPTION_stats OPTION_no_keep_memory %token <name> OPTION_YP %type <token> assign_op @@ -142,11 +140,11 @@ static int error_index; %token CHIP LIST SECT ABSOLUTE LOAD NEWLINE ENDWORD ORDER NAMEWORD -%token FORMAT PUBLIC DEFSYMEND BASE ALIAS TRUNCATE +%token FORMAT PUBLIC DEFSYMEND BASE ALIAS TRUNCATE REL %% -file: command_line { lang_final(); }; +file: command_line filename: NAME; @@ -206,23 +204,28 @@ command_line_option: config.magic_demand_paged = false; } | OPTION_s { - strip_symbols = STRIP_ALL; + link_info.strip = strip_all; } | OPTION_S { - strip_symbols = STRIP_DEBUGGER; + link_info.strip = strip_debugger; } + | OPTION_stats { + config.stats = true; + } + | OPTION_no_keep_memory { + link_info.keep_memory = false; + } | OPTION_u NAME { ldlang_add_undef($2); } - | OPTION_r { - config.relocateable_output = true; + link_info.relocateable = true; config.build_constructors = false; config.magic_demand_paged = false; config.text_read_only = false; } | OPTION_Ur { - config.relocateable_output = true; + link_info.relocateable = true; config.build_constructors = true; config.magic_demand_paged = false; config.text_read_only = false; @@ -235,10 +238,10 @@ command_line_option: { lang_add_entry($2); } | OPTION_X { - discard_locals = DISCARD_L; + link_info.discard = discard_l; } | OPTION_x { - discard_locals = DISCARD_ALL; + link_info.discard = discard_all; } | OPTION_noinhibit_exec @@ -343,7 +346,7 @@ command_line_option: lang_add_assignment(exp_assop($4,$3,$5)); } | OPTION_RETAIN_SYMBOLS_FILE filename - { lang_add_keepsyms_file ($2); } + { add_keepsyms_file ($2); } | OPTION_EB { /* FIXME: This is currently ignored. It means @@ -380,21 +383,20 @@ command_line_option: einfo ("%P%F: unknown -Y option -- %s\n", $2); else { - char *p = ""; + char *p; dirlist_ptr = $2; set_default_dirlist: - while (p != 0) + while (1) { p = strchr (dirlist_ptr, ':'); - if (p) + if (p != NULL) *p = 0; if (*dirlist_ptr) ldfile_add_library_path (dirlist_ptr); - if (p) - { - *p = ':'; - dirlist_ptr = p + 1; - } + if (p == NULL) + break; + *p = ':'; + dirlist_ptr = p + 1; } } } @@ -463,11 +465,11 @@ mri_script_command: | ALIAS NAME ',' NAME { mri_alias($2,$4,0);} | ALIAS NAME ',' INT - { mri_alias($2,0,$4);} + { mri_alias($2,0,(int) $4);} | BASE exp { mri_base($2); } | TRUNCATE INT - { mri_truncate($2); } + { mri_truncate((unsigned int) $2); } | ; @@ -609,7 +611,7 @@ statement: | input_section_spec | length '(' exp ')' { - lang_add_data($1,$3); + lang_add_data((int) $1,$3); } | FILL '(' exp ')' @@ -782,7 +784,7 @@ exp : | '(' exp ')' { $$ = $2; } | NEXT '(' exp ')' %prec UNARY - { $$ = exp_unop($1,$3); } + { $$ = exp_unop((int) $1,$3); } | '!' exp %prec UNARY { $$ = exp_unop('!', $2); } | '+' exp %prec UNARY |