PR libgcj/14856:

	* Imported zlib 1.2.1; merged local changes.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88898 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 47 insertions, 63 deletions

diff --git a/zlib/msdos/Makefile.bor b/zlib/msdos/Makefile.bor
index f5651b40fec..8f8132d1223 100644
--- a/zlib/msdos/Makefile.bor
+++ b/zlib/msdos/Makefile.bor
@@ -1,5 +1,6 @@
 # Makefile for zlib
-# Borland C++   ************ UNTESTED ***********
+# Borland C++
+# Last updated: 15-Mar-2003
 
 # To use, do "make -fmakefile.bor"
 # To compile in small model, set below: MODEL=s
@@ -12,103 +13,83 @@
 #   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.
 
-# ------------- Turbo C++, Borland C++ -------------
+# ------------ Turbo C++, Borland C++ ------------
 
 #    Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
 #    should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added
 #    to the declaration of LOC here:
 LOC = $(LOCAL_ZLIB)
 
-# Type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc.
+# type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc.
 CPU_TYP = 0
 
-# Memory model: one of s, m, c, l (small, medium, compact, large)
+# memory model: one of s, m, c, l (small, medium, compact, large)
 MODEL=l
 
+# replace bcc with tcc for Turbo C++ 1.0, with bcc32 for the 32 bit version
 CC=bcc
-#   replace bcc with tcc for Turbo C++ 1.0, with bcc32 for the 32 bit version
-LD=$(CC)
+LD=bcc
 AR=tlib
 
 # compiler flags
+# replace "-O2" by "-O -G -a -d" for Turbo C++ 1.0
 CFLAGS=-O2 -Z -m$(MODEL) $(LOC)
-#   replace "-O2" by "-O -G -a -d" for Turbo C++ 1.0
 
-LDFLAGS=-m$(MODEL)
+LDFLAGS=-m$(MODEL) -f-
 
-O=.obj
 
 # variables
-OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
-  trees$(O)
-OBJP1 = adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)+\
-  trees$(O)
-OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
-  infutil$(O) inffast$(O)
-OBJP2 = zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)+\
-  infutil$(O)+inffast$(O)
-
-ZLIB_H = zlib.h zconf.h
-ZUTIL_H = zutil.h $(ZLIB_H)
-
 ZLIB_LIB = zlib_$(MODEL).lib
 
-all: test
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj
+OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj
+OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
 
-# individual dependencies and action rules:
-adler32.obj: adler32.c $(ZLIB_H)
-	$(CC) -c $(CFLAGS) $*.c
 
-compress.obj: compress.c $(ZLIB_H)
-	$(CC) -c $(CFLAGS) $*.c
+# targets
+all: $(ZLIB_LIB) example.exe minigzip.exe
 
-crc32.obj: crc32.c $(ZLIB_H)
+.c.obj:
 	$(CC) -c $(CFLAGS) $*.c
 
-deflate.obj: deflate.c deflate.h $(ZUTIL_H)
-	$(CC) -c $(CFLAGS) $*.c
+adler32.obj: adler32.c zlib.h zconf.h
 
-gzio.obj: gzio.c $(ZUTIL_H)
-	$(CC) -c $(CFLAGS) $*.c
+compress.obj: compress.c zlib.h zconf.h
 
-infblock.obj: infblock.c $(ZUTIL_H) infblock.h inftrees.h infcodes.h infutil.h
-	$(CC) -c $(CFLAGS) $*.c
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
 
-infcodes.obj: infcodes.c $(ZUTIL_H) inftrees.h infutil.h infcodes.h inffast.h
-	$(CC) -c $(CFLAGS) $*.c
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
 
-inflate.obj: inflate.c $(ZUTIL_H) infblock.h
-	$(CC) -c $(CFLAGS) $*.c
+gzio.obj: gzio.c zutil.h zlib.h zconf.h
 
-inftrees.obj: inftrees.c $(ZUTIL_H) inftrees.h
-	$(CC) -c $(CFLAGS) $*.c
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
 
-infutil.obj: infutil.c $(ZUTIL_H) inftrees.h infutil.h
-	$(CC) -c $(CFLAGS) $*.c
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h
 
-inffast.obj: inffast.c $(ZUTIL_H) inftrees.h infutil.h inffast.h
-	$(CC) -c $(CFLAGS) $*.c
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
 
-trees.obj: trees.c deflate.h $(ZUTIL_H)
-	$(CC) -c $(CFLAGS) $*.c
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
 
-uncompr.obj: uncompr.c $(ZLIB_H)
-	$(CC) -c $(CFLAGS) $*.c
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
 
-zutil.obj: zutil.c $(ZUTIL_H)
-	$(CC) -c $(CFLAGS) $*.c
+uncompr.obj: uncompr.c zlib.h zconf.h
 
-example.obj: example.c $(ZLIB_H)
-	$(CC) -c $(CFLAGS) $*.c
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
 
-minigzip.obj: minigzip.c $(ZLIB_H)
-	$(CC) -c $(CFLAGS) $*.c
+example.obj: example.c zlib.h zconf.h
+
+minigzip.obj: minigzip.c zlib.h zconf.h
 
-# we must cut the command line to fit in the MS/DOS 128 byte limit:
+
+# the command line is cut to fit in the MS-DOS 128 byte limit:
 $(ZLIB_LIB): $(OBJ1) $(OBJ2)
-	del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) +$(OBJP1)
-	$(AR) $(ZLIB_LIB) +$(OBJP2)
+	-del $(ZLIB_LIB)
+	$(AR) $(ZLIB_LIB) $(OBJP1)
+	$(AR) $(ZLIB_LIB) $(OBJP2)
 
 example.exe: example.obj $(ZLIB_LIB)
 	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
@@ -118,8 +99,11 @@ minigzip.exe: minigzip.obj $(ZLIB_LIB)
 
 test: example.exe minigzip.exe
 	example
-	echo hello world | minigzip | minigzip -d 
-
-#clean:
-#	del *.obj
-#	del *.exe
+	echo hello world | minigzip | minigzip -d
+
+clean:
+	-del *.obj
+	-del *.lib
+	-del *.exe
+	-del zlib_*.bak
+	-del foo.gz