Remove startup_file from ldlang.c.

2011-01-10  H.J. Lu  <hongjiu.lu@intel.com>

	* ldlang.c (startup_file): Removed.
	(lang_startup): Updated.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e9e88989f558c4aa1d7867a739105c018eb2ddf1..be66386acc44ba19cbd8c0c6582bcf07fc84a1fa 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * ldlang.c (startup_file): Removed.
+       (lang_startup): Updated.
+
 2011-01-05  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/12364

diff --git a/ld/ldlang.c b/ld/ldlang.c
index 097c39097b4c4a65077cd8ef0d74804cc367b97b..52518049c768d1750c50519edf2540e0aae71622 100644 (file)
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -55,7 +55,6 @@ static struct obstack map_obstack;
 
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
-static const char *startup_file;
 static const char *entry_symbol_default = "start";
 static bfd_boolean placed_commons = FALSE;
 static bfd_boolean stripped_excluded_sections = FALSE;
@@ -6705,15 +6704,13 @@ lang_add_attribute (enum statement_enum attribute)
 void
 lang_startup (const char *name)
 {
-  if (startup_file != NULL)
+  if (first_file->filename != NULL)
     {
       einfo (_("%P%F: multiple STARTUP files\n"));
     }
   first_file->filename = name;
   first_file->local_sym_name = name;
   first_file->real = TRUE;
-
-  startup_file = name;
 }
 
 void