diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | OS2_MAKEFILE | 64 | ||||
| -rw-r--r-- | WCC_MAKEFILE | 2 | ||||
| -rw-r--r-- | doc/README.OS2 | 11 |
4 files changed, 11 insertions, 68 deletions
diff --git a/Makefile.am b/Makefile.am index 01acb649..3454fa1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -182,7 +182,7 @@ CCASFLAGS += $(DEFS) # # other makefiles -EXTRA_DIST += NT_MAKEFILE OS2_MAKEFILE PCR-Makefile digimars.mak \ +EXTRA_DIST += NT_MAKEFILE PCR-Makefile digimars.mak \ Makefile.direct SMakefile.amiga WCC_MAKEFILE autogen.sh CMakeLists.txt \ Config.cmake.in diff --git a/OS2_MAKEFILE b/OS2_MAKEFILE deleted file mode 100644 index 4fd61935..00000000 --- a/OS2_MAKEFILE +++ /dev/null @@ -1,64 +0,0 @@ -# Makefile for OS/2. Assumes IBM's compiler, static linking, and a single thread. -# Adding dynamic linking support seems easy, but takes a little bit of work. -# Adding thread support may be nontrivial, since we haven't yet figured out how to -# look at another thread's registers. - -# Significantly revised by Mark Boulter (Jan 1994). - -OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj fnlz_mlc.obj malloc.obj typd_mlc.obj ptr_chck.obj mallocx.obj gcj_mlc.obj - -CORDOBJS= cord\cordbscs.obj cord\cordxtra.obj cord\cordprnt.obj - -# Extra user-defined flags to pass to the compiler. -CFLAGS_EXTRA= - -CC= icc -CFLAGS= /O /Q /DALL_INTERIOR_POINTERS /DENABLE_DISCLAIM /DGC_ATOMIC_UNCOLLECTABLE /DGC_GCJ_SUPPORT /DJAVA_FINALIZATION /DNO_EXECUTE_PERMISSION /DSMALL_CONFIG $(CFLAGS_EXTRA) -# Use /Ti instead of /O for debugging -# setjmp_test may yield overly optimistic results when compiled -# without optimization. - -all: gc.lib cord.lib - -check-deps: gctest.exe cordtest.exe - -check: check-deps - gctest.exe - cordtest.exe - -$(OBJS) test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h - -## ERASE THE LIB FIRST - if it is already there then this command will fail -## (make sure it is there or erase will fail!) -gc.lib: $(OBJS) - echo . > gc.lib - erase gc.lib - LIB gc.lib $(OBJS), gc.lst - -mach_dep.obj: mach_dep.c - $(CC) $(CFLAGS) /C mach_dep.c - -gctest.exe: test.obj gc.lib - $(CC) $(CFLAGS) /B"/STACK:524288" /Fegctest test.obj gc.lib - -cord\cordbscs.obj: cord\cordbscs.c include\gc\cord.h include\gc\cord_pos.h - $(CC) $(CFLAGS) /C /Focord\cordbscs cord\cordbscs.c - -cord\cordxtra.obj: cord\cordxtra.c include\gc\cord.h include\gc\cord_pos.h include\gc\ec.h - $(CC) $(CFLAGS) /C /Focord\cordxtra cord\cordxtra.c - -cord\cordprnt.obj: cord\cordprnt.c include\gc\cord.h include\gc\cord_pos.h include\gc\ec.h - $(CC) $(CFLAGS) /C /Focord\cordprnt cord\cordprnt.c - -cord.lib: $(CORDOBJS) - echo . > cord.lib - erase cord.lib - LIB cord.lib $(CORDOBJS), cord.lst - -cordtest.exe: cord\tests\cordtest.c include\gc\cord.h include\gc\cord_pos.h include\gc\ec.h gc.lib cord.lib - $(CC) $(CFLAGS) /B"/STACK:65536" /Fecordtest cord\tests\cordtest.c gc.lib cord.lib - -clean: - erase gc.lib cord.lib - erase gctest.exe cordtest.exe - erase $(OBJS) $(CORDOBJS) diff --git a/WCC_MAKEFILE b/WCC_MAKEFILE index 0c6ceacf..57dccbdb 100644 --- a/WCC_MAKEFILE +++ b/WCC_MAKEFILE @@ -1,4 +1,4 @@ -# Makefile for Watcom C/C++ 10.5, 10.6, 11.0 on NT, OS2 and DOS4GW. +# Makefile for Watcom C/C++ 10.5, 10.6, 11.0 on NT, OS/2 and DOS4GW. # May work with Watcom 10.0. # Uncomment one of the lines below for cross compilation. diff --git a/doc/README.OS2 b/doc/README.OS2 index 5aaf84c0..fbd9c811 100644 --- a/doc/README.OS2 +++ b/doc/README.OS2 @@ -1,6 +1,13 @@ The code assumes static linking, and a single thread. The editor de has -not been ported. The cord test program has. The supplied OS2_MAKEFILE -assumes the IBM C Set/2 environment, but the code shouldn't. +not been ported; the cord test program has. The supplied WCC_MAKEFILE should +work for OS/2 but was not tested on. Since we haven't figured out how to do partial linking or to build static libraries, clients currently need to link against a long list of executables. + +Notes: +* adding dynamic linking support seems easy, but was not done; +* adding thread support may be nontrivial, since we have not yet figured out + how to look at another thread's registers; +* setjmp_test may yield overly optimistic results when compiled without + optimization. |