Replace is_archive with maybe_archive.
2010-12-05 H.J. Lu <hongjiu.lu@intel.com> * ldfile.c (ldfile_open_file_search): Check maybe_archive instead of is_archive. * emultempl/aix.em: Likewise. * emultempl/elf32.em: Likewise. * emultempl/linux.em: Likewise. * emultempl/pe.em: Likewise. * emultempl/pep.em: Likewise. * emultempl/sunos.em: Likewise. * emultempl/vms.em: Likewise. * ldlang.c (new_afile): Set maybe_archive instead of is_archive.. * ldlang.h (lang_input_statement_struct): Replace is_archive with maybe_archive.
This commit is contained in:
parent
cfac8028e4
commit
b7f95647fd
11 changed files with 36 additions and 19 deletions
12
ld/ldlang.c
12
ld/ldlang.c
|
@ -1015,7 +1015,7 @@ new_afile (const char *name,
|
|||
{
|
||||
case lang_input_file_is_symbols_only_enum:
|
||||
p->filename = name;
|
||||
p->is_archive = FALSE;
|
||||
p->maybe_archive = FALSE;
|
||||
p->real = TRUE;
|
||||
p->local_sym_name = name;
|
||||
p->just_syms_flag = TRUE;
|
||||
|
@ -1023,14 +1023,14 @@ new_afile (const char *name,
|
|||
break;
|
||||
case lang_input_file_is_fake_enum:
|
||||
p->filename = name;
|
||||
p->is_archive = FALSE;
|
||||
p->maybe_archive = FALSE;
|
||||
p->real = FALSE;
|
||||
p->local_sym_name = name;
|
||||
p->just_syms_flag = FALSE;
|
||||
p->search_dirs_flag = FALSE;
|
||||
break;
|
||||
case lang_input_file_is_l_enum:
|
||||
p->is_archive = TRUE;
|
||||
p->maybe_archive = TRUE;
|
||||
p->filename = name;
|
||||
p->real = TRUE;
|
||||
p->local_sym_name = concat ("-l", name, (const char *) NULL);
|
||||
|
@ -1039,7 +1039,7 @@ new_afile (const char *name,
|
|||
break;
|
||||
case lang_input_file_is_marker_enum:
|
||||
p->filename = name;
|
||||
p->is_archive = FALSE;
|
||||
p->maybe_archive = FALSE;
|
||||
p->real = FALSE;
|
||||
p->local_sym_name = name;
|
||||
p->just_syms_flag = FALSE;
|
||||
|
@ -1048,7 +1048,7 @@ new_afile (const char *name,
|
|||
case lang_input_file_is_search_file_enum:
|
||||
p->sysrooted = ldlang_sysrooted_script;
|
||||
p->filename = name;
|
||||
p->is_archive = FALSE;
|
||||
p->maybe_archive = FALSE;
|
||||
p->real = TRUE;
|
||||
p->local_sym_name = name;
|
||||
p->just_syms_flag = FALSE;
|
||||
|
@ -1056,7 +1056,7 @@ new_afile (const char *name,
|
|||
break;
|
||||
case lang_input_file_is_file_enum:
|
||||
p->filename = name;
|
||||
p->is_archive = FALSE;
|
||||
p->maybe_archive = FALSE;
|
||||
p->real = TRUE;
|
||||
p->local_sym_name = name;
|
||||
p->just_syms_flag = FALSE;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue