X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fpic%2Fmain.c;h=c646ae652c1b8e8b169f7fe547ed8638bc9755cd;hb=a5dfc4ffe6b4d122ea8343d7ff553be2d526d39c;hp=14aeeb51de045c0df2929a07d4e5a7fa922b19a2;hpb=444b6e9691c5d5a5cc6ad5b4a4faf654918ce421;p=fw%2Fsdcc

diff --git a/src/pic/main.c b/src/pic/main.c
index 14aeeb51..c646ae65 100644
--- 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 */
@@ -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