Fix formatting and add missing new lkine at end of error message
This commit is contained in:
Nick Clifton
parent
9a736b6b4d
commit
1c64c4ed86
2 changed files with 72 additions and 64 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2000-07-11 Kazu Hirata <kazu@hxi.com>
|
||||
|
||||
* ldfile.c (ldfile_try_open_bfd): Output '\n' after an error
|
||||
message.
|
||||
|
||||
2000-07-10 Alan Modra <alan@linuxcare.com.au>
|
||||
|
||||
* ldemul.h (struct lang_input_statement_struct): Remove forward
|
||||
|
|
|
|||
63
ld/ldfile.c
63
ld/ldfile.c
|
|
@ -19,12 +19,7 @@ along with GLD; see the file COPYING. If not, write to the Free
|
|||
Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
||||
02111-1307, USA. */
|
||||
|
||||
/*
|
||||
ldfile.c
|
||||
|
||||
look after all the file stuff
|
||||
|
||||
*/
|
||||
/* ldfile.c: look after all the file stuff. */
|
||||
|
||||
#include "bfd.h"
|
||||
#include "sysdep.h"
|
||||
|
|
@ -137,7 +132,7 @@ ldfile_try_open_bfd (attempt, entry)
|
|||
return true;
|
||||
if (bfd_arch_get_compatible (check, output_bfd) == NULL)
|
||||
{
|
||||
einfo (_("%P: skipping incompatible %s when searching for %s"),
|
||||
einfo (_("%P: skipping incompatible %s when searching for %s\n"),
|
||||
attempt, entry->local_sym_name);
|
||||
bfd_close (entry->the_bfd);
|
||||
entry->the_bfd = NULL;
|
||||
|
|
@ -252,6 +247,7 @@ ldfile_open_file (entry)
|
|||
if (ldemul_find_potential_libraries (arch->name, entry))
|
||||
return;
|
||||
}
|
||||
|
||||
einfo (_("%F%P: cannot find %s\n"), entry->local_sym_name);
|
||||
}
|
||||
}
|
||||
|
|
@ -267,6 +263,7 @@ try_open (name, exten)
|
|||
char buff[1000];
|
||||
|
||||
result = fopen (name, "r");
|
||||
|
||||
if (trace_file_tries)
|
||||
{
|
||||
if (result == NULL)
|
||||
|
|
@ -282,6 +279,7 @@ try_open (name, exten)
|
|||
{
|
||||
sprintf (buff, "%s%s", name, exten);
|
||||
result = fopen (buff, "r");
|
||||
|
||||
if (trace_file_tries)
|
||||
{
|
||||
if (result == NULL)
|
||||
|
|
@ -308,16 +306,21 @@ ldfile_find_command_file (name, extend)
|
|||
|
||||
/* First try raw name */
|
||||
result = try_open (name, "");
|
||||
if (result == (FILE *)NULL) {
|
||||
if (result == (FILE *)NULL)
|
||||
{
|
||||
/* Try now prefixes */
|
||||
for (search = search_head;
|
||||
search != (search_dirs_type *)NULL;
|
||||
search = search->next) {
|
||||
search = search->next)
|
||||
{
|
||||
sprintf (buffer,"%s%s%s", search->name, slash, name);
|
||||
|
||||
result = try_open (buffer, extend);
|
||||
if (result)break;
|
||||
if (result)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -328,10 +331,12 @@ ldfile_open_command_file (name)
|
|||
FILE *ldlex_input_stack;
|
||||
ldlex_input_stack = ldfile_find_command_file (name, "");
|
||||
|
||||
if (ldlex_input_stack == (FILE *)NULL) {
|
||||
if (ldlex_input_stack == (FILE *)NULL)
|
||||
{
|
||||
bfd_set_error (bfd_error_system_call);
|
||||
einfo (_("%P%F: cannot open linker script file %s: %E\n"), name);
|
||||
}
|
||||
|
||||
lex_push_file (ldlex_input_stack, name);
|
||||
|
||||
ldfile_input_filename = name;
|
||||
|
|
@ -339,18 +344,14 @@ ldfile_open_command_file (name)
|
|||
had_script = true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#ifdef GNU960
|
||||
static
|
||||
char *
|
||||
static char *
|
||||
gnu960_map_archname (name)
|
||||
char *name;
|
||||
{
|
||||
struct tabentry { char *cmd_switch; char *arch; };
|
||||
static struct tabentry arch_tab[] = {
|
||||
static struct tabentry arch_tab[] =
|
||||
{
|
||||
"", "",
|
||||
"KA", "ka",
|
||||
"KB", "kb",
|
||||
|
|
@ -364,20 +365,18 @@ char *name;
|
|||
struct tabentry *tp;
|
||||
|
||||
|
||||
for ( tp = arch_tab; tp->cmd_switch != NULL; tp++ ){
|
||||
if ( !strcmp(name,tp->cmd_switch) ){
|
||||
for (tp = arch_tab; tp->cmd_switch != NULL; tp++)
|
||||
{
|
||||
if (! strcmp (name,tp->cmd_switch))
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ( tp->cmd_switch == NULL ){
|
||||
if (tp->cmd_switch == NULL)
|
||||
einfo (_("%P%F: unknown architecture: %s\n"),name);
|
||||
}
|
||||
|
||||
return tp->arch;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void
|
||||
ldfile_add_arch (name)
|
||||
char *name;
|
||||
|
|
@ -386,11 +385,14 @@ char *name;
|
|||
(search_arch_type *)xmalloc ((bfd_size_type)(sizeof (search_arch_type)));
|
||||
|
||||
|
||||
if (*name != '\0') {
|
||||
if (ldfile_output_machine_name[0] != '\0') {
|
||||
if (*name != '\0')
|
||||
{
|
||||
if (ldfile_output_machine_name[0] != '\0')
|
||||
{
|
||||
einfo (_("%P%F: target architecture respecified\n"));
|
||||
return;
|
||||
}
|
||||
|
||||
ldfile_output_machine_name = name;
|
||||
}
|
||||
|
||||
|
|
@ -398,7 +400,6 @@ char *name;
|
|||
new->name = gnu960_map_archname (name);
|
||||
*search_arch_tail_ptr = new;
|
||||
search_arch_tail_ptr = &new->next;
|
||||
|
||||
}
|
||||
|
||||
#else /* not GNU960 */
|
||||
|
|
@ -435,12 +436,14 @@ ldfile_set_output_arch (string)
|
|||
{
|
||||
const bfd_arch_info_type *arch = bfd_scan_arch (string);
|
||||
|
||||
if (arch) {
|
||||
if (arch)
|
||||
{
|
||||
ldfile_output_architecture = arch->arch;
|
||||
ldfile_output_machine = arch->mach;
|
||||
ldfile_output_machine_name = arch->printable_name;
|
||||
}
|
||||
else {
|
||||
else
|
||||
{
|
||||
einfo (_("%P%F: cannot represent machine `%s'\n"), string);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue