dattalo - Disabled code dependent on ports that have been disabled. I don't know...

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 710d72be4607391abf4b1895d6da8ffccec385b1..6bf1381fe25bd110a15fcd49ef6e71e59f7874a8 100644 (file)
--- 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 2812bbc92df25069532f805e5d6a2d3a5f0074ae..070d902338c5dbcb5ac69baa2ca1199393f6d63f 100644 (file)
--- 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 da96ada5c5d6ed6b1ed15fb56a846e6f920c3847..f8efacf5722fdc30919047fe17b6eb51af922055 100644 (file)
--- 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 */