Import Dev86src-0.16.9.tar.gzv0.16.9

7 files changed, 76 insertions, 29 deletions

diff --git a/Makefile b/Makefile
index e6c51c0..8c5dbf8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # This file is part of the Linux-8086 Development environment and is
 # distributed under the GNU General Public License.
 
-VERSION=0.16.8
+VERSION=0.16.9
 
 TARGETS= \
     clean bcc unproto copt as86 ld86 elksemu \
diff --git a/bcc/bcc.c b/bcc/bcc.c
index 1a0d4e3..0741572 100644
--- a/bcc/bcc.c
+++ b/bcc/bcc.c
@@ -503,6 +503,8 @@ validate_link_opt(char * option)
    }
    if (err)
       fprintf(stderr, "warning: linker option %s not recognised.\n", option);
+   else if (!do_link)
+      fprintf(stderr, "warning: linker option %s unused.\n", option);
 }
 
 void
@@ -518,6 +520,15 @@ validate_link_opts()
 
    for(next_file = files; next_file; next_file = next_file->next) 
       validate_link_opt(next_file->file);
+
+   if (!do_link) {
+      if (opt_i)
+	 fprintf(stderr, "warning: linker option -i unused.\n");
+      if (opt_x)
+	 fprintf(stderr, "warning: linker option -x unused.\n");
+      if (opt_L)
+	 fprintf(stderr, "warning: linker option -L unused.\n");
+   }
 }
 
 void
@@ -931,16 +942,20 @@ char ** argv;
       break;
    case 'd': 		/* DOS COM file */
       prepend_option("-D__MSDOS__", 'p');
-      libc="-ldos";
-      append_option("-d", 'l');
-      append_option("-T100", 'l');
+      if (do_link) {
+	 libc="-ldos";
+	 append_option("-d", 'l');
+	 append_option("-T100", 'l');
+      }
       break;
    case 'l': 		/* 386 Linux a.out */
       opt_arch=1;
       prepend_option("-D__unix__", 'p');
       prepend_option("-D__linux__", 'p');
-      libc="-lc";
-      append_option("-N", 'l');
+      if (do_link) {
+	 libc="-lc";
+	 append_option("-N", 'l');
+      }
       break;
    case 'g':		/* 386 Linux object using gcc as linker */
       opt_arch = 2;
diff --git a/cpp/c b/cpp/c
new file mode 100755
index 0000000..869f927
--- /dev/null
+++ b/cpp/c
diff --git a/cpp/c.c b/cpp/c.c
index 89f3120..03b3ee3 100644
--- a/cpp/c.c
+++ b/cpp/c.c
@@ -7,29 +7,33 @@
 #define strong_alias(Y,X) asm("export _" "X",  "_" "X" " = _" "Y" )
 #endif
 
-#if __STDC__
-#define comb(x,y) x ## y
-#warning Using Ansi combine
-#elif __BCC__
-#define comb(x,y) x/**/y
-#warning Using bcc combine
-#else
-#define comb(x,y) x/**/y
-#warning Using K&R combine
+#if 1
+# if __STDC__
+# define comb(x,y) x ## y
+# warning Using Ansi combine
+# elif __BCC__
+# define comb(x,y) x/**/y
+# warning Using bcc combine
+# else
+# define comb(x,y) x/**/y
+# warning Using K&R combine
+# endif
 #endif
 
-#define signed unsigned
-#define unsigned signed
+#define o define
+#o signed unsigned
+#o unsigned signed
 
 #ifdef signed
 typedef signed char t_sc;
 typedef comb(un,signed) char t_uc;
-#endif
 
 char c;
 t_sc sc;
 t_uc uc;
+#endif
 
+#pragma full optimise
 strong_alias(main,zulu);
 main()
 {
diff --git a/cpp/cpp.c b/cpp/cpp.c
index 030535e..231760b 100644
--- a/cpp/cpp.c
+++ b/cpp/cpp.c
@@ -23,17 +23,18 @@
  *   c_lineno Current line number in file being parsed.
  *
  *   alltok   Control flag for the kind of tokens you want (C or generic)
- *   dislect  Control flag to change the preprocessor for Ansi C.
+ *   dialect  Control flag to change the preprocessor for Ansi C.
  *
  * TODO:
  *    #asm -> asm("...") translation.
  *    ?: in #if expressions
- *    __DATE__ and __TIME__ macros.
- *    Add #line directive.
- *    Poss: Seperate current directory for #include from errors (#line).
- *    Poss: C99 Variable macro args.
+ *    Complete #line directive.
  *    \n in "\n" in a stringized argument.
  *    Comments in stringized arguments should be deleted.
+ *
+ *    Poss: Seperate current directory for #include from errors (#line).
+ *          (For editors that hunt down source files)
+ *    Poss: C99 Variable macro args.
  */
 
 #define KEEP_SPACE	0
@@ -83,7 +84,7 @@ static int if_count = 0;
 static int if_false = 0;
 static int if_has_else = 0;
 static int if_hidden = 0;
-static int if_stack = 0;
+static unsigned int if_stack = 0;
 
 struct arg_store {
    char * name;
@@ -276,7 +277,7 @@ Try_again:
       if( cc < WORDSIZE-1 ) *p++ = ch;	/* Clip to WORDSIZE */
       *p = '\0'; cc++;
       ch = chget();
-      if (ch == 1) ch = chget();
+      if (ch == SYN) ch = chget();
    }
 break_break:
    /* Numbers */
@@ -671,7 +672,10 @@ do_preproc()
 	    cwarn(curword);
 	 } else if( strcmp(curword, "pragma") == 0 ) {
             do_proc_copy_hashline(); pgetc();
-	    /* Ignore #pragma */
+	    /* Ignore #pragma ? */
+	 } else if( strcmp(curword, "line") == 0 ) {
+            do_proc_copy_hashline(); pgetc();
+	    /* Ignore #line for now. */
 	 } else if( strcmp(curword, "asm") == 0 ) {
 	    alltok |= 0x100;
             return do_proc_copy_hashline();
@@ -905,6 +909,13 @@ do_proc_if(type)
 int type;
 {
    int ch = 0;
+   if(if_false && if_hidden)
+   {
+      if( type != 3 ) if_hidden++;
+      do_proc_tail();
+      return 0;
+   }
+
    if( type == 3 )
    {
       if( if_count == 0 )
diff --git a/cpp/main.c b/cpp/main.c
index 0cbdaa3..dfe0e5c 100644
--- a/cpp/main.c
+++ b/cpp/main.c
@@ -7,6 +7,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <malloc.h>
+#include <time.h>
 
 #include "cc.h"
 
@@ -138,6 +139,22 @@ static char Usage[] = "Usage: cpp -E -0 -Dxxx -Uxxx -Ixxx infile -o outfile";
    if (!curfile)
       cfatal(Usage);
 
+   /* Define date and time macros. */
+   if (dialect != DI_KNR) {
+      time_t now;
+      char * timep;
+      char buf[128];
+      time(&now);
+      timep = ctime(&now);
+
+      /* Yes, well */
+      sprintf(buf, "__TIME__=\"%.8s\"", timep + 11);
+      define_macro(buf);
+      /* US order; Seems to be mandated by standard. */
+      sprintf(buf, "__DATE__=\"%.3s %.2s %.4s\"", timep + 4, timep + 8, timep + 20);
+      define_macro(buf);
+   }
+
    if (outfile) ofd = fopen(outfile, "w");
    else         ofd = stdout;
    if (!ofd)
diff --git a/ld/syshead.h b/ld/syshead.h
index 8ea2a3a..6203dc6 100644
--- a/ld/syshead.h
+++ b/ld/syshead.h
@@ -23,8 +23,8 @@
 #define R_OK	0
 #define mode_t		unsigned short
 #define SEEK_SET	0
-#define STDOUT_FILENO	0
-#define STDERR_FILENO	0
+#define STDOUT_FILENO	1
+#define STDERR_FILENO	2
 #define VERSION 	"MSDOS Compile"
 #endif
 
@@ -55,7 +55,7 @@ void *memset P((void *s, int c, unsigned n));
 #define R_OK	0
 int access P((const char *path, int amode));
 #define SEEK_SET	0
-#define STDOUT_FILENO	0
+#define STDOUT_FILENO	1
 #define STDERR_FILENO	2
 
 #define mode_t		unsigned short