X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=object.c;h=7fd8fcce06ed190924fd0c175ff970f5322764e2;hb=3c7505f2f4929a549ab3c51de73ebe7c4fcf1d72;hp=bc3ae229b098035599c0e1518f1e6ad72cfbad75;hpb=03dd34951a331e0b8971195ccef1600fffaea2e6;p=rmac

diff --git a/object.c b/object.c
index bc3ae22..7fd8fcc 100644
--- a/object.c
+++ b/object.c
@@ -8,6 +8,7 @@
 
 #include "object.h"
 #include "6502.h"
+#include "direct.h"
 #include "error.h"
 #include "mark.h"
 #include "riscasm.h"
@@ -177,6 +178,7 @@ uint8_t * AddBSDSymEntry(uint8_t * buf, SYM * sym, int globflag)
 uint8_t * AddELFSymEntry(uint8_t * buf, SYM * sym, int globflag)
 {
 	chptr = buf;
+	ch_size = 0;
 	D_long(strindx);		// st_name
 	D_long(sym->svalue);	// st_value
 	D_long(0);				// st_size
@@ -520,7 +522,7 @@ int WriteObject(int fd)
 		{
 			elfHdrNum[ES_TEXT] = shstIndex;
 			shstTab[ES_TEXT] = shstSize;
-			shstSize += DepositELFSHSTEntry(&shstPtr, "TEXT");
+			shstSize += DepositELFSHSTEntry(&shstPtr, ".text");
 			shstIndex++;
 			numEntries++;
 		}
@@ -529,7 +531,7 @@ int WriteObject(int fd)
 		{
 			elfHdrNum[ES_DATA] = shstIndex;
 			shstTab[ES_DATA] = shstSize;
-			shstSize += DepositELFSHSTEntry(&shstPtr, "DATA");
+			shstSize += DepositELFSHSTEntry(&shstPtr, ".data");
 			shstIndex++;
 			numEntries++;
 		}
@@ -538,7 +540,7 @@ int WriteObject(int fd)
 		{
 			elfHdrNum[ES_BSS] = shstIndex;
 			shstTab[ES_BSS] = shstSize;
-			shstSize += DepositELFSHSTEntry(&shstPtr, "BSS");
+			shstSize += DepositELFSHSTEntry(&shstPtr, ".bss");
 			shstIndex++;
 			numEntries++;
 		}
@@ -619,7 +621,7 @@ for(int j=0; j<i; j++)
 		// Construct TEXT section, if any
 		if (sect[TEXT].sloc > 0)
 		{
-			headerSize += DepositELFSectionHeader(headers + headerSize, shstTab[ES_TEXT], 1, 6, 0, elfSize, sect[TEXT].sloc, 0, 0, 2, 0);
+			headerSize += DepositELFSectionHeader(headers + headerSize, shstTab[ES_TEXT], 1, 6, 0, elfSize, sect[TEXT].sloc, 0, 0, largestAlign[0], 0);
 
 			for(CHUNK * cp=sect[TEXT].sfcode; cp!=NULL; cp=cp->chnext)
 			{
@@ -636,7 +638,7 @@ for(int j=0; j<i; j++)
 		// Construct DATA section, if any
 		if (sect[DATA].sloc > 0)
 		{
-			headerSize += DepositELFSectionHeader(headers + headerSize, shstTab[ES_DATA], 1, 3, 0, elfSize, sect[DATA].sloc, 0, 0, 1, 0);
+			headerSize += DepositELFSectionHeader(headers + headerSize, shstTab[ES_DATA], 1, 3, 0, elfSize, sect[DATA].sloc, 0, 0, largestAlign[1], 0);
 
 			for(CHUNK * cp=sect[DATA].sfcode; cp!=NULL; cp=cp->chnext)
 			{
@@ -651,7 +653,7 @@ for(int j=0; j<i; j++)
 		// Construct BSS section, if any
 		if (sect[BSS].sloc > 0)
 		{
-			headerSize += DepositELFSectionHeader(headers + headerSize, shstTab[ES_BSS], 8, 3, 0, elfSize, sect[BSS].sloc, 0, 0, 2, 0);
+			headerSize += DepositELFSectionHeader(headers + headerSize, shstTab[ES_BSS], 8, 3, 0, elfSize, sect[BSS].sloc, 0, 0, largestAlign[2], 0);
 		}
 
 		int textrelLoc = headerSize;