* src/pic16/glue.c: fixed bug #983491 - "Merge duplicate strings

  function is ineffective" for pic16 tareget
* support/scripts/listerr.c: corrected include path

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

diff --git a/ChangeLog b/ChangeLog
index 64b20528f3f77ca41bfba9dc2f2f35c382bd7ef6..e64f2beeecf1af0dd07df34c7f5c8c4da43e3a0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-19 Borut Razem <borut.razem AT siol.net>
+
+       * src/pic16/glue.c: fixed bug #983491 - "Merge duplicate strings
+         function is ineffective" for pic16 tareget
+       * support/scripts/listerr.c: corrected include path 
+
 2007-10-18 Maarten Brock <sourceforge.brock AT dse.nl>
 
        * support/regression/tests/using.c: new, added

diff --git a/src/pic16/glue.c b/src/pic16/glue.c
index c8f77a159390ba83611a7f40cea1957d5df3cea4..811d265934bc189a40538618b877a6765b7b30be 100644 (file)
--- a/src/pic16/glue.c
+++ b/src/pic16/glue.c
@@ -1383,7 +1383,6 @@ CODESPACE: %d\tCONST: %d\tPTRCONST: %d\tSPEC_CONST: %d\n", __FUNCTION__,
 
               /* symbol doesn't have absolute address but has initial value */
               dbuf_printf (&code->oBuf, "%s:\n", sym->rname);
-              noAlloc++;
               resolveIvalSym (sym->ival, sym->type);
 
               pb = pic16_newpCodeChain(NULL, 'P',pic16_newpCodeCharP("; Starting pCode block for Ival"));
@@ -1400,7 +1399,6 @@ CODESPACE: %d\tCONST: %d\tPTRCONST: %d\tSPEC_CONST: %d\n", __FUNCTION__,
               //fprintf(stderr, "%s:%d [2] generating init for label: %s\n", __FILE__, __LINE__, sym->rname);
               pic16_printIval(sym, sym->type, sym->ival, 'p', (void *)pb);
               pic16_flushDB('p', (void *)pb);
-              noAlloc--;
             } else {
 
               /* symbol doesn't have absolute address and no initial value */

diff --git a/support/scripts/listerr.c b/support/scripts/listerr.c
index d5d7439652c958c2b8df5c8472a7801fb9fa58c7..a5127cb85bddf689f2311e6f3a470d9e892f7101 100644 (file)
--- a/support/scripts/listerr.c
+++ b/support/scripts/listerr.c
@@ -1,7 +1,7 @@
 /*
  * listerr.c - program to create the list of errors and warnings list from SDCCerr.c
  *
- * gcc -I ../Util listerr.c -o listerr
+ * gcc -I ../../src listerr.c -o listerr
  */
 
 #include <stdio.h>