Alignment fix from John Dyson/David Greenman

diff --git a/gnu/usr.bin/as/Makefile b/gnu/usr.bin/as/Makefile
index 0a2ae0a..9b687b9 100644 (file)
--- a/gnu/usr.bin/as/Makefile
+++ b/gnu/usr.bin/as/Makefile
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile      6.1 (Berkeley) 3/3/91
 #      from: @(#)Makefile      6.1 (Berkeley) 3/3/91

-#      $Id: Makefile,v 1.10 1993/10/16 22:04:48 pk Exp $
+#      $Id: Makefile,v 1.2 1993/11/03 00:50:49 paul Exp $

 
 .include "config/Makefile.$(MACHINE)"
 
 
 .include "config/Makefile.$(MACHINE)"
 


@@ -25,9 +25,10 @@ SRCS+=               app.c as.c atof-generic.c bignum-copy.c \
                symbols.c version.c write.c xmalloc.c xrealloc.c \
                obj-$(gas_objformat).c
 CFLAGS+=       -I$(.CURDIR) ${ADDINCLUDE} -I$(.CURDIR)/config \
                symbols.c version.c write.c xmalloc.c xrealloc.c \
                obj-$(gas_objformat).c
 CFLAGS+=       -I$(.CURDIR) ${ADDINCLUDE} -I$(.CURDIR)/config \

-               -DPIC -DOLD_GAS -DSIGTY=void -Derror=as_fatal
+               -DPIC -DOLD_GAS -DSIGTY=void -Derror=as_fatal \
+               -DSUB_SEGMENT_ALIGN=4

 #LDADD+=               -lgnumalloc
 #LDADD+=               -lgnumalloc

-DPADD+=                /usr/lib/libgnumalloc.a
+#DPADD+=               /usr/lib/libgnumalloc.a

 
 CONF_HEADERS=  targ-cpu.h obj-format.h host.h targ-env.h
 
 
 CONF_HEADERS=  targ-cpu.h obj-format.h host.h targ-env.h
 

diff --git a/gnu/usr.bin/as/write.c b/gnu/usr.bin/as/write.c
index ea633e7..dd139f7 100644 (file)
--- a/gnu/usr.bin/as/write.c
+++ b/gnu/usr.bin/as/write.c
@@ -21,7 +21,7 @@
 /* This thing should be set up to do byteordering correctly.  But... */
 
 #ifndef lint
 /* This thing should be set up to do byteordering correctly.  But... */
 
 #ifndef lint

-static char rcsid[] = "$Id: write.c,v 1.3 1993/11/30 20:55:47 jkh Exp $";
+static char rcsid[] = "$Id: write.c,v 1.4 1993/12/12 17:01:24 jkh Exp $";

 #endif
 
 #include "as.h"
 #endif
 
 #include "as.h"


@@ -179,7 +179,9 @@ void write_object_file()
         * that requires least thought. ".align" frags like to have a following
         * frag since that makes calculating their intended length trivial.
         */
         * that requires least thought. ".align" frags like to have a following
         * frag since that makes calculating their intended length trivial.
         */

+#ifndef SUB_SEGMENT_ALIGN

 #define SUB_SEGMENT_ALIGN (2)
 #define SUB_SEGMENT_ALIGN (2)

+#endif

        for (frchainP = frchain_root; frchainP; frchainP = frchainP->frch_next) {
 #ifdef OBJ_VMS
                /*
        for (frchainP = frchain_root; frchainP; frchainP = frchainP->frch_next) {
 #ifdef OBJ_VMS
                /*