X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fas.c;h=091fe902da18ede2698b80859ade64c80ffba7d4;hb=f69656d00fe3154519ea21668d964bf8cc50c01b;hp=7b95369eb4e00119d760b9b4aaddec20223b28c7;hpb=329e276daf98fb4c8b3770a6c2f02fd22472a638;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/as.c b/gas/as.c index 7b95369eb4..091fe902da 100644 --- a/gas/as.c +++ b/gas/as.c @@ -1,40 +1,40 @@ /* as.c - GAS main program. - Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002 - Free Software Foundation, Inc. + Copyright (C) 1987-2019 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + the Free Software Foundation; either version 3, or (at your option) any later version. - GAS 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. + GAS 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. You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free - Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ /* Main program for AS; a 32-bit assembler of GNU. Understands command arguments. Has a few routines that don't fit in other modules because they are shared. - + bugs - + : initialisers Since no-one else says they will support them in future: I don't support them now. */ -#include "ansidecl.h" - #define COMMON +/* Disable code to set FAKE_LABEL_NAME in obj-multi.h, to avoid circular + reference. */ +#define INITIALIZING_EMULS + #include "as.h" #include "subsegs.h" #include "output-file.h" @@ -42,36 +42,20 @@ #include "macro.h" #include "dwarf2dbg.h" #include "dw2gencfi.h" - -#ifdef BFD_ASSEMBLER #include "bfdver.h" -#endif +#include "write.h" #ifdef HAVE_ITBL_CPU #include "itbl-ops.h" #else -#define itbl_parse(itbl_file) 1 #define itbl_init() #endif -#ifdef HAVE_SBRK -#ifdef NEED_DECLARATION_SBRK -extern PTR sbrk (); -#endif -#endif - #ifdef USING_CGEN /* Perform any cgen specific initialisation for gas. */ extern void gas_cgen_begin (void); #endif -/* Keep a record of the itbl files we read in. */ -struct itbl_file_list -{ - struct itbl_file_list *next; - char *name; -}; - /* We build a list of defsyms as we read the options, and then define them after we have initialized everything. */ struct defsym_list @@ -98,7 +82,7 @@ static enum debug_info_type (*md_debug_format_selector) (int *) = MD_DEBUG_FORMA int max_macro_nest = 100; /* argv[0] */ -char * myname; +static char * myname; /* The default obstack chunk size. If we set this to zero, the obstack code will use whatever will fit in a 4096 byte block. */ @@ -111,20 +95,41 @@ int debug_memory = 0; /* Enable verbose mode. */ int verbose = 0; -#ifdef BFD_ASSEMBLER +/* Which version of DWARF CIE to produce. This default value of -1 + indicates that this value has not been set yet, a default value is + provided in dwarf2_init. A different value can also be supplied by the + command line flag --gdwarf-cie-version, or by a target in + MD_AFTER_PARSE_ARGS. */ +int flag_dwarf_cie_version = -1; + +#if defined OBJ_ELF || defined OBJ_MAYBE_ELF +int flag_use_elf_stt_common = DEFAULT_GENERATE_ELF_STT_COMMON; +bfd_boolean flag_generate_build_notes = DEFAULT_GENERATE_BUILD_NOTES; +#endif + +/* Keep the output file. */ +static int keep_it = 0; + segT reg_section; segT expr_section; segT text_section; segT data_section; segT bss_section; -#endif /* Name of listing file. */ static char *listing_filename = NULL; static struct defsym_list *defsyms; +#ifdef HAVE_ITBL_CPU +/* Keep a record of the itbl files we read in. */ +struct itbl_file_list +{ + struct itbl_file_list *next; + char *name; +}; static struct itbl_file_list *itbl_files; +#endif static long start_time; @@ -135,7 +140,6 @@ static int flag_macro_alternate; #define EMULATION_ENVIRON "AS_EMULATION" extern struct emulation mipsbelf, mipslelf, mipself; -extern struct emulation mipsbecoff, mipslecoff, mipsecoff; extern struct emulation i386coff, i386elf, i386aout; extern struct emulation crisaout, criself; @@ -146,7 +150,8 @@ static void select_emulation_mode (int argc, char **argv) { int i; - char *p, *em = 0; + char *p; + const char *em = NULL; for (i = 1; i < argc; i++) if (!strncmp ("--em", argv[i], 4)) @@ -207,10 +212,10 @@ common_emul_init (void) if (this_emulation->fake_label_name == 0) { if (this_emulation->leading_underscore) - this_emulation->fake_label_name = "L0\001"; + this_emulation->fake_label_name = FAKE_LABEL_NAME; else /* What other parameters should we test? */ - this_emulation->fake_label_name = ".L0\001"; + this_emulation->fake_label_name = "." FAKE_LABEL_NAME; } } #endif @@ -224,15 +229,15 @@ print_version_id (void) return; printed = 1; -#ifdef BFD_ASSEMBLER - fprintf (stderr, _("GNU assembler version %s (%s) using BFD version %s"), + fprintf (stderr, _("GNU assembler version %s (%s) using BFD version %s\n"), VERSION, TARGET_ALIAS, BFD_VERSION_STRING); -#else - fprintf (stderr, _("GNU assembler version %s (%s)"), VERSION, TARGET_ALIAS); -#endif - fprintf (stderr, "\n"); } +#ifdef DEFAULT_FLAG_COMPRESS_DEBUG +enum compressed_debug_section_type flag_compress_debug + = COMPRESS_DEBUG_GABI_ZLIB; +#endif + static void show_usage (FILE * stream) { @@ -244,6 +249,7 @@ Options:\n\ Sub-options [default hls]:\n\ c omit false conditionals\n\ d omit debugging directives\n\ + g include general info\n\ h include high-level source\n\ l include assembly\n\ m include macro expansions\n\ @@ -253,14 +259,32 @@ Options:\n\ fprintf (stream, _("\ --alternate initially turn on alternate macro syntax\n")); +#ifdef DEFAULT_FLAG_COMPRESS_DEBUG + fprintf (stream, _("\ + --compress-debug-sections[={none|zlib|zlib-gnu|zlib-gabi}]\n\ + compress DWARF debug sections using zlib [default]\n")); + fprintf (stream, _("\ + --nocompress-debug-sections\n\ + don't compress DWARF debug sections\n")); +#else + fprintf (stream, _("\ + --compress-debug-sections[={none|zlib|zlib-gnu|zlib-gabi}]\n\ + compress DWARF debug sections using zlib\n")); + fprintf (stream, _("\ + --nocompress-debug-sections\n\ + don't compress DWARF debug sections [default]\n")); +#endif fprintf (stream, _("\ -D produce assembler debugging messages\n")); fprintf (stream, _("\ + --debug-prefix-map OLD=NEW\n\ + map OLD to NEW in debug information\n")); + fprintf (stream, _("\ --defsym SYM=VAL define symbol SYM to given value\n")); #ifdef USE_EMULATIONS { int i; - char *def_em; + const char *def_em; fprintf (stream, "\ --em=["); @@ -275,12 +299,36 @@ Options:\n\ emulate output (default %s)\n"), def_em); } #endif -#if defined BFD_ASSEMBLER && (defined OBJ_ELF || defined OBJ_MAYBE_ELF) +#if defined OBJ_ELF || defined OBJ_MAYBE_ELF fprintf (stream, _("\ --execstack require executable stack for this object\n")); fprintf (stream, _("\ --noexecstack don't require executable stack for this object\n")); + fprintf (stream, _("\ + --size-check=[error|warning]\n\ + ELF .size directive check (default --size-check=error)\n")); + fprintf (stream, _("\ + --elf-stt-common=[no|yes] ")); + if (DEFAULT_GENERATE_ELF_STT_COMMON) + fprintf (stream, _("(default: yes)\n")); + else + fprintf (stream, _("(default: no)\n")); + fprintf (stream, _("\ + generate ELF common symbols with STT_COMMON type\n")); + fprintf (stream, _("\ + --sectname-subst enable section name substitution sequences\n")); + + fprintf (stream, _("\ + --generate-missing-build-notes=[no|yes] ")); +#if DEFAULT_GENERATE_BUILD_NOTES + fprintf (stream, _("(default: yes)\n")); +#else + fprintf (stream, _("(default: no)\n")); #endif + fprintf (stream, _("\ + generate GNU Build notes if none are present in the input\n")); +#endif /* OBJ_ELF */ + fprintf (stream, _("\ -f skip whitespace and comment preprocessing\n")); fprintf (stream, _("\ @@ -292,6 +340,10 @@ Options:\n\ fprintf (stream, _("\ --gdwarf-2 generate DWARF2 debugging information\n")); fprintf (stream, _("\ + --gdwarf-sections generate per-function section names for DWARF line information\n")); + fprintf (stream, _("\ + --hash-size= set the hash table size close to \n")); + fprintf (stream, _("\ --help show this message and exit\n")); fprintf (stream, _("\ --target-help show target specific options\n")); @@ -310,10 +362,16 @@ Options:\n\ fprintf (stream, _("\ -nocpp ignored\n")); fprintf (stream, _("\ + -no-pad-sections do not pad the end of sections to alignment boundaries\n")); + fprintf (stream, _("\ -o OBJFILE name the object-file output OBJFILE (default a.out)\n")); fprintf (stream, _("\ -R fold data section into text section\n")); fprintf (stream, _("\ + --reduce-memory-overheads \n\ + prefer smaller memory use at the cost of longer\n\ + assembly times\n")); + fprintf (stream, _("\ --statistics print various measured statistics from execution\n")); fprintf (stream, _("\ --strip-local-absolute strip local absolute symbols\n")); @@ -327,9 +385,11 @@ Options:\n\ --warn don't suppress warnings\n")); fprintf (stream, _("\ --fatal-warnings treat warnings as errors\n")); +#ifdef HAVE_ITBL_CPU fprintf (stream, _("\ --itbl INSTTBL extend instruction set to include instructions\n\ matching the specifications defined in file INSTTBL\n")); +#endif fprintf (stream, _("\ -w ignored\n")); fprintf (stream, _("\ @@ -349,11 +409,15 @@ Options:\n\ fprintf (stream, _("\ --listing-cont-lines set the maximum number of continuation lines used\n\ for the output data column of the listing\n")); + fprintf (stream, _("\ + @FILE read options from FILE\n")); md_show_usage (stream); fputc ('\n', stream); - fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO); + + if (REPORT_BUGS_TO[0] && stream == stdout) + fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO); } /* Since it is easy to do here we interpret the special arg "-" @@ -385,15 +449,17 @@ parse_args (int * pargc, char *** pargv) /* -K is not meaningful if .word is not being hacked. */ 'K', #endif - 'L', 'M', 'R', 'W', 'Z', 'a', ':', ':', 'D', 'f', 'g', 'I', ':', 'o', ':', + 'L', 'M', 'R', 'W', 'Z', 'a', ':', ':', 'D', 'f', 'g', ':',':', 'I', ':', 'o', ':', #ifndef VMS /* -v takes an argument on VMS, so we don't make it a generic option. */ 'v', #endif 'w', 'X', +#ifdef HAVE_ITBL_CPU /* New option for extending instruction set (see also --itbl below). */ 't', ':', +#endif '\0' }; struct option *longopts; @@ -409,8 +475,8 @@ parse_args (int * pargc, char *** pargv) OPTION_DUMPCONFIG, OPTION_VERBOSE, OPTION_EMULATION, + OPTION_DEBUG_PREFIX_MAP, OPTION_DEFSYM, - OPTION_INSTTBL, OPTION_LISTING_LHS_WIDTH, OPTION_LISTING_LHS_WIDTH2, OPTION_LISTING_RHS_WIDTH, @@ -419,47 +485,78 @@ parse_args (int * pargc, char *** pargv) OPTION_GSTABS, OPTION_GSTABS_PLUS, OPTION_GDWARF2, + OPTION_GDWARF_SECTIONS, + OPTION_GDWARF_CIE_VERSION, OPTION_STRIP_LOCAL_ABSOLUTE, OPTION_TRADITIONAL_FORMAT, OPTION_WARN, OPTION_TARGET_HELP, OPTION_EXECSTACK, OPTION_NOEXECSTACK, + OPTION_SIZE_CHECK, + OPTION_ELF_STT_COMMON, + OPTION_ELF_BUILD_NOTES, + OPTION_SECTNAME_SUBST, OPTION_ALTERNATE, - OPTION_WARN_FATAL + OPTION_AL, + OPTION_HASH_TABLE_SIZE, + OPTION_REDUCE_MEMORY_OVERHEADS, + OPTION_WARN_FATAL, + OPTION_COMPRESS_DEBUG, + OPTION_NOCOMPRESS_DEBUG, + OPTION_NO_PAD_SECTIONS /* = STD_BASE + 40 */ /* When you add options here, check that they do not collide with OPTION_MD_BASE. See as.h. */ }; - + static const struct option std_longopts[] = { /* Note: commas are placed at the start of the line rather than - the end of the preceeding line so that it is simpler to + the end of the preceding line so that it is simpler to selectively add and remove lines from this list. */ {"alternate", no_argument, NULL, OPTION_ALTERNATE} + /* The entry for "a" is here to prevent getopt_long_only() from + considering that -a is an abbreviation for --alternate. This is + necessary because -a= is a valid switch but getopt would + normally reject it since --alternate does not take an argument. */ + ,{"a", optional_argument, NULL, 'a'} + /* Handle -al=. */ + ,{"al", optional_argument, NULL, OPTION_AL} + ,{"compress-debug-sections", optional_argument, NULL, OPTION_COMPRESS_DEBUG} + ,{"nocompress-debug-sections", no_argument, NULL, OPTION_NOCOMPRESS_DEBUG} + ,{"debug-prefix-map", required_argument, NULL, OPTION_DEBUG_PREFIX_MAP} ,{"defsym", required_argument, NULL, OPTION_DEFSYM} ,{"dump-config", no_argument, NULL, OPTION_DUMPCONFIG} ,{"emulation", required_argument, NULL, OPTION_EMULATION} -#if defined BFD_ASSEMBLER && (defined OBJ_ELF || defined OBJ_MAYBE_ELF) +#if defined OBJ_ELF || defined OBJ_MAYBE_ELF ,{"execstack", no_argument, NULL, OPTION_EXECSTACK} ,{"noexecstack", no_argument, NULL, OPTION_NOEXECSTACK} + ,{"size-check", required_argument, NULL, OPTION_SIZE_CHECK} + ,{"elf-stt-common", required_argument, NULL, OPTION_ELF_STT_COMMON} + ,{"sectname-subst", no_argument, NULL, OPTION_SECTNAME_SUBST} + ,{"generate-missing-build-notes", required_argument, NULL, OPTION_ELF_BUILD_NOTES} #endif ,{"fatal-warnings", no_argument, NULL, OPTION_WARN_FATAL} ,{"gdwarf-2", no_argument, NULL, OPTION_GDWARF2} /* GCC uses --gdwarf-2 but GAS uses to use --gdwarf2, so we keep it here for backwards compatibility. */ ,{"gdwarf2", no_argument, NULL, OPTION_GDWARF2} + ,{"gdwarf-sections", no_argument, NULL, OPTION_GDWARF_SECTIONS} + ,{"gdwarf-cie-version", required_argument, NULL, OPTION_GDWARF_CIE_VERSION} ,{"gen-debug", no_argument, NULL, 'g'} ,{"gstabs", no_argument, NULL, OPTION_GSTABS} ,{"gstabs+", no_argument, NULL, OPTION_GSTABS_PLUS} + ,{"hash-size", required_argument, NULL, OPTION_HASH_TABLE_SIZE} ,{"help", no_argument, NULL, OPTION_HELP} +#ifdef HAVE_ITBL_CPU /* New option for extending instruction set (see also -t above). The "-t file" or "--itbl file" option extends the basic set of valid instructions by reading "file", a text file containing a list of instruction formats. The additional opcodes and their formats are added to the built-in set of instructions, and mnemonics for new registers may also be defined. */ - ,{"itbl", required_argument, NULL, OPTION_INSTTBL} + ,{"itbl", required_argument, NULL, 't'} +#endif /* getopt allows abbreviations, so we do this to stop it from treating -k as an abbreviation for --keep-locals. Some ports use -k to enable PIC assembly. */ @@ -472,7 +569,9 @@ parse_args (int * pargc, char *** pargv) ,{"MD", required_argument, NULL, OPTION_DEPFILE} ,{"mri", no_argument, NULL, 'M'} ,{"nocpp", no_argument, NULL, OPTION_NOCPP} + ,{"no-pad-sections", no_argument, NULL, OPTION_NO_PAD_SECTIONS} ,{"no-warn", no_argument, NULL, 'W'} + ,{"reduce-memory-overheads", no_argument, NULL, OPTION_REDUCE_MEMORY_OVERHEADS} ,{"statistics", no_argument, NULL, OPTION_STATISTICS} ,{"strip-local-absolute", no_argument, NULL, OPTION_STRIP_LOCAL_ABSOLUTE} ,{"version", no_argument, NULL, OPTION_VERSION} @@ -486,7 +585,8 @@ parse_args (int * pargc, char *** pargv) dependent list. Include space for an extra NULL option and always NULL terminate. */ shortopts = concat (std_shortopts, md_shortopts, (char *) NULL); - longopts = xmalloc (sizeof (std_longopts) + md_longopts_size + sizeof (struct option)); + longopts = (struct option *) xmalloc (sizeof (std_longopts) + + md_longopts_size + sizeof (struct option)); memcpy (longopts, std_longopts, sizeof (std_longopts)); memcpy (((char *) longopts) + sizeof (std_longopts), md_longopts, md_longopts_size); memset (((char *) longopts) + sizeof (std_longopts) + md_longopts_size, @@ -497,7 +597,7 @@ parse_args (int * pargc, char *** pargv) old_argv = *pargv; /* Initialize a new argv that contains no options. */ - new_argv = xmalloc (sizeof (char *) * (old_argc + 1)); + new_argv = XNEWVEC (char *, old_argc + 1); new_argv[0] = old_argv[0]; new_argc = 1; new_argv[new_argc] = NULL; @@ -549,7 +649,7 @@ parse_args (int * pargc, char *** pargv) case 1: /* File name. */ if (!strcmp (optarg, "-")) - optarg = ""; + optarg = (char *) ""; new_argv[new_argc++] = optarg; new_argv[new_argc] = NULL; break; @@ -565,6 +665,10 @@ parse_args (int * pargc, char *** pargv) case OPTION_NOCPP: break; + case OPTION_NO_PAD_SECTIONS: + do_not_pad_sections_to_alignment = 1; + break; + case OPTION_STATISTICS: flag_print_statistics = 1; break; @@ -579,17 +683,20 @@ parse_args (int * pargc, char *** pargv) case OPTION_VERSION: /* This output is intended to follow the GNU standards document. */ -#ifdef BFD_ASSEMBLER printf (_("GNU assembler %s\n"), BFD_VERSION_STRING); -#else - printf (_("GNU assembler %s\n"), VERSION); -#endif - printf (_("Copyright 2002 Free Software Foundation, Inc.\n")); + printf (_("Copyright (C) 2019 Free Software Foundation, Inc.\n")); printf (_("\ This program is free software; you may redistribute it under the terms of\n\ -the GNU General Public License. This program has absolutely no warranty.\n")); +the GNU General Public License version 3 or later.\n\ +This program has absolutely no warranty.\n")); +#ifdef TARGET_WITH_CPU + printf (_("This assembler was configured for a target of `%s' " + "and default,\ncpu type `%s'.\n"), + TARGET_ALIAS, TARGET_WITH_CPU); +#else printf (_("This assembler was configured for a target of `%s'.\n"), TARGET_ALIAS); +#endif exit (EXIT_SUCCESS); case OPTION_EMULATION: @@ -613,6 +720,38 @@ the GNU General Public License. This program has absolutely no warranty.\n")); #endif exit (EXIT_SUCCESS); + case OPTION_COMPRESS_DEBUG: + if (optarg) + { +#if defined OBJ_ELF || defined OBJ_MAYBE_ELF + if (strcasecmp (optarg, "none") == 0) + flag_compress_debug = COMPRESS_DEBUG_NONE; + else if (strcasecmp (optarg, "zlib") == 0) + flag_compress_debug = COMPRESS_DEBUG_GABI_ZLIB; + else if (strcasecmp (optarg, "zlib-gnu") == 0) + flag_compress_debug = COMPRESS_DEBUG_GNU_ZLIB; + else if (strcasecmp (optarg, "zlib-gabi") == 0) + flag_compress_debug = COMPRESS_DEBUG_GABI_ZLIB; + else + as_fatal (_("Invalid --compress-debug-sections option: `%s'"), + optarg); +#else + as_fatal (_("--compress-debug-sections=%s is unsupported"), + optarg); +#endif + } + else + flag_compress_debug = COMPRESS_DEBUG_GABI_ZLIB; + break; + + case OPTION_NOCOMPRESS_DEBUG: + flag_compress_debug = COMPRESS_DEBUG_NONE; + break; + + case OPTION_DEBUG_PREFIX_MAP: + add_debug_prefix_map (optarg); + break; + case OPTION_DEFSYM: { char *s; @@ -624,12 +763,8 @@ the GNU General Public License. This program has absolutely no warranty.\n")); if (*s == '\0') as_fatal (_("bad defsym; format is --defsym name=value")); *s++ = '\0'; -#ifdef BFD_ASSEMBLER i = bfd_scan_vma (s, (const char **) NULL, 0); -#else - i = strtol (s, (char **) NULL, 0); -#endif - n = xmalloc (sizeof *n); + n = XNEW (struct defsym_list); n->next = defsyms; n->name = optarg; n->value = i; @@ -637,7 +772,7 @@ the GNU General Public License. This program has absolutely no warranty.\n")); } break; - case OPTION_INSTTBL: +#ifdef HAVE_ITBL_CPU case 't': { /* optarg is the name of the file containing the instruction @@ -650,7 +785,7 @@ the GNU General Public License. This program has absolutely no warranty.\n")); break; } - n = xmalloc (sizeof * n); + n = XNEW (struct itbl_file_list); n->next = itbl_files; n->name = optarg; itbl_files = n; @@ -665,17 +800,17 @@ the GNU General Public License. This program has absolutely no warranty.\n")); itbl_files->name); } break; +#endif case OPTION_DEPFILE: start_dependencies (optarg); break; case 'g': - /* Some backends, eg Alpha, use the -g switch for their own - purposes. So we check here for an explicit -g and allow + /* Some backends, eg Alpha and Mips, use the -g switch for their + own purposes. So we check here for an explicit -g and allow the backend to decide if it wants to process it. */ if ( old_argv[optind - 1][1] == 'g' - && old_argv[optind - 1][2] == 0 && md_parse_option (optc, optarg)) continue; @@ -698,6 +833,20 @@ the GNU General Public License. This program has absolutely no warranty.\n")); debug_type = DEBUG_DWARF2; break; + case OPTION_GDWARF_SECTIONS: + flag_dwarf_sections = TRUE; + break; + + case OPTION_GDWARF_CIE_VERSION: + flag_dwarf_cie_version = atoi (optarg); + /* The available CIE versions are 1 (DWARF 2), 3 (DWARF 3), and 4 + (DWARF 4 and 5). */ + if (flag_dwarf_cie_version < 1 + || flag_dwarf_cie_version == 2 + || flag_dwarf_cie_version > 4) + as_fatal (_("Invalid --gdwarf-cie-version `%s'"), optarg); + break; + case 'J': flag_signed_overflow_ok = 1; break; @@ -756,7 +905,7 @@ the GNU General Public License. This program has absolutely no warranty.\n")); flag_fatal_warnings = 1; break; -#if defined BFD_ASSEMBLER && (defined OBJ_ELF || defined OBJ_MAYBE_ELF) +#if defined OBJ_ELF || defined OBJ_MAYBE_ELF case OPTION_EXECSTACK: flag_execstack = 1; flag_noexecstack = 0; @@ -766,11 +915,52 @@ the GNU General Public License. This program has absolutely no warranty.\n")); flag_noexecstack = 1; flag_execstack = 0; break; -#endif + + case OPTION_SIZE_CHECK: + if (strcasecmp (optarg, "error") == 0) + flag_allow_nonconst_size = FALSE; + else if (strcasecmp (optarg, "warning") == 0) + flag_allow_nonconst_size = TRUE; + else + as_fatal (_("Invalid --size-check= option: `%s'"), optarg); + break; + + case OPTION_ELF_STT_COMMON: + if (strcasecmp (optarg, "no") == 0) + flag_use_elf_stt_common = 0; + else if (strcasecmp (optarg, "yes") == 0) + flag_use_elf_stt_common = 1; + else + as_fatal (_("Invalid --elf-stt-common= option: `%s'"), + optarg); + break; + + case OPTION_SECTNAME_SUBST: + flag_sectname_subst = 1; + break; + + case OPTION_ELF_BUILD_NOTES: + if (strcasecmp (optarg, "no") == 0) + flag_generate_build_notes = FALSE; + else if (strcasecmp (optarg, "yes") == 0) + flag_generate_build_notes = TRUE; + else + as_fatal (_("Invalid --generate-missing-build-notes option: `%s'"), + optarg); + break; + +#endif /* OBJ_ELF */ + case 'Z': flag_always_generate_output = 1; break; + case OPTION_AL: + listing |= LISTING_LISTING; + if (optarg) + listing_filename = xstrdup (optarg); + break; + case OPTION_ALTERNATE: optarg = old_argv [optind - 1]; while (* optarg == '-') @@ -787,6 +977,9 @@ the GNU General Public License. This program has absolutely no warranty.\n")); case 'a': if (optarg) { + if (optarg != old_argv[optind] && optarg[-1] == '=') + --optarg; + if (md_parse_option (optc, optarg) != 0) break; @@ -800,6 +993,9 @@ the GNU General Public License. This program has absolutely no warranty.\n")); case 'd': listing |= LISTING_NODEBUG; break; + case 'g': + listing |= LISTING_GENERAL; + break; case 'h': listing |= LISTING_HLL; break; @@ -858,6 +1054,24 @@ the GNU General Public License. This program has absolutely no warranty.\n")); case 'X': /* -X means treat warnings as errors. */ break; + + case OPTION_REDUCE_MEMORY_OVERHEADS: + /* The only change we make at the moment is to reduce + the size of the hash tables that we use. */ + set_gas_hash_table_size (4051); + break; + + case OPTION_HASH_TABLE_SIZE: + { + unsigned long new_size; + + new_size = strtoul (optarg, NULL, 0); + if (new_size) + set_gas_hash_table_size (new_size); + else + as_fatal (_("--hash-size needs a numeric argument")); + break; + } } } @@ -875,17 +1089,10 @@ the GNU General Public License. This program has absolutely no warranty.\n")); static void dump_statistics (void) { -#ifdef HAVE_SBRK - char *lim = (char *) sbrk (0); -#endif long run_time = get_run_time () - start_time; fprintf (stderr, _("%s: total time in assembly: %ld.%06ld\n"), myname, run_time / 1000000, run_time % 1000000); -#ifdef HAVE_SBRK - fprintf (stderr, _("%s: data size %ld\n"), - myname, (long) (lim - (char *) &environ)); -#endif subsegs_print_statistics (stderr); write_print_statistics (stderr); @@ -901,26 +1108,32 @@ dump_statistics (void) #endif } +static void +close_output_file (void) +{ + output_file_close (out_file_name); + if (!keep_it) + unlink_if_ordinary (out_file_name); +} + /* The interface between the macro code and gas expression handling. */ -static int -macro_expr (const char *emsg, int idx, sb *in, int *val) +static size_t +macro_expr (const char *emsg, size_t idx, sb *in, offsetT *val) { - char *hold; expressionS ex; sb_terminate (in); - hold = input_line_pointer; - input_line_pointer = in->ptr + idx; - expression (&ex); + temp_ilp (in->ptr + idx); + expression_and_evaluate (&ex); idx = input_line_pointer - in->ptr; - input_line_pointer = hold; + restore_ilp (); if (ex.X_op != O_constant) as_bad ("%s", emsg); - *val = (int) ex.X_add_number; + *val = ex.X_add_number; return idx; } @@ -938,44 +1151,13 @@ static void perform_an_assembly_pass (int argc, char ** argv) { int saw_a_file = 0; -#ifdef BFD_ASSEMBLER +#ifndef OBJ_MACH_O flagword applicable; #endif need_pass_2 = 0; -#ifndef BFD_ASSEMBLER -#ifdef MANY_SEGMENTS - { - unsigned int i; - for (i = SEG_E0; i < SEG_UNKNOWN; i++) - segment_info[i].fix_root = 0; - } - /* Create the three fixed ones. */ - { - segT seg; - -#ifdef TE_APOLLO - seg = subseg_new (".wtext", 0); -#else - seg = subseg_new (".text", 0); -#endif - assert (seg == SEG_E0); - seg = subseg_new (".data", 0); - assert (seg == SEG_E1); - seg = subseg_new (".bss", 0); - assert (seg == SEG_E2); -#ifdef TE_APOLLO - create_target_segments (); -#endif - } - -#else /* not MANY_SEGMENTS. */ - text_fix_root = NULL; - data_fix_root = NULL; - bss_fix_root = NULL; -#endif /* not MANY_SEGMENTS. */ -#else /* BFD_ASSEMBLER. */ +#ifndef OBJ_MACH_O /* Create the standard sections, and those the assembler uses internally. */ text_section = subseg_new (TEXT_SECTION_NAME, 0); @@ -984,25 +1166,26 @@ perform_an_assembly_pass (int argc, char ** argv) /* @@ FIXME -- we're setting the RELOC flag so that sections are assumed to have relocs, otherwise we don't find out in time. */ applicable = bfd_applicable_section_flags (stdoutput); - bfd_set_section_flags (stdoutput, text_section, + bfd_set_section_flags (text_section, applicable & (SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_READONLY)); - bfd_set_section_flags (stdoutput, data_section, + bfd_set_section_flags (data_section, applicable & (SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_DATA)); - bfd_set_section_flags (stdoutput, bss_section, applicable & SEC_ALLOC); + bfd_set_section_flags (bss_section, applicable & SEC_ALLOC); seg_info (bss_section)->bss = 1; +#endif subseg_new (BFD_ABS_SECTION_NAME, 0); subseg_new (BFD_UND_SECTION_NAME, 0); reg_section = subseg_new ("*GAS `reg' section*", 0); expr_section = subseg_new ("*GAS `expr' section*", 0); -#endif /* BFD_ASSEMBLER. */ - +#ifndef OBJ_MACH_O subseg_set (text_section, 0); +#endif /* This may add symbol table entries, which requires having an open BFD, - and sections already created, in BFD_ASSEMBLER mode. */ + and sections already created. */ md_begin (); #ifdef USING_CGEN @@ -1035,10 +1218,13 @@ perform_an_assembly_pass (int argc, char ** argv) int main (int argc, char ** argv) { + char ** argv_orig = argv; + struct stat sob; + int macro_strip_at; - int keep_it; start_time = get_run_time (); + signal_init (); #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) setlocale (LC_MESSAGES, ""); @@ -1059,6 +1245,8 @@ main (int argc, char ** argv) myname = argv[0]; xmalloc_set_program_name (myname); + expandargv (&argc, &argv); + START_PROGRESS (myname, 0); #ifndef OBJ_DEFAULT_OUTPUT_FILE_NAME @@ -1068,24 +1256,62 @@ main (int argc, char ** argv) out_file_name = OBJ_DEFAULT_OUTPUT_FILE_NAME; hex_init (); -#ifdef BFD_ASSEMBLER - bfd_init (); + if (bfd_init () != BFD_INIT_MAGIC) + as_fatal (_("libbfd ABI mismatch")); bfd_set_error_program_name (myname); -#endif #ifdef USE_EMULATIONS select_emulation_mode (argc, argv); #endif PROGRESS (1); + /* Call parse_args before any of the init/begin functions + so that switches like --hash-size can be honored. */ + parse_args (&argc, &argv); + + if (argc > 1 && stat (out_file_name, &sob) == 0) + { + int i; + + for (i = 1; i < argc; ++i) + { + struct stat sib; + + /* Check that the input file and output file are different. */ + if (stat (argv[i], &sib) == 0 + && sib.st_ino == sob.st_ino + /* POSIX emulating systems may support stat() but if the + underlying file system does not support a file serial number + of some kind then they will return 0 for the inode. So + two files with an inode of 0 may not actually be the same. + On real POSIX systems no ordinary file will ever have an + inode of 0. */ + && sib.st_ino != 0 + /* Different files may have the same inode number if they + reside on different devices, so check the st_dev field as + well. */ + && sib.st_dev == sob.st_dev) + { + const char *saved_out_file_name = out_file_name; + + /* Don't let as_fatal remove the output file! */ + out_file_name = NULL; + as_fatal (_("The input '%s' and output '%s' files are the same"), + argv[i], saved_out_file_name); + } + } + } + symbol_begin (); frag_init (); subsegs_begin (); - parse_args (&argc, &argv); read_begin (); input_scrub_begin (); expr_begin (); + /* It has to be called after dump_statistics (). */ + xatexit (close_output_file); + if (flag_print_statistics) xatexit (dump_statistics); @@ -1093,21 +1319,15 @@ main (int argc, char ** argv) #ifdef TC_I960 macro_strip_at = flag_mri; #endif -#ifdef TC_A29K - /* For compatibility with the AMD 29K family macro assembler - specification. */ - flag_macro_alternate = 1; - macro_strip_at = 1; -#endif macro_init (flag_macro_alternate, flag_mri, macro_strip_at, macro_expr); PROGRESS (1); -#ifdef BFD_ASSEMBLER output_file_create (out_file_name); - assert (stdoutput != 0); -#endif + gas_assert (stdoutput != 0); + + dot_symbol_init (); #ifdef tc_init_after_args tc_init_after_args (); @@ -1115,6 +1335,11 @@ main (int argc, char ** argv) itbl_init (); + dwarf2_init (); + + local_symbol_make (".gasversion.", absolute_section, + BFD_VERSION / 10000UL, &predefined_address_frag); + /* Now that we have fully initialized, and have created the output file, define any symbols requested by --defsym command line arguments. */ @@ -1125,6 +1350,11 @@ main (int argc, char ** argv) sym = symbol_new (defsyms->name, absolute_section, defsyms->value, &zero_address_frag); + /* Make symbols defined on the command line volatile, so that they + can be redefined inside a source file. This makes this assembler's + behaviour compatible with earlier versions, but it may not be + completely intuitive. */ + S_SET_VOLATILE (sym); symbol_table_insert (sym); next = defsyms->next; free (defsyms); @@ -1142,16 +1372,16 @@ main (int argc, char ** argv) md_end (); #endif -#if defined BFD_ASSEMBLER && (defined OBJ_ELF || defined OBJ_MAYBE_ELF) +#if defined OBJ_ELF || defined OBJ_MAYBE_ELF if ((flag_execstack || flag_noexecstack) && OUTPUT_FLAVOR == bfd_target_elf_flavour) { segT gnustack; gnustack = subseg_new (".note.GNU-stack", 0); - bfd_set_section_flags (stdoutput, gnustack, + bfd_set_section_flags (gnustack, SEC_READONLY | (flag_execstack ? SEC_CODE : 0)); - + } #endif @@ -1159,46 +1389,50 @@ main (int argc, char ** argv) assembly debugging or on behalf of the compiler, emit it now. */ dwarf2_finish (); - /* If we constructed dwarf2 .eh_frame info, either via .cfi + /* If we constructed dwarf2 .eh_frame info, either via .cfi directives from the user or by the backend, emit it now. */ cfi_finish (); - if (seen_at_least_1_file () - && (flag_always_generate_output || had_errors () == 0)) - keep_it = 1; - else - keep_it = 0; - -#if defined (BFD_ASSEMBLER) || !defined (BFD) - /* This used to be done at the start of write_object_file in - write.c, but that caused problems when doing listings when - keep_it was zero. This could probably be moved above md_end, but - I didn't want to risk the change. */ - subsegs_finish (); -#endif + keep_it = 0; + if (seen_at_least_1_file ()) + { + int n_warns, n_errs; + char warn_msg[50]; + char err_msg[50]; - if (keep_it) - write_object_file (); + write_object_file (); -#ifndef NO_LISTING - listing_print (listing_filename); -#endif + n_warns = had_warnings (); + n_errs = had_errors (); -#ifndef OBJ_VMS /* Does its own file handling. */ -#ifndef BFD_ASSEMBLER - if (keep_it) -#endif - output_file_close (out_file_name); -#endif + sprintf (warn_msg, + ngettext ("%d warning", "%d warnings", n_warns), n_warns); + sprintf (err_msg, + ngettext ("%d error", "%d errors", n_errs), n_errs); + if (flag_fatal_warnings && n_warns != 0) + { + if (n_errs == 0) + as_bad (_("%s, treating warnings as errors"), warn_msg); + n_errs += n_warns; + } - if (flag_fatal_warnings && had_warnings () > 0 && had_errors () == 0) - as_bad (_("%d warnings, treating warnings as errors"), had_warnings ()); + if (n_errs == 0) + keep_it = 1; + else if (flag_always_generate_output) + { + /* The -Z flag indicates that an object file should be generated, + regardless of warnings and errors. */ + keep_it = 1; + fprintf (stderr, _("%s, %s, generating bad object file\n"), + err_msg, warn_msg); + } + } - if (had_errors () > 0 && ! flag_always_generate_output) - keep_it = 0; + fflush (stderr); - if (!keep_it) - unlink (out_file_name); +#ifndef NO_LISTING + listing_print (listing_filename, argv_orig); +#endif input_scrub_end (); @@ -1206,7 +1440,7 @@ main (int argc, char ** argv) /* Use xexit instead of return, because under VMS environments they may not place the same interpretation on the value given. */ - if (had_errors () > 0) + if (had_errors () != 0) xexit (EXIT_FAILURE); /* Only generate dependency file if assembler was successful. */