Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/external/gpl3/binutils.old/dist/ld/emultempl/aix.em,v rcsdiff: /ftp/cvs/cvsroot/src/external/gpl3/binutils.old/dist/ld/emultempl/aix.em,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.1.1.3 retrieving revision 1.1.1.4 diff -u -p -r1.1.1.3 -r1.1.1.4 --- src/external/gpl3/binutils.old/dist/ld/emultempl/aix.em 2018/04/14 15:37:11 1.1.1.3 +++ src/external/gpl3/binutils.old/dist/ld/emultempl/aix.em 2020/04/03 17:41:44 1.1.1.4 @@ -9,7 +9,7 @@ fragment < AIX support by Ian Lance Taylor AIX 64 bit support by Tom Rix @@ -320,7 +320,7 @@ read_file_list (const char *filename) f = fopen (filename, FOPEN_RT); if (f == NULL) { - einfo ("%F%P: cannot open %s\n", filename); + einfo (_("%F%P: cannot open %s\n"), filename); return; } if (fseek (f, 0L, SEEK_END) == -1) @@ -345,29 +345,29 @@ read_file_list (const char *filename) { /* Skip empty lines. */ while (*b == '\n' || *b == '\r') - b++; + b++; /* Stop if end of buffer. */ if (b == buffer + len) - break; + break; /* Eat any byte until end of line. */ for (e = b; *e != '\0'; e++) - if (*e == '\n' || *e == '\r') - break; + if (*e == '\n' || *e == '\r') + break; /* Replace end of line by nul. */ if (*e != '\0') - *e++ = '\0'; + *e++ = '\0'; if (b != e) - lang_add_input_file (b, lang_input_file_is_search_file_enum, NULL); + lang_add_input_file (b, lang_input_file_is_search_file_enum, NULL); b = e; } return; error: - einfo ("%F%P: cannot read %s\n", optarg); + einfo (_("%F%P: cannot read %s\n"), optarg); fclose (f); } @@ -388,14 +388,14 @@ gld${EMULATION_NAME}_handle_option (int case 'f': /* This overrides --auxiliary. This option specifies a file containing - a list of input files. */ + a list of input files. */ read_file_list (optarg); break; case 'D': val = bfd_scan_vma (optarg, &end, 0); if (*end != '\0') - einfo ("%P: warning: ignoring invalid -D number %s\n", optarg); + einfo (_("%P: warning: ignoring invalid -D number %s\n"), optarg); else if (val != -1) lang_section_start (".data", exp_intop (val), NULL); break; @@ -403,7 +403,7 @@ gld${EMULATION_NAME}_handle_option (int case 'H': val = bfd_scan_vma (optarg, &end, 0); if (*end != '\0' || (val & (val - 1)) != 0) - einfo ("%P: warning: ignoring invalid -H number %s\n", optarg); + einfo (_("%P: warning: ignoring invalid -H number %s\n"), optarg); else file_align = val; break; @@ -515,7 +515,8 @@ gld${EMULATION_NAME}_handle_option (int case OPTION_MAXDATA: val = bfd_scan_vma (optarg, &end, 0); if (*end != '\0') - einfo ("%P: warning: ignoring invalid -bmaxdata number %s\n", optarg); + einfo (_("%P: warning: ignoring invalid -bmaxdata number %s\n"), + optarg); else maxdata = val; break; @@ -523,7 +524,7 @@ gld${EMULATION_NAME}_handle_option (int case OPTION_MAXSTACK: val = bfd_scan_vma (optarg, &end, 0); if (*end != '\0') - einfo ("%P: warning: ignoring invalid -bmaxstack number %s\n", + einfo (_("%P: warning: ignoring invalid -bmaxstack number %s\n"), optarg); else maxstack = val; @@ -536,7 +537,7 @@ gld${EMULATION_NAME}_handle_option (int ++optarg; } if (*optarg == '\0' || optarg[1] == '\0') - einfo ("%P: warning: ignoring invalid module type %s\n", optarg); + einfo (_("%P: warning: ignoring invalid module type %s\n"), optarg); else modtype = (*optarg << 8) | optarg[1]; break; @@ -566,7 +567,7 @@ gld${EMULATION_NAME}_handle_option (int expression. */ val = bfd_scan_vma (optarg, &end, 0); if (*end != '\0') - einfo ("%P: warning: ignoring invalid -pD number %s\n", optarg); + einfo (_("%P: warning: ignoring invalid -pD number %s\n"), optarg); else { etree_type *t; @@ -589,7 +590,7 @@ gld${EMULATION_NAME}_handle_option (int within the file. */ val = bfd_scan_vma (optarg, &end, 0); if (*end != '\0') - einfo ("%P: warning: ignoring invalid -pT number %s\n", optarg); + einfo (_("%P: warning: ignoring invalid -pT number %s\n"), optarg); else { etree_type *t; @@ -718,7 +719,7 @@ gld${EMULATION_NAME}_after_open (void) size = (p->count + 2) * 4; if (!bfd_xcoff_link_record_set (link_info.output_bfd, &link_info, p->h, size)) - einfo ("%F%P: bfd_xcoff_link_record_set failed: %E\n"); + einfo (_("%F%P: bfd_xcoff_link_record_set failed: %E\n")); } } @@ -748,9 +749,9 @@ gld${EMULATION_NAME}_before_allocation ( h = bfd_link_hash_lookup (link_info.hash, el->name, FALSE, FALSE, FALSE); if (h == NULL) - einfo ("%P%F: bfd_link_hash_lookup of export symbol failed: %E\n"); + einfo (_("%F%P: bfd_link_hash_lookup of export symbol failed: %E\n")); if (!bfd_xcoff_export_symbol (link_info.output_bfd, &link_info, h)) - einfo ("%P%F: bfd_xcoff_export_symbol failed: %E\n"); + einfo (_("%F%P: bfd_xcoff_export_symbol failed: %E\n")); } /* Track down all relocations called for by the linker script (these @@ -834,7 +835,7 @@ gld${EMULATION_NAME}_before_allocation ( maxstack, maxdata, gc && !unix_ld ? TRUE : FALSE, modtype, textro ? TRUE : FALSE, flags, special_sections, rtld ? TRUE : FALSE)) - einfo ("%P%F: failed to set dynamic section sizes: %E\n"); + einfo (_("%F%P: failed to set dynamic section sizes: %E\n")); /* Look through the special sections, and put them in the right place in the link ordering. This is especially magic. */ @@ -856,7 +857,7 @@ gld${EMULATION_NAME}_before_allocation ( is = NULL; os = lang_output_section_get (sec->output_section); if (os == NULL) - einfo ("%P%F: can't find output section %s\n", + einfo (_("%F%P: can't find output section %s\n"), sec->output_section->name); for (pls = &os->children.head; *pls != NULL; pls = &(*pls)->header.next) @@ -893,7 +894,7 @@ gld${EMULATION_NAME}_before_allocation ( if (is == NULL) { - einfo ("%P%F: can't find %s in output section\n", + einfo (_("%F%P: can't find %s in output section\n"), bfd_get_section_name (sec->owner, sec)); } @@ -961,7 +962,8 @@ gld${EMULATION_NAME}_before_allocation ( sec = bfd_get_section_by_name (link_info.output_bfd, must_keep_sections[i]); if (sec == NULL) - einfo ("%P: can't find required output section %s\n", must_keep_sections[i]); + einfo (_("%P: can't find required output section %s\n"), + must_keep_sections[i]); else sec->flags |= SEC_KEEP; } @@ -1107,7 +1109,7 @@ gld${EMULATION_NAME}_read_file (const ch if (f == NULL) { bfd_set_error (bfd_error_system_call); - einfo ("%F%s: %E\n", filename); + einfo ("%F%P: %s: %E\n", filename); return; } @@ -1169,7 +1171,8 @@ gld${EMULATION_NAME}_read_file (const ch obstack_free (o, obstack_base (o)); } else if (*s == '(') - einfo ("%F%s%d: #! ([member]) is not supported in import files\n", + einfo (_("%F%P:%s:%d: #! ([member]) is not supported " + "in import files\n"), filename, lineno); else { @@ -1185,7 +1188,7 @@ gld${EMULATION_NAME}_read_file (const ch *s = '\0'; if (!bfd_xcoff_split_import_path (link_info.output_bfd, start, &imppath, &impfile)) - einfo ("%F%P: Could not parse import path: %E\n"); + einfo (_("%F%P: could not parse import path: %E\n")); while (ISSPACE (cs)) { ++s; @@ -1195,7 +1198,7 @@ gld${EMULATION_NAME}_read_file (const ch { impmember = ""; if (cs != '\0') - einfo ("%s:%d: warning: syntax error in import file\n", + einfo (_("%P:%s:%d: warning: syntax error in import file\n"), filename, lineno); } else @@ -1207,7 +1210,7 @@ gld${EMULATION_NAME}_read_file (const ch if (*s == ')') *s = '\0'; else - einfo ("%s:%d: warning: syntax error in import file\n", + einfo (_("%P:%s:%d: warning: syntax error in import file\n"), filename, lineno); } } @@ -1242,7 +1245,8 @@ gld${EMULATION_NAME}_read_file (const ch while (ISSPACE (*se)) ++se; if (*se != '\0') - einfo ("%s%d: warning: syntax error in import/export file\n", + einfo (_("%P:%s%d: warning: syntax error in " + "import/export file\n"), filename, lineno); } @@ -1259,7 +1263,8 @@ gld${EMULATION_NAME}_read_file (const ch address = bfd_scan_vma (s, &end, 0); if (*end != '\0') { - einfo ("%s:%d: warning: syntax error in import/export file\n", + einfo (_("%P:%s:%d: warning: syntax error in " + "import/export file\n"), filename, lineno); } @@ -1293,7 +1298,7 @@ gld${EMULATION_NAME}_read_file (const ch &link_info, h, address, imppath, impfile, impmember, syscall_flag)) - einfo ("%X%s:%d: failed to import symbol %s: %E\n", + einfo (_("%X%P:%s:%d: failed to import symbol %s: %E\n"), filename, lineno, symname); } } @@ -1303,7 +1308,7 @@ gld${EMULATION_NAME}_read_file (const ch if (obstack_object_size (o) > 0) { - einfo ("%s:%d: warning: ignoring unterminated last line\n", + einfo (_("%P:%s:%d: warning: ignoring unterminated last line\n"), filename, lineno); obstack_free (o, obstack_base (o)); } @@ -1338,10 +1343,10 @@ gld${EMULATION_NAME}_find_relocs (lang_s rs = &s->reloc_statement; if (rs->name == NULL) - einfo ("%F%P: only relocations against symbols are permitted\n"); + einfo (_("%F%P: only relocations against symbols are permitted\n")); if (!bfd_xcoff_link_count_reloc (link_info.output_bfd, &link_info, rs->name)) - einfo ("%F%P: bfd_xcoff_link_count_reloc failed: %E\n"); + einfo (_("%F%P: bfd_xcoff_link_count_reloc failed: %E\n")); } if (s->header.type == lang_assignment_statement_enum) @@ -1369,7 +1374,7 @@ gld${EMULATION_NAME}_find_exp_assignment if (!bfd_xcoff_record_link_assignment (link_info.output_bfd, &link_info, exp->assign.dst)) - einfo ("%P%F: failed to record assignment to %s: %E\n", + einfo (_("%F%P: failed to record assignment to %s: %E\n"), exp->assign.dst); } gld${EMULATION_NAME}_find_exp_assignment (exp->assign.src); @@ -1467,7 +1472,7 @@ gld${EMULATION_NAME}_create_output_secti bfd_get_arch (link_info.output_bfd), bfd_get_mach (link_info.output_bfd))) { - einfo ("%X%P: can not create BFD %E\n"); + einfo (_("%F%P: can not create BFD: %E\n")); return; } @@ -1477,7 +1482,7 @@ gld${EMULATION_NAME}_create_output_secti link_info.fini_function, rtld)) { - einfo ("%X%P: can not create BFD %E\n"); + einfo (_("%F%P: can not create BFD: %E\n")); return; } @@ -1534,6 +1539,7 @@ struct ld_emulation_xfer_struct ld_${EMU hll_default, after_parse_default, gld${EMULATION_NAME}_after_open, + after_check_relocs_default, after_allocation_default, gld${EMULATION_NAME}_set_output_arch, gld${EMULATION_NAME}_choose_target,