* .version: changed to version 2.5.3

[fw/sdcc] / src / pic / main.c

diff --git a/src/pic/main.c b/src/pic/main.c
index 14aeeb51de045c0df2929a07d4e5a7fa922b19a2..7ff316565e1eebe43d8effb9f3952269c232ebda 100644 (file)
--- a/src/pic/main.c
+++ b/src/pic/main.c
@@ -49,7 +49,7 @@ static char *_pic14_keywords[] =
 
 void  pCodeInitRegisters(void);
 
-void pic14_assignRegisters (eBBlock ** ebbs, int count);
+void pic14_assignRegisters (ebbIndex *);
 
 /* Also defined in gen.h, but the #include is commented out */
 /* for an unknowned reason. - EEP */
@@ -71,7 +71,7 @@ _pic14_reset_regparm (void)
 }
 
 static int
-_pic14_regparm (sym_link * l)
+_pic14_regparm (sym_link * l, bool reentrant)
 {
 /* for this processor it is simple
        can pass only the first parameter in a register */
@@ -379,7 +379,7 @@ MUST be terminated with a NULL.
 */
 static const char *_linkCmd[] =
 {
-       "gplink", "-o $2", "\"$1.o\"", "$l", NULL
+       "gplink", "$l", "-o \"$2\"", "\"$1\"", "$3", NULL
 };
 
 static const char *_asmCmd[] =
@@ -436,6 +436,7 @@ PORT pic_port =
                "code",
                "DSEG    (DATA)",
                "ISEG    (DATA)",
+               NULL, /* pdata */
                "XSEG    (XDATA)",
                "BSEG    (BIT)",
                "RSEG    (DATA)",
@@ -445,6 +446,7 @@ PORT pic_port =
                "HOME    (CODE)",
                NULL, // xidata
                NULL, // xinit
+               "CONST   (CODE)",               // const_name - const data (code or not)
                NULL,
                NULL,
                1        // code is read only