From: Timothy Wall <twall@alum.mit.edu>
Date: Wed, 9 Feb 2000 14:42:48 +0000 (+0000)
Subject: These snippets were missed in the previous bytes vs octets patch to
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e4ed18ce8311c39a07b5fe267ac737eb7782cf7;p=binutils-gdb.git

These snippets were missed in the previous bytes vs octets patch to
the linker.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 8ceaf8bd0b9..1ceee7ae6d4 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-04  Timothy Wall  <twall@redhat.com>
+
+	* ldlang.c (lang_check_section_addresses): Use bytes instead of
+	octets when calculating section end addresses.
+
 2000-02-04  Timothy Wall  <twall@redhat.com>
 
 	* ldlang.c (lang_size_sections): Fix typo in ALIGN_N invocation.
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 10e41c247f8..6913a38e066 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -2672,8 +2672,8 @@ lang_check_section_addresses ()
 	     overlapping VMAs but they must have distinct LMAs.  */
 	  s_start  = bfd_section_lma (output_bfd, s);
 	  os_start = bfd_section_lma (output_bfd, os);
-	  s_end    = s_start  + bfd_section_size (output_bfd, s) - 1;
-	  os_end   = os_start + bfd_section_size (output_bfd, os) - 1;
+	  s_end    = s_start  + bfd_section_size (output_bfd, s) / opb - 1;
+	  os_end   = os_start + bfd_section_size (output_bfd, os) / opb - 1;
 	  
 	  /* Look for an overlap.  */
 	  if ((s_end < os_start) || (s_start > os_end))
@@ -2906,6 +2906,8 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
 
 	    switch (s->data_statement.type)
 	      {
+              default:
+                abort();
 	      case QUAD:
 	      case SQUAD:
 		size = QUAD_SIZE;
@@ -3150,6 +3152,8 @@ lang_do_assignments (s, output_section_statement, fill, dot)
             int size;
             switch (s->data_statement.type)
               {
+              default:
+                abort();
               case QUAD:
               case SQUAD:
                 size = QUAD_SIZE;