first pass at Borland makefiles: still hunting bugs

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

diff --git a/support/cpp2/Makefile.bcc b/support/cpp2/Makefile.bcc
new file mode 100644 (file)
index 0000000..6fee568
--- /dev/null
+++ b/support/cpp2/Makefile.bcc
@@ -0,0 +1,29 @@
+PRJDIR         = ..\..
+
+OBJECTS         = cppmain.obj intl.obj \
+               cpplib.obj cpplex.obj cppmacro.obj cppexp.obj cppfiles.obj \
+               cpphash.obj cpperror.obj cppinit.obj cppdefault.obj \
+               hashtable.obj mkdeps.obj prefix.obj version.obj mbchar.obj \
+               safe-ctype.obj obstack.obj splay-tree.obj lbasename.obj
+
+TARGET          = $(PRJDIR)/bin/sdcpp2.exe
+
+# Compiling entire program or any subproject
+# ------------------------------------------
+all: $(TARGET)
+
+
+CFLAGS = -I. -I.\libiberty -DHAVE_CONFIG_H
+
+# My rules
+# --------
+$(TARGET): $(OBJECTS)
+        bcc32 -e$(TARGET) $(OBJECTS)
+
+!include ..\..\Bcc.inc
+
+safe-ctype.obj: libiberty\safe-ctype.c
+obstack.obj: libiberty\obstack.c
+splay-tree.obj: libiberty\splay-tree.c
+lbasename.obj: libiberty\lbasename.c
+

diff --git a/support/cpp2/Makefile.in b/support/cpp2/Makefile.in
index bc762001ac51d8371a03e2716f1e7aafb0c6b10f..0a618a9ac78ed5aa3a00af4971feb2762f6f3622 100644 (file)
--- a/support/cpp2/Makefile.in
+++ b/support/cpp2/Makefile.in
@@ -209,7 +209,7 @@ libcpp.a: $(LIBCPP_OBJS)
        $(AR) $(AR_FLAGS) libcpp.a $(LIBCPP_OBJS)
        -$(RANLIB) libcpp.a
 
-MY_LIBIBERTY_BITS = intl.o safe-ctype.o obstack.o splay-tree.o \
+MY_LIBIBERTY_BITS = safe-ctype.o obstack.o splay-tree.o \
                    lbasename.o
 
 $(TARGET): cppmain.o intl.o $(MY_LIBIBERTY_BITS) libcpp.a $(LIBDEPS) 

diff --git a/support/cpp2/borland.h b/support/cpp2/borland.h
new file mode 100644 (file)
index 0000000..0fc50f5
--- /dev/null
+++ b/support/cpp2/borland.h
@@ -0,0 +1,28 @@
+#ifndef CPP2_BORLAND_H_
+#define CPP2_BORLAND_H_
+
+/* Define values for Borland makefile which are detected by configure
+ * on better behaved platforms.
+ * 
+ * This is the equivalent of auto-host.h.
+ */
+
+#include "sdcc.h"
+
+#define HAVE_STRINGIZE
+#define STDC_HEADERS
+#define PACKAGE "sdcc"
+#define LOCALEDIR ""
+#define PREFIX ""
+#define inline
+#define SIZEOF_INT 4
+#define SIZEOF_LONG 4
+#define HAVE_TIME_H 1
+#define HAVE_STRING_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_STDLIB_H 1
+#define ssize_t unsigned int
+#define __STDC__ 1
+#define alloca(x) calloc(1,(x))
+
+#endif

diff --git a/support/cpp2/config.in b/support/cpp2/config.in
index 1a3552c7b58dde8e6553e4bf10d5c0079328071e..25540a866ebec5343b07e4f88989dd4a7a3e85c7 100644 (file)
--- a/support/cpp2/config.in
+++ b/support/cpp2/config.in
@@ -1,5 +1,10 @@
 /* config.in.  Generated automatically from configure.in by autoheader.  */
 
+#ifdef __BORLANDC__
+
+#include "borland.h"
+
+#else
 /* Define to empty if the keyword does not work.  */
 #undef const
 
@@ -384,3 +389,4 @@
 #define const
 #endif
 #endif
+#endif /* !__BORLANDC__ */

diff --git a/support/cpp2/configargs.h b/support/cpp2/configargs.h
index 64d3c548d61df018e33b50448610e8f904c5ea95..6985a4b3ff090af16e67ba4017752cc435cd4ac6 100644 (file)
--- a/support/cpp2/configargs.h
+++ b/support/cpp2/configargs.h
@@ -1,3 +1,3 @@
 /* Generated automatically. */
-static const char configuration_arguments[] = " : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured) ";
+static const char configuration_arguments[] = " : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured)  : (reconfigured) ";
 static const char thread_model[] = "";

diff --git a/support/cpp2/cppfiles.c b/support/cpp2/cppfiles.c
index 137882b340c231159a673df5144fbc796069dc97..140e1e478b63896f1454f2a0074b8e3eb1862259 100644 (file)
--- a/support/cpp2/cppfiles.c
+++ b/support/cpp2/cppfiles.c
@@ -380,7 +380,9 @@ read_include_file (pfile, inc)
         does not bite us.  */
       if (inc->st.st_size > INTTYPE_MAXIMUM (ssize_t))
        {
-         cpp_error (pfile, "%s is too large", inc->name);
+         cpp_error (pfile, "%s is too large (%lu > %lu)", inc->name, 
+                    (unsigned long)inc->st.st_size,
+                    INTTYPE_MAXIMUM(ssize_t));
          goto fail;
        }
       size = inc->st.st_size;

diff --git a/support/cpp2/cppinit.c b/support/cpp2/cppinit.c
index 0d3d3a0d634e27466c7a0893e99831c00fe3576b..ac826bdf98ef6a3add637150a911d09a10c6c33b 100644 (file)
--- a/support/cpp2/cppinit.c
+++ b/support/cpp2/cppinit.c
@@ -1553,12 +1553,12 @@ cpp_handle_option (pfile, argc, argv)
                }
            }
          else
-           append_include_chain (pfile, xstrdup (arg), BRACKET, 0);
+           append_include_chain (pfile, (char *)xstrdup(arg), BRACKET, 0);
          break;
        case OPT_isystem:
          /* Add directory to beginning of system include path, as a system
             include directory.  */
-         append_include_chain (pfile, xstrdup (arg), SYSTEM, 0);
+         append_include_chain (pfile, (char *)xstrdup(arg), SYSTEM, 0);
          break;
        case OPT_include:
          {
@@ -1618,7 +1618,7 @@ cpp_handle_option (pfile, argc, argv)
          break;
        case OPT_idirafter:
          /* Add directory to end of path for includes.  */
-         append_include_chain (pfile, xstrdup (arg), AFTER, 0);
+         append_include_chain (pfile, (char *)xstrdup (arg), AFTER, 0);
          break;
        case OPT_W:
          /* Silently ignore unrecognised options.  */

diff --git a/support/cpp2/intl.c b/support/cpp2/intl.c
index 761daf33e0668b3a112d0bfd30c4a6990a51ea73..c4d7680170fbe3ab6e554295c12870cf4ddf89d4 100644 (file)
--- a/support/cpp2/intl.c
+++ b/support/cpp2/intl.c
@@ -1,5 +1,6 @@
 /* intl.c - internationalization */
 
+#include "auto-host.h"
 #include "ansidecl.h"
 #include "intl.h"