Initial commit for 68020/30/40/60/68881/68882/68851 support.

[rmac] / mark.c

diff --git a/mark.c b/mark.c
index 6c40c304292586e6b0c2f620aef5c071a9597f77..f5eb2af7042e31148009284ea692c578927f223a 100644 (file)
--- a/mark.c
+++ b/mark.c
@@ -95,8 +95,8 @@ if (symbol)
        //
        if (prg_flag)
        {
        //
        if (prg_flag)
        {

-               if ((flags & MLONG) == 0)
-                       error("illegal word relocatable (in .PRG mode)");
+               //if ((flags & MLONG) == 0)
+               //      error("illegal word relocatable (in .PRG mode)");

 
                if (symbol != NULL)
                        errors("illegal external reference (in .PRG mode) to '%s'",
 
                if (symbol != NULL)
                        errors("illegal external reference (in .PRG mode) to '%s'",


@@ -368,7 +368,7 @@ printf("MarkBSDImage():\n");
                                continue;
 
 #ifdef DEBUG_IMAGE_MARKING
                                continue;
 
 #ifdef DEBUG_IMAGE_MARKING

-printf(" validsegment: raddr = $%08X\n", raddr);
+printf(" validsegment: raddr = $%08X\n", loc);

 #endif
                        uint32_t rflag = 0x00000040;    // Absolute relocation
 
 #endif
                        uint32_t rflag = 0x00000040;    // Absolute relocation
 


@@ -527,10 +527,7 @@ uint32_t CreateELFRelocationRecord(uint8_t * buf, uint8_t * secBuf, uint16_t sec
                                else
                                        r_type = 1;  // R_68K_32
 
                                else
                                        r_type = 1;  // R_68K_32
 

-                               if (symbol != NULL)
-                                       r_addend = symbol->svalue;    // Mark offset into section
-                               else
-                                       r_addend = GETBE32(secBuf + r_offset, 0);
+                               r_addend = GETBE32(secBuf + r_offset, 0);

 
                                // Deposit the relocation record
                                D_long(r_offset);
 
                                // Deposit the relocation record
                                D_long(r_offset);