diff options
Diffstat (limited to 'contrib/binutils/ld/ldfile.c')
-rw-r--r-- | contrib/binutils/ld/ldfile.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/contrib/binutils/ld/ldfile.c b/contrib/binutils/ld/ldfile.c index 0e4d0ec..655ee60 100644 --- a/contrib/binutils/ld/ldfile.c +++ b/contrib/binutils/ld/ldfile.c @@ -24,6 +24,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "bfd.h" #include "sysdep.h" #include "bfdlink.h" +#include "safe-ctype.h" #include "ld.h" #include "ldmisc.h" #include "ldexp.h" @@ -35,8 +36,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "ldemul.h" #include "libiberty.h" -#include <ctype.h> - const char *ldfile_input_filename; boolean ldfile_assumed_script = false; const char *ldfile_output_machine_name = ""; @@ -80,6 +79,9 @@ ldfile_add_library_path (name, cmdline) { search_dirs_type *new; + if (!cmdline && config.only_cmd_line_lib_dirs) + return; + new = (search_dirs_type *) xmalloc (sizeof (search_dirs_type)); new->next = NULL; new->name = name; @@ -190,7 +192,7 @@ ldfile_open_file_search (arch, entry, lib, suffix) else if (entry->filename[0] == '/' || entry->filename[0] == '.' #if defined (__MSDOS__) || defined (_WIN32) || entry->filename[0] == '\\' - || (isalpha (entry->filename[0]) + || (ISALPHA (entry->filename[0]) && entry->filename[1] == ':') #endif ) @@ -350,7 +352,8 @@ ldfile_open_command_file (name) ldfile_input_filename = name; lineno = 1; - had_script = true; + + saved_script_handle = ldlex_input_stack; } #ifdef GNU960 @@ -425,8 +428,7 @@ ldfile_add_arch (in_name) new->next = (search_arch_type *) NULL; while (*name) { - if (isupper ((unsigned char) *name)) - *name = tolower ((unsigned char) *name); + *name = TOLOWER (*name); name++; } *search_arch_tail_ptr = new; |