Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Replace is_archive with maybe_archive.

Browse Source 
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:
H.J. Lu
2010-12-06 00:07:06 +00:00
parent cfac8028e4
commit b7f95647fd
11 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ld/ldfile.c
View File

@@ -370,7 +370,7 @@ ldfile_open_file_search (const char *arch,
/* If this is not an archive, try to open it in the current
directory first. */
if (! entry->is_archive)
if (! entry->maybe_archive)
{
if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
{
@@ -407,7 +407,7 @@ ldfile_open_file_search (const char *arch,
}
}
if (entry->is_archive)
if (entry->maybe_archive)
string = concat (search->name, slash, lib, entry->filename,
arch, suffix, (const char *) NULL);
else