* ldexp.c (exp_fold_tree): Don't immediately exit ld on a

	failing link script assert.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 65db21e01d47ca1b451f9c34744e343448bc8a6c..c8541d56668600d0512d724de6921ef916be29ab 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-15  Alan Modra  <amodra@bigpond.net.au>
 
+       * ldexp.c (exp_fold_tree): Don't immediately exit ld on a
+       failing link script assert.
+
        * ldctor.c (ldctor_add_set_entry): Fix comment typo.
 
 2004-10-14  H.J. Lu  <hongjiu.lu@intel.com>

diff --git a/ld/ldexp.c b/ld/ldexp.c
index 4110f57ec4ca905a9eb3b064b3ddd3a8094aa9e7..57968a260cc0d7a8242d9b3de2bbd75afa914e3d 100644 (file)
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -390,7 +390,7 @@ fold_binary (etree_type *tree,
            case ALIGN_K:
              result.value = align_n (result.value, other.value);
              break;
-             
+
            case DATA_SEGMENT_ALIGN:
              if (allocation_done != lang_first_phase_enum
                  && current_section == abs_output_section
@@ -492,7 +492,7 @@ fold_name (etree_type *tree,
   etree_value_type result;
 
   result.valid_p = FALSE;
-  
+
   switch (tree->type.node_code)
     {
     case SIZEOF_HEADERS:
@@ -669,7 +669,7 @@ exp_fold_tree (etree_type *tree,
       if (result.valid_p)
        {
          if (! result.value)
-           einfo ("%F%P: %s\n", tree->assert_s.message);
+           einfo ("%X%P: %s\n", tree->assert_s.message);
          return result;
        }
       break;