while emitting maps, we are inInitMode

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@906 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/src/SDCCast.c b/src/SDCCast.c
index 1874a67d0d8b3da7a0d769e15afc209970b7288b..1c65e5c9e8d1d76962d88487b19cb9b5ceeb07c8 100644 (file)
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -1035,7 +1035,7 @@ gatherAutoInit (symbol * autoChain)
          symbol *newSym;
          
          // this can only be a constant
-         if (!IS_LITERAL(sym->ival->init.node->etype)) {
+         if (!inInitMode && !IS_LITERAL(sym->ival->init.node->etype)) {
            werror (E_CONST_EXPECTED);
          }
 

diff --git a/src/SDCCast.h b/src/SDCCast.h
index c469be9f2bee35867745d7c4bc0a6dac008dbdda..da7572583f0f4e2097d6cf6325a17056da3b602c 100644 (file)
--- a/src/SDCCast.h
+++ b/src/SDCCast.h
@@ -208,5 +208,6 @@ void addSymToBlock (symbol *, ast *);
 // exported variables 
 extern set *operKeyReset;
 extern int noAlloc;
+extern int inInitMode;
 
 #endif

diff --git a/src/SDCCglue.c b/src/SDCCglue.c
index 3fb487436f341d886eef80f967024daa700f7e5c..3ef90f226a734238ceadc7a7d8f5b5b4018a7832 100644 (file)
--- a/src/SDCCglue.c
+++ b/src/SDCCglue.c
@@ -1034,6 +1034,7 @@ emitStaticSeg (memmap * map, FILE * out)
 void 
 emitMaps ()
 {
+  inInitMode++;
   /* no special considerations for the following
      data, idata & bit & xdata */
   emitRegularMap (data, TRUE, TRUE);
@@ -1046,6 +1047,7 @@ emitMaps ()
   emitRegularMap (code, TRUE, FALSE);
 
   emitStaticSeg (statsg, code->oFile);
+  inInitMode--;
 }
 
 /*-----------------------------------------------------------------*/