Sender: vheyndri AT rug DOT ac DOT be
Message-Id: <3447150C.7323@rug.ac.be>
Date: Fri, 17 Oct 1997 09:34:36 +0200
From: Vik Heyndrickx <Vik DOT Heyndrickx AT rug DOT ac DOT be>
Mime-Version: 1.0
To: djgpp workers <djgpp-workers AT delorie DOT com>
Subject: 971009: various patches, no functional differences
Content-Type: multipart/mixed; boundary="------------2B425D2C3356"
Precedence: bulk

This is a multi-part message in MIME format.

--------------2B425D2C3356
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

The following patches were necessary in order to build
djlsr202.alpha.97.10.09 without any error under Loose95. None of them
add or modify functionality. Some of the changes were necessary to
compile successfully under (yet to release) gcc-2.8.

I added a gcc-libm.opt file which overrides some options in gcc.opt for
the libm sources. 

First rename the file in dir libm/src
 math_pri.h 
to
 math_private.h

For the rest the source is now LFN clean.

Change to the $(DJDIR) directory
Then apply the patch:
 patch -p1 < fname

That's all folks.

-- 
+----------------+
| Vik Heyndrickx |
+----------------+

--------------2B425D2C3356
Content-Type: text/plain; charset=us-ascii; name="src00_01.dif"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="src00_01.dif"

diff -u -r -N orig/src/debug/edebug/unassmbl.c 01/src/debug/edebug/unassmbl.c
--- orig/src/debug/edebug/unassmbl.c	Sun Aug 31 06:23:46 1997
+++ 01/src/debug/edebug/unassmbl.c	Thu Oct 16 15:10:22 1997
@@ -28,7 +28,7 @@
 static word32 vaddr;
 static int bufp, bufe;
 static char ubuf[4000], *ubufp;
-static col;
+static int col;
 
 static void ua_str(const char *s);
 
@@ -309,11 +309,11 @@
 
 static int default_pick_sign;
 
-static prefix;
-static modrmv;
-static sibv;
-static opsize;
-static addrsize;
+static int prefix;
+static int modrmv;
+static int sibv;
+static int opsize;
+static int addrsize;
 
 static int modrm(void)
 {
@@ -875,7 +875,7 @@
 } line_info;
 
 static line_info *files;
-static last_file = 0;
+static int last_file = 0;
 
 /*
 ** add_file -- add a file to the source line database
diff -u -r -N orig/src/debug/fsdb/fullscr.c 01/src/debug/fsdb/fullscr.c
--- orig/src/debug/fsdb/fullscr.c	Thu Jan 25 04:53:42 1996
+++ 01/src/debug/fsdb/fullscr.c	Thu Oct 16 15:10:22 1997
@@ -395,7 +395,7 @@
   asm ("inb	$0xa0, %%al
 	testb	$0x20, %%al
 	jz	1f
-	xorl	%%al, %%al
+	xorb	%%al, %%al
 	outb	%%al, $0xf0
 	movb	$0x20, %%al
 	outb	%%al, $0xa0
diff -u -r -N orig/src/gcc.opt 01/src/gcc.opt
--- orig/src/gcc.opt	Wed Dec  7 11:34:52 1994
+++ 01/src/gcc.opt	Thu Oct 16 15:10:22 1997
@@ -11,4 +11,5 @@
 -Wstrict-prototypes
 -Wtraditional
 -Wwrite-strings
+-Wno-sign-compare
 -nostdinc
diff -u -r -N orig/src/libc/ansi/stdio/doprnt.c 01/src/libc/ansi/stdio/doprnt.c
--- orig/src/libc/ansi/stdio/doprnt.c	Sun Aug 31 22:02:16 1997
+++ 01/src/libc/ansi/stdio/doprnt.c	Thu Oct 16 15:10:22 1997
@@ -59,8 +59,8 @@
 #define	ZEROPAD		0x20		/* zero (as opposed to blank) pad */
 #define	HEXPREFIX	0x40		/* add 0x or 0X prefix */
 
-static cvtl(long double number, int prec, int flags, char *signp,
-	    unsigned char fmtch, char *startp, char *endp);
+static int cvtl(long double number, int prec, int flags, char *signp,
+	        unsigned char fmtch, char *startp, char *endp);
 static char *roundl(long double fract, int *expv, char *start, char *end,
 		    char ch, char *signp);
 static char *exponentl(char *p, int expv, unsigned char fmtch);
diff -u -r -N orig/src/libc/ansi/stdio/doscan.c 01/src/libc/ansi/stdio/doscan.c
--- orig/src/libc/ansi/stdio/doscan.c	Sun Aug 31 21:48:36 1997
+++ 01/src/libc/ansi/stdio/doscan.c	Thu Oct 16 15:10:22 1997
@@ -168,7 +168,7 @@
 {
   register char *np;
   char numbuf[64];
-  register c, base;
+  register int c, base;
   int expseen, scale, negflg, c1, ndigit;
   long long lcval;
   int cpos;
@@ -301,7 +301,7 @@
 _instr(char *ptr, int type, int len, FILE *iop,
        int (*scan_getc)(FILE *), int (*scan_ungetc)(int, FILE *), int *eofptr)
 {
-  register ch;
+  register int ch;
   register char *optr;
   int ignstp;
 
@@ -352,7 +352,7 @@
 static const char *
 _getccl(const unsigned char *s)
 {
-  register c, t;
+  register int c, t;
 
   t = 0;
   if (*s == '^') {
diff -u -r -N orig/src/libm/src/gcc-libm.opt 01/src/libm/src/gcc-libm.opt
--- orig/src/libm/src/gcc-libm.opt	Thu Jan  1 00:00:00 1970
+++ 01/src/libm/src/gcc-libm.opt	Thu Oct 16 16:28:40 1997
@@ -0,0 +1,9 @@
+-D_USE_LIBM_MATH_H
+-Wno-strict-prototypes
+-Wno-missing-prototypes
+-Wno-missing-declarations
+-Wno-uninitialized
+-Wno-shadow
+-Wno-parentheses
+-Wno-traditional
+-Wno-write-strings
diff -u -r -N orig/src/libm/src/makefile 01/src/libm/src/makefile
--- orig/src/libm/src/makefile	Sat Nov 18 23:26:14 1995
+++ 01/src/libm/src/makefile	Thu Oct 16 15:51:50 1997
@@ -1,7 +1,7 @@
 # Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details
 TOP=..
 
-CFLAGS = -Wno-error -Wno-strict-prototypes -D_USE_LIBM_MATH_H
+CFLAGS = @gcc-libm.opt
 
 SRC += e_acos.S
 SRC += e_acosh.c
diff -u -r -N orig/src/makeall.bat 01/src/makeall.bat
--- orig/src/makeall.bat	Mon Sep  1 15:47:22 1997
+++ 01/src/makeall.bat	Thu Oct 16 15:10:22 1997
@@ -54,5 +54,5 @@
 make
 if errorlevel 1 goto exit
 
-cd ../..
+cd ..\..
 :exit
diff -u -r -N orig/src/mkdoc/makefile 01/src/mkdoc/makefile
--- orig/src/mkdoc/makefile	Mon Sep  2 01:38:54 1996
+++ 01/src/mkdoc/makefile	Thu Oct 16 15:10:22 1997
@@ -1,6 +1,6 @@
 # Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details
 ../../bin/mkdoc.exe : mkdoc.o
-	ld ../../lib/crt0.o $^ -L../../lib/ -lgcc -lc -o ../../bin/mkdoc.exe -T ../../lib/djgpp.djl
+	ld ../../lib/crt0.o $^ -L../../lib/ -lc -lgcc -lc -o ../../bin/mkdoc.exe -T ../../lib/djgpp.djl
 	../../bin/stubify -v ../../bin/mkdoc.exe
 
 mkdoc.o : mkdoc.cc

--------------2B425D2C3356--