]> Shamusworld >> Repos - rmac/commitdiff
Fix for bug #140 (unusual COFF writer case); now at v2.0.4.
authorShamus Hammons <jlhamm@acm.org>
Thu, 2 Jan 2020 22:06:56 +0000 (16:06 -0600)
committerShamus Hammons <jlhamm@acm.org>
Thu, 2 Jan 2020 22:06:56 +0000 (16:06 -0600)
object.c
version.h

index 395526e0ff1259c18753d2268255ab941571634d..f100e4ae18fd1a95a8c9fc3e903231fd3c7f614a 100644 (file)
--- a/object.c
+++ b/object.c
@@ -124,7 +124,8 @@ uint8_t * AddSymEntry(register uint8_t * buf, SYM * sym, int globflag)
                w |= AL_EXTERN | AL_GLOBAL;     // Common symbol
                w &= ~AL_BSS;           // They're not BSS in Alcyon object files
        }
                w |= AL_EXTERN | AL_GLOBAL;     // Common symbol
                w &= ~AL_BSS;           // They're not BSS in Alcyon object files
        }
-       else if (w1 & DEFINED)
+
+       if (w1 & DEFINED)
        {
                if (globflag)           // Export the symbol
                        w |= AL_GLOBAL;
        {
                if (globflag)           // Export the symbol
                        w |= AL_GLOBAL;
@@ -218,12 +219,7 @@ uint8_t * AddELFSymEntry(uint8_t * buf, SYM * sym, int globflag)
 
        register WORD w1 = sym->sattr;
 
 
        register WORD w1 = sym->sattr;
 
-       if (w1 & COMMON)
-       {
-               //w |= AL_EXTERN | AL_GLOBAL;   // common symbol
-               //w &= ~AL_BSS;         // they're not BSS in Alcyon object files
-       }
-       else if (w1 & DEFINED)
+       if (w1 & DEFINED)
        {
                if (globflag)           // Export the symbol
                        st_info |= 16;   //STB_GLOBAL (1<<4)
        {
                if (globflag)           // Export the symbol
                        st_info |= 16;   //STB_GLOBAL (1<<4)
index fa2e9086f6d04745b67b64ca2eff76c694d58191..83b4f7c8619b21e44012c6855d780160741bf9f6 100644 (file)
--- a/version.h
+++ b/version.h
@@ -15,7 +15,7 @@
 
 #define MAJOR   2              // Major version number
 #define MINOR   0              // Minor version number
 
 #define MAJOR   2              // Major version number
 #define MINOR   0              // Minor version number
-#define PATCH   3              // Patch release number
+#define PATCH   4              // Patch release number
 
 #endif // __VERSION_H__
 
 
 #endif // __VERSION_H__