* ldexp.c (exp_get_vma, exp_get_fill): Canonicalise error messages.

	* lexsup.c (ld_options): Don't use tabs in help text.
	* emultempl/armcoff.em (gld${EMULATION_NAME}_finish): Fix typo.
	* emultempl/pe.em (gld${EMULATION_NAME}_finish): Fix typo.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 87a20c7c01ce7be3709f506c60a9736886169c04..8702b032ec472b835bdffc0943296977faf50c2e 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-17  Alan Modra  <amodra@bigpond.net.au>
+
+       * ldexp.c (exp_get_vma, exp_get_fill): Canonicalise error messages.
+       * lexsup.c (ld_options): Don't use tabs in help text.
+       * emultempl/armcoff.em (gld${EMULATION_NAME}_finish): Fix typo.
+       * emultempl/pe.em (gld${EMULATION_NAME}_finish): Fix typo.
+
 2007-08-17  Alan Modra  <amodra@bigpond.net.au>
 
        * po/Make-in: Add --msgid-bugs-address to xgettext invocation.

diff --git a/ld/emultempl/armcoff.em b/ld/emultempl/armcoff.em
index 6380e4b6ba3d4a4e61cf8330effac31bd9c27e78..c11daeee1e20feed4f9af0da46dba8a47e7c856b 100644 (file)
--- a/ld/emultempl/armcoff.em
+++ b/ld/emultempl/armcoff.em
@@ -192,7 +192,7 @@ gld${EMULATION_NAME}_finish (void)
          entry_symbol.name = buffer;
        }
       else
-       einfo (_("%P: warning: connot find thumb start symbol %s\n"),
+       einfo (_("%P: warning: cannot find thumb start symbol %s\n"),
               thumb_entry_symbol);
     }
 

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index ddee01125bbe4feaa28a48ba9545ba910eb54b33..e7bcacfdc18c05c5564fbfe8f4013f808f852d38 100644 (file)
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -1533,7 +1533,7 @@ gld_${EMULATION_NAME}_finish (void)
          entry_symbol.name = buffer;
        }
       else
-       einfo (_("%P: warning: connot find thumb start symbol %s\n"), thumb_entry_symbol);
+       einfo (_("%P: warning: cannot find thumb start symbol %s\n"), thumb_entry_symbol);
     }
 #endif /* defined(TARGET_IS_armpe) || defined(TARGET_IS_arm_epoc_pe) || defined(TARGET_IS_arm_wince_pe) */
 

diff --git a/ld/ldexp.c b/ld/ldexp.c
index f57210ff8a03e8f974b2e7a896f229334302408f..9b95808e262dade4f0b986694c74e32dab20a424 100644 (file)
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -1052,7 +1052,7 @@ exp_get_vma (etree_type *tree, bfd_vma def, char *name)
       if (expld.result.valid_p)
        return expld.result.value;
       else if (name != NULL && expld.phase != lang_mark_phase_enum)
-       einfo (_("%F%S nonconstant expression for %s\n"), name);
+       einfo (_("%F%S: nonconstant expression for %s\n"), name);
     }
   return def;
 }
@@ -1077,7 +1077,7 @@ exp_get_fill (etree_type *tree, fill_type *def, char *name)
   if (!expld.result.valid_p)
     {
       if (name != NULL && expld.phase != lang_mark_phase_enum)
-       einfo (_("%F%S nonconstant expression for %s\n"), name);
+       einfo (_("%F%S: nonconstant expression for %s\n"), name);
       return def;
     }
 

diff --git a/ld/lexsup.c b/ld/lexsup.c
index 2a31683b0e74a740acfc4967c9ae3c99e7e8745c..cdbfbdf213398d45963d9f0a13bd1ad5e0344e62 100644 (file)
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -327,10 +327,12 @@ static const struct ld_option ld_options[] =
     TWO_DASHES },
   { {"add-needed", no_argument, NULL, OPTION_ADD_NEEDED},
     '\0', NULL, N_("Set DT_NEEDED tags for DT_NEEDED entries in\n"
-                  "\t\t\t\tfollowing dynamic libs"), TWO_DASHES },
+                  "                                following dynamic libs"),
+    TWO_DASHES },
   { {"no-add-needed", no_argument, NULL, OPTION_NO_ADD_NEEDED},
     '\0', NULL, N_("Do not set DT_NEEDED tags for DT_NEEDED entries\n"
-                  "\t\t\t\tin following dynamic libs"), TWO_DASHES },
+                  "                                in following dynamic libs"),
+    TWO_DASHES },
   { {"as-needed", no_argument, NULL, OPTION_AS_NEEDED},
     '\0', NULL, N_("Only set DT_NEEDED for following dynamic libs if used"),
     TWO_DASHES },
@@ -442,7 +444,8 @@ static const struct ld_option ld_options[] =
     '\0', NULL, NULL, NO_HELP },
   { {"nostdlib", no_argument, NULL, OPTION_NOSTDLIB},
     '\0', NULL, N_("Only use library directories specified on\n"
-                  "\t\t\t\tthe command line"), ONE_DASH },
+                  "                                the command line"),
+    ONE_DASH },
   { {"oformat", required_argument, NULL, OPTION_OFORMAT},
     '\0', N_("TARGET"), N_("Specify target of output file"),
     EXACTLY_TWO_DASHES },
@@ -506,8 +509,9 @@ static const struct ld_option ld_options[] =
   { {"unresolved-symbols=<method>", required_argument, NULL,
      OPTION_UNRESOLVED_SYMBOLS},
     '\0', NULL, N_("How to handle unresolved symbols.  <method> is:\n"
-                  "\t\t\t\tignore-all, report-all, ignore-in-object-files,\n"
-                  "\t\t\t\tignore-in-shared-libs"), TWO_DASHES },
+                  "                                ignore-all, report-all, ignore-in-object-files,\n"
+                  "                                ignore-in-shared-libs"),
+    TWO_DASHES },
   { {"verbose", no_argument, NULL, OPTION_VERBOSE},
     '\0', NULL, N_("Output lots of information during link"), TWO_DASHES },
   { {"dll-verbose", no_argument, NULL, OPTION_VERBOSE}, /* Linux.  */
@@ -517,7 +521,8 @@ static const struct ld_option ld_options[] =
   { {"version-exports-section", required_argument, NULL,
      OPTION_VERSION_EXPORTS_SECTION },
     '\0', N_("SYMBOL"), N_("Take export symbols list from .exports, using\n"
-                          "\t\t\t\tSYMBOL as the version."), TWO_DASHES },
+                          "                                SYMBOL as the version."),
+    TWO_DASHES },
   { {"dynamic-list-data", no_argument, NULL, OPTION_DYNAMIC_LIST_DATA},
     '\0', NULL, N_("Add data symbols to dynamic list"), TWO_DASHES },
   { {"dynamic-list-cpp-new", no_argument, NULL, OPTION_DYNAMIC_LIST_CPP_NEW},