Fix -R problem from Adobe

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a2c131b08f595e19c4ac92fb7fa0466381df5038..82960dbd3c14e1524fdd6c5fbbc541262fd92282 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,17 @@
+Tue Jun  2 16:47:09 1992  Steve Chamberlain ([email protected])
+
+       * write.c (write_object_file): keep the fix_tail clean, which
+       fixes a bug in -R where relocations were being lost.
+
+Mon Jun  1 16:20:22 1992  Michael Tiemann  ([email protected])
+
+       * configure.in: recognize m680x0 as having sun3 emulation mode for
+       vxworks environment.
+
+Sun May 31 05:33:00 1992  david d `zoo' zuhn ([email protected])
+
+       * configure.in: recognize m680x0 as an m68k
+
 Thu May 28 11:22:02 1992  Jim Wilson  ([email protected])
 
        * configure.in: Recognize sparclite as a sparc variant.

diff --git a/gas/write.c b/gas/write.c
index d061bade6f45f77b4f9aca2ca58c11e14d521b3d..9a5fb31836dc144a0b5e65d1ab273c94d0d3b863 100644 (file)
--- a/gas/write.c
+++ b/gas/write.c
@@ -225,6 +225,7 @@ void write_object_file()
                if (text_fix_root) {
                        for (tmp = text_fix_root; tmp->fx_next; tmp = tmp->fx_next) ;;
                        tmp->fx_next=data_fix_root;
+                       text_fix_tail = data_fix_tail;
                } else
                    text_fix_root=data_fix_root;
                data_fix_root=NULL;
@@ -255,7 +256,16 @@ void write_object_file()
                H_SET_DATA_SIZE(&headers, data_last_frag->fr_address);
                data_last_frag->fr_address = H_GET_DATA_SIZE(&headers);
                slide = H_GET_TEXT_SIZE(&headers); /* & in file of the data segment. */
-               
+#ifdef OBJ_BOUT
+#define RoundUp(N,S) (((N)+(S)-1)&-(S))
+               /* For b.out: If the data section has a strict alignment
+                  requirement, its load address in the .o file will be
+                  rounded up from the size of the text section.  These
+                  two values are *not* the same!  Similarly for the bss
+                  section....  */
+               slide = RoundUp (slide, 1 << section_alignment[SEG_DATA]);
+#endif
+
                for (fragP = data_frag_root; fragP; fragP = fragP->fr_next) {
                        fragP->fr_address += slide;
                } /* for each data frag */
@@ -266,9 +276,22 @@ void write_object_file()
                H_SET_DATA_SIZE(&headers,0);
                data_siz = 0;
        }
-       
+
+#ifdef OBJ_BOUT
+       /* See above comments on b.out data section address.  */
+       {
+         long bss_vma;
+         if (data_last_frag == 0)
+           bss_vma = H_GET_TEXT_SIZE (&headers);
+         else
+           bss_vma = data_last_frag->fr_address;
+         bss_vma = RoundUp (bss_vma, 1 << section_alignment[SEG_BSS]);
+         bss_address_frag.fr_address = bss_vma;
+       }
+#else
        bss_address_frag.fr_address = (H_GET_TEXT_SIZE(&headers) + 
                                       H_GET_DATA_SIZE(&headers));
+#endif
        
        H_SET_BSS_SIZE(&headers,local_bss_counter);
        
@@ -362,8 +385,18 @@ void write_object_file()
                        BAD_CASE( fragP->fr_type );
                        break;
                } /* switch (fr_type) */
-               
-               know((fragP->fr_next == NULL) || ((fragP->fr_next->fr_address - fragP->fr_address) == (fragP->fr_fix + (fragP->fr_offset * fragP->fr_var))));
+
+               if (!((fragP->fr_next == NULL)
+#ifdef OBJ_BOUT
+                     || (fragP->fr_next == data_frag_root)
+#endif
+                     || ((fragP->fr_next->fr_address - fragP->fr_address)
+                         == (fragP->fr_fix + (fragP->fr_offset * fragP->fr_var)))))
+                 {
+                   fprintf (stderr, "assertion failed: file `%s', line %d\n",
+                            __FILE__, __LINE__ - 4);
+                   exit (1);
+                 }
        } /* for each frag. */
        
 #ifndef WORKING_DOT_WORD
@@ -714,7 +747,7 @@ segT                segment; /* SEG_DATA or SEG_TEXT */
                                                offset=  lie->add->sy_frag->fr_address+ S_GET_VALUE(lie->add) + lie->addnum -
                                                    (lie->sub->sy_frag->fr_address+ S_GET_VALUE(lie->sub));
                                                if (offset<=-32768 || offset>=32767) {
-                                                       if (flagseen['k'])
+                                                       if (flagseen['K'])
                                                            as_warn(".word %s-%s+%ld didn't fit",
                                                                    S_GET_NAME(lie->add),
                                                                    S_GET_NAME(lie->sub),