[llvm-commits] [parallel] CVS: llvm/runtime/zlib/msdos/Makefile.bor Makefile.dj2 Makefile.emx Makefile.msc Makefile.tc

Misha Brukman brukman at cs.uiuc.edu
Mon Mar 1 18:24:27 PST 2004


Changes in directory llvm/runtime/zlib/msdos:

Makefile.bor added (r1.1.2.1)
Makefile.dj2 added (r1.1.2.1)
Makefile.emx added (r1.1.2.1)
Makefile.msc added (r1.1.2.1)
Makefile.tc added (r1.1.2.1)

---
Log message:

Merge from trunk

---
Diffs of the changes:  (+482 -0)

Index: llvm/runtime/zlib/msdos/Makefile.bor
diff -c /dev/null llvm/runtime/zlib/msdos/Makefile.bor:1.1.2.1
*** /dev/null	Mon Mar  1 17:58:58 2004
--- llvm/runtime/zlib/msdos/Makefile.bor	Mon Mar  1 17:58:48 2004
***************
*** 0 ****
--- 1,109 ----
+ # Makefile for zlib
+ # Borland C++
+ # Last updated: 15-Mar-2003
+ 
+ # To use, do "make -fmakefile.bor"
+ # To compile in small model, set below: MODEL=s
+ 
+ # WARNING: the small model is supported but only for small values of
+ # MAX_WBITS and MAX_MEM_LEVEL. For example:
+ #    -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3
+ # If you wish to reduce the memory requirements (default 256K for big
+ # objects plus a few K), you can add to the LOC macro below:
+ #   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+ # See zconf.h for details about the memory requirements.
+ 
+ # ------------ 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.
+ CPU_TYP = 0
+ 
+ # 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
+ LD=bcc
+ AR=tlib
+ 
+ # compiler flags
+ # replace "-O2" by "-O -G -a -d" for Turbo C++ 1.0
+ CFLAGS=-O2 -Z -m$(MODEL) $(LOC)
+ 
+ LDFLAGS=-m$(MODEL) -f-
+ 
+ 
+ # variables
+ ZLIB_LIB = zlib_$(MODEL).lib
+ 
+ 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
+ 
+ 
+ # targets
+ all: $(ZLIB_LIB) example.exe minigzip.exe
+ 
+ .c.obj:
+ 	$(CC) -c $(CFLAGS) $*.c
+ 
+ adler32.obj: adler32.c zlib.h zconf.h
+ 
+ compress.obj: compress.c zlib.h zconf.h
+ 
+ crc32.obj: crc32.c zlib.h zconf.h crc32.h
+ 
+ deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+ 
+ gzio.obj: gzio.c zutil.h zlib.h zconf.h
+ 
+ infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+  inffast.h inffixed.h
+ 
+ inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+  inffast.h
+ 
+ inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+  inffast.h inffixed.h
+ 
+ inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+ 
+ trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+ 
+ uncompr.obj: uncompr.c zlib.h zconf.h
+ 
+ zutil.obj: zutil.c zutil.h zlib.h zconf.h
+ 
+ example.obj: example.c zlib.h zconf.h
+ 
+ minigzip.obj: minigzip.c zlib.h zconf.h
+ 
+ 
+ # 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)
+ 
+ example.exe: example.obj $(ZLIB_LIB)
+ 	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
+ 
+ minigzip.exe: minigzip.obj $(ZLIB_LIB)
+ 	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
+ 
+ test: example.exe minigzip.exe
+ 	example
+ 	echo hello world | minigzip | minigzip -d
+ 
+ clean:
+ 	-del *.obj
+ 	-del *.lib
+ 	-del *.exe
+ 	-del zlib_*.bak
+ 	-del foo.gz


Index: llvm/runtime/zlib/msdos/Makefile.dj2
diff -c /dev/null llvm/runtime/zlib/msdos/Makefile.dj2:1.1.2.1
*** /dev/null	Mon Mar  1 17:58:58 2004
--- llvm/runtime/zlib/msdos/Makefile.dj2	Mon Mar  1 17:58:48 2004
***************
*** 0 ****
--- 1,104 ----
+ # Makefile for zlib.  Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96.
+ # Copyright (C) 1995-1998 Jean-loup Gailly.
+ # For conditions of distribution and use, see copyright notice in zlib.h
+ 
+ # To compile, or to compile and test, type:
+ #
+ #   make -fmakefile.dj2;  make test -fmakefile.dj2
+ #
+ # To install libz.a, zconf.h and zlib.h in the djgpp directories, type:
+ #
+ #    make install -fmakefile.dj2
+ #
+ # after first defining LIBRARY_PATH and INCLUDE_PATH in djgpp.env as
+ # in the sample below if the pattern of the DJGPP distribution is to
+ # be followed.  Remember that, while <sp>'es around <=> are ignored in
+ # makefiles, they are *not* in batch files or in djgpp.env.
+ # - - - - -
+ # [make]
+ # INCLUDE_PATH=%\>;INCLUDE_PATH%%\DJDIR%\include
+ # LIBRARY_PATH=%\>;LIBRARY_PATH%%\DJDIR%\lib
+ # BUTT=-m486
+ # - - - - -
+ # Alternately, these variables may be defined below, overriding the values
+ # in djgpp.env, as
+ # INCLUDE_PATH=c:\usr\include
+ # LIBRARY_PATH=c:\usr\lib
+ 
+ CC=gcc
+ 
+ #CFLAGS=-MMD -O
+ #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+ #CFLAGS=-MMD -g -DDEBUG
+ CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+              -Wstrict-prototypes -Wmissing-prototypes
+ 
+ # If cp.exe is available, replace "copy /Y" with "cp -fp" .
+ CP=copy /Y
+ # If gnu install.exe is available, replace $(CP) with ginstall.
+ INSTALL=$(CP)
+ # The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
+ RM=del
+ LDLIBS=-L. -lz
+ LD=$(CC) -s -o
+ LDSHARED=$(CC)
+ 
+ INCL=zlib.h zconf.h
+ LIBS=libz.a
+ 
+ AR=ar rcs
+ 
+ prefix=/usr/local
+ exec_prefix = $(prefix)
+ 
+ OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+        zutil.o inflate.o infback.o inftrees.o inffast.o
+ 
+ OBJA =
+ # to use the asm code: make OBJA=match.o
+ 
+ TEST_OBJS = example.o minigzip.o
+ 
+ all: example.exe minigzip.exe
+ 
+ check: test
+ test: all
+ 	./example
+ 	echo hello world | .\minigzip | .\minigzip -d
+ 
+ %.o : %.c
+ 	$(CC) $(CFLAGS) -c $< -o $@
+ 
+ libz.a: $(OBJS) $(OBJA)
+ 	$(AR) $@ $(OBJS) $(OBJA)
+ 
+ %.exe : %.o $(LIBS)
+ 	$(LD) $@ $< $(LDLIBS)
+ 
+ # INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env .
+ 
+ .PHONY : uninstall clean
+ 
+ install: $(INCL) $(LIBS)
+ 	- at if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH)
+ 	- at if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH)
+ 	$(INSTALL) zlib.h $(INCLUDE_PATH)
+ 	$(INSTALL) zconf.h $(INCLUDE_PATH)
+ 	$(INSTALL) libz.a $(LIBRARY_PATH)
+ 
+ uninstall:
+ 	$(RM) $(INCLUDE_PATH)\zlib.h
+ 	$(RM) $(INCLUDE_PATH)\zconf.h
+ 	$(RM) $(LIBRARY_PATH)\libz.a
+ 
+ clean:
+ 	$(RM) *.d
+ 	$(RM) *.o
+ 	$(RM) *.exe
+ 	$(RM) libz.a
+ 	$(RM) foo.gz
+ 
+ DEPS := $(wildcard *.d)
+ ifneq ($(DEPS),)
+ include $(DEPS)
+ endif


Index: llvm/runtime/zlib/msdos/Makefile.emx
diff -c /dev/null llvm/runtime/zlib/msdos/Makefile.emx:1.1.2.1
*** /dev/null	Mon Mar  1 17:58:58 2004
--- llvm/runtime/zlib/msdos/Makefile.emx	Mon Mar  1 17:58:48 2004
***************
*** 0 ****
--- 1,69 ----
+ # Makefile for zlib.  Modified for emx 0.9c by Chr. Spieler, 6/17/98.
+ # Copyright (C) 1995-1998 Jean-loup Gailly.
+ # For conditions of distribution and use, see copyright notice in zlib.h
+ 
+ # To compile, or to compile and test, type:
+ #
+ #   make -fmakefile.emx;  make test -fmakefile.emx
+ #
+ 
+ CC=gcc
+ 
+ #CFLAGS=-MMD -O
+ #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+ #CFLAGS=-MMD -g -DDEBUG
+ CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+              -Wstrict-prototypes -Wmissing-prototypes
+ 
+ # If cp.exe is available, replace "copy /Y" with "cp -fp" .
+ CP=copy /Y
+ # If gnu install.exe is available, replace $(CP) with ginstall.
+ INSTALL=$(CP)
+ # The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
+ RM=del
+ LDLIBS=-L. -lzlib
+ LD=$(CC) -s -o
+ LDSHARED=$(CC)
+ 
+ INCL=zlib.h zconf.h
+ LIBS=zlib.a
+ 
+ AR=ar rcs
+ 
+ prefix=/usr/local
+ exec_prefix = $(prefix)
+ 
+ OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
+        zutil.o inflate.o infback.o inftrees.o inffast.o
+ 
+ TEST_OBJS = example.o minigzip.o
+ 
+ all: example.exe minigzip.exe
+ 
+ test: all
+ 	./example
+ 	echo hello world | .\minigzip | .\minigzip -d
+ 
+ %.o : %.c
+ 	$(CC) $(CFLAGS) -c $< -o $@
+ 
+ zlib.a: $(OBJS)
+ 	$(AR) $@ $(OBJS)
+ 
+ %.exe : %.o $(LIBS)
+ 	$(LD) $@ $< $(LDLIBS)
+ 
+ 
+ .PHONY : clean
+ 
+ clean:
+ 	$(RM) *.d
+ 	$(RM) *.o
+ 	$(RM) *.exe
+ 	$(RM) zlib.a
+ 	$(RM) foo.gz
+ 
+ DEPS := $(wildcard *.d)
+ ifneq ($(DEPS),)
+ include $(DEPS)
+ endif


Index: llvm/runtime/zlib/msdos/Makefile.msc
diff -c /dev/null llvm/runtime/zlib/msdos/Makefile.msc:1.1.2.1
*** /dev/null	Mon Mar  1 17:58:59 2004
--- llvm/runtime/zlib/msdos/Makefile.msc	Mon Mar  1 17:58:48 2004
***************
*** 0 ****
--- 1,106 ----
+ # Makefile for zlib
+ # Microsoft C 5.1 or later
+ # Last updated: 19-Mar-2003
+ 
+ # To use, do "make makefile.msc"
+ # To compile in small model, set below: MODEL=S
+ 
+ # If you wish to reduce the memory requirements (default 256K for big
+ # objects plus a few K), you can add to the LOC macro below:
+ #   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+ # See zconf.h for details about the memory requirements.
+ 
+ # ------------- Microsoft C 5.1 and later -------------
+ 
+ #    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.
+ CPU_TYP = 0
+ 
+ # Memory model: one of S, M, C, L (small, medium, compact, large)
+ MODEL=L
+ 
+ CC=cl
+ CFLAGS=-nologo -A$(MODEL) -G$(CPU_TYP) -W3 -Oait -Gs $(LOC)
+ #-Ox generates bad code with MSC 5.1
+ LIB_CFLAGS=-Zl $(CFLAGS)
+ 
+ LD=link
+ LDFLAGS=/noi/e/st:0x1500/noe/farcall/packcode
+ # "/farcall/packcode" are only useful for `large code' memory models
+ # but should be a "no-op" for small code models.
+ 
+ 
+ # variables
+ ZLIB_LIB = zlib_$(MODEL).lib
+ 
+ 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
+ 
+ 
+ # targets
+ all:  $(ZLIB_LIB) example.exe minigzip.exe
+ 
+ .c.obj:
+ 	$(CC) -c $(LIB_CFLAGS) $*.c
+ 
+ adler32.obj: adler32.c zlib.h zconf.h
+ 
+ compress.obj: compress.c zlib.h zconf.h
+ 
+ crc32.obj: crc32.c zlib.h zconf.h crc32.h
+ 
+ deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+ 
+ gzio.obj: gzio.c zutil.h zlib.h zconf.h
+ 
+ infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+  inffast.h inffixed.h
+ 
+ inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+  inffast.h
+ 
+ inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+  inffast.h inffixed.h
+ 
+ inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+ 
+ trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+ 
+ uncompr.obj: uncompr.c zlib.h zconf.h
+ 
+ zutil.obj: zutil.c zutil.h zlib.h zconf.h
+ 
+ example.obj: example.c zlib.h zconf.h
+ 	$(CC) -c $(CFLAGS) $*.c
+ 
+ minigzip.obj: minigzip.c zlib.h zconf.h
+ 	$(CC) -c $(CFLAGS) $*.c
+ 
+ 
+ # the command line is cut to fit in the MS-DOS 128 byte limit:
+ $(ZLIB_LIB): $(OBJ1) $(OBJ2)
+ 	if exist $(ZLIB_LIB) del $(ZLIB_LIB)
+ 	lib $(ZLIB_LIB) $(OBJ1);
+ 	lib $(ZLIB_LIB) $(OBJ2);
+ 
+ example.exe: example.obj $(ZLIB_LIB)
+ 	$(LD) $(LDFLAGS) example.obj,,,$(ZLIB_LIB);
+ 
+ minigzip.exe: minigzip.obj $(ZLIB_LIB)
+ 	$(LD) $(LDFLAGS) minigzip.obj,,,$(ZLIB_LIB);
+ 
+ test: example.exe minigzip.exe
+ 	example
+ 	echo hello world | minigzip | minigzip -d
+ 
+ clean:
+ 	-del *.obj
+ 	-del *.lib
+ 	-del *.exe
+ 	-del *.map
+ 	-del zlib_*.bak
+ 	-del foo.gz


Index: llvm/runtime/zlib/msdos/Makefile.tc
diff -c /dev/null llvm/runtime/zlib/msdos/Makefile.tc:1.1.2.1
*** /dev/null	Mon Mar  1 17:58:59 2004
--- llvm/runtime/zlib/msdos/Makefile.tc	Mon Mar  1 17:58:48 2004
***************
*** 0 ****
--- 1,94 ----
+ # Makefile for zlib
+ # Turbo C 2.01, Turbo C++ 1.01
+ # Last updated: 15-Mar-2003
+ 
+ # To use, do "make -fmakefile.tc"
+ # To compile in small model, set below: MODEL=s
+ 
+ # WARNING: the small model is supported but only for small values of
+ # MAX_WBITS and MAX_MEM_LEVEL. For example:
+ #    -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+ # If you wish to reduce the memory requirements (default 256K for big
+ # objects plus a few K), you can add to CFLAGS below:
+ #   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+ # See zconf.h for details about the memory requirements.
+ 
+ # ------------ Turbo C 2.01, Turbo C++ 1.01 ------------
+ MODEL=l
+ CC=tcc
+ LD=tcc
+ AR=tlib
+ # CFLAGS=-O2 -G -Z -m$(MODEL) -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+ CFLAGS=-O2 -G -Z -m$(MODEL)
+ LDFLAGS=-m$(MODEL) -f-
+ 
+ 
+ # variables
+ ZLIB_LIB = zlib_$(MODEL).lib
+ 
+ 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
+ 
+ 
+ # targets
+ all: $(ZLIB_LIB) example.exe minigzip.exe
+ 
+ .c.obj:
+ 	$(CC) -c $(CFLAGS) $*.c
+ 
+ adler32.obj: adler32.c zlib.h zconf.h
+ 
+ compress.obj: compress.c zlib.h zconf.h
+ 
+ crc32.obj: crc32.c zlib.h zconf.h crc32.h
+ 
+ deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+ 
+ gzio.obj: gzio.c zutil.h zlib.h zconf.h
+ 
+ infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+  inffast.h inffixed.h
+ 
+ inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+  inffast.h
+ 
+ inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+  inffast.h inffixed.h
+ 
+ inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+ 
+ trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+ 
+ uncompr.obj: uncompr.c zlib.h zconf.h
+ 
+ zutil.obj: zutil.c zutil.h zlib.h zconf.h
+ 
+ example.obj: example.c zlib.h zconf.h
+ 
+ minigzip.obj: minigzip.c zlib.h zconf.h
+ 
+ 
+ # 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)
+ 
+ example.exe: example.obj $(ZLIB_LIB)
+ 	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
+ 
+ minigzip.exe: minigzip.obj $(ZLIB_LIB)
+ 	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
+ 
+ test: example.exe minigzip.exe
+ 	example
+ 	echo hello world | minigzip | minigzip -d
+ 
+ clean:
+ 	-del *.obj
+ 	-del *.lib
+ 	-del *.exe
+ 	-del zlib_*.bak
+ 	-del foo.gz





More information about the llvm-commits mailing list