From: sdattalo <sdattalo@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Thu, 14 Mar 2002 15:23:35 +0000 (+0000)
Subject: dattalo - Disabled code dependent on ports that have been disabled. I don't know... 
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=357db11aebf878e4304f199d253fb8646d153eb3;p=fw%2Fsdcc

dattalo - Disabled code dependent on ports that have been disabled. I don't know why avr/peeph.rul has changed.


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

diff --git a/src/SDCCmain.c b/src/SDCCmain.c
index 710d72be..6bf1381f 100644
--- a/src/SDCCmain.c
+++ b/src/SDCCmain.c
@@ -1160,14 +1160,19 @@ linkEdit (char **envp)
       mfprintf (lnkfile, getRuntimeVariables(), "-k {libdir}{sep}%s\n", c);
 
       /* standard library files */
+#if !OPT_DISABLE_DS390
       if (options.model == MODEL_FLAT24)
 	{
 	  fprintf (lnkfile, "-l %s\n", STD_DS390_LIB);
 	}
+#endif
+
+#if !OPT_DISABLE_XA51
       if (options.model == MODEL_PAGE0)
 	{
 	  fprintf (lnkfile, "-l %s\n", STD_XA51_LIB);
 	}
+#endif
       fprintf (lnkfile, "-l %s\n", STD_LIB);
       fprintf (lnkfile, "-l %s\n", STD_INT_LIB);
       fprintf (lnkfile, "-l %s\n", STD_LONG_LIB);
diff --git a/src/SDCCpeeph.c b/src/SDCCpeeph.c
index 2812bbc9..070d9023 100644
--- a/src/SDCCpeeph.c
+++ b/src/SDCCpeeph.c
@@ -1011,6 +1011,12 @@ peepHole (lineNode ** pls)
   lineNode *mtail = NULL;
   bool restart;
 
+#if !OPT_DISABLE_PIC
+  /* The PIC port uses a different peep hole optimizer based on "pCode" */
+  if (TARGET_IS_PIC)
+    return;
+#endif
+
   assert(labelHash == NULL);
 
   do
diff --git a/src/SDCCsymt.h b/src/SDCCsymt.h
index da96ada5..f8efacf5 100644
--- a/src/SDCCsymt.h
+++ b/src/SDCCsymt.h
@@ -427,6 +427,7 @@ symbol;
 #define IS_ARITHMETIC(x) (IS_INTEGRAL(x) || IS_FLOAT(x))
 #define IS_AGGREGATE(x) (IS_ARRAY(x) || IS_STRUCT(x))
 #define IS_LITERAL(x)   (IS_SPEC(x)  && x->select.s.sclass == S_LITERAL)
+#define IS_CODE(x)      (IS_SPEC(x)  && SPEC_SCLS(x) == S_CODE)
 #define IS_REGPARM(x)   (IS_SPEC(x) && SPEC_REGPARM(x))
 
 /* forward declaration for the global vars */