Changeset 144 for trunk/src/os2ahci/Makefile

Timestamp:

Jan 3, 2013, 1:22:56 PM (13 years ago)

Author:

rousseau

Message:

Fixed the Open Watcom build

Building with Open Watcom produced a non working driver.

Causes & Fixes

o Enum types were 8 bits when using WCC

This caused the functions with variable arguments to fail.
Adding the -ei compiler-flag to WCC solved this issue.

o Incorrect inline assembler syntax to call DeviceHelp in os2ahci.c

DeviceHelp is a 16:16 far pointer residing in memory.
MASM interprets 'call DeviceHelp' differently than WASM.
The correct syntax is: 'call dword ptr [DeviceHelp]'.

o Missing segments from TGROUP in init.asm

WLINK then generates the AUTO class, most probably causing incorrect
relocation fixups.

Enhancements

o WASM (or JWASM) can now be used instead of ALP
o WCC can now be used instead of CL
o The Open Watcom linker (WLINK) can now be used instead of LINK
o Streamlined both makefiles a notch so it's easy to use both tool-chains

To investigate

o CL barks about a missing prototype for DevHelp_Yield() in lib.c

The prototype is actually defined in dhcalls.h but CL still barks.

o Using WCC with ALP and WLINK produces an oversized image

Probaly due to misplaced BSS segments. WCC with ALP and LINK produces
a normal sized image however.

File:

• trunk/src/os2ahci/Makefile (modified) (5 diffs)

trunk/src/os2ahci/Makefile

@@ -55 +55 @@
                -I$(DDK)\base\src\dev\dasd\diskh \
                -I$(DDK)\base\src\dev\thinkpad\dockii\apmcalls \
-               -I$(CC16)\include
+#               -I$(CC16)\include
 
 AS_INCLUDE   = -I:$(DDK)\base\inc \
@@ -63 +63 @@
                $(DDK)\base\src\dev\dasd\devhlp\ \
                $(DDK)\base\src\dev\thinkpad\dockii\apmcalls\ \
-               $(CC16)\lib\ \
+#               $(CC16)\lib\ \
 
 
@@ -85 +85 @@
 
 clean:
-        rm -f $(OBJS) $(TARGET) *.cod *.lst *.def *.map *.sym bldday.h
+        rm -f $(OBJS) $(TARGET) *.cod *.lst *.def *.map *.sym *.err *.lnk \
+                bldday.h
 
 
@@ -132 +133 @@
 .asm.obj:
         $(AS) $(AFLAGS) $(AS_INCLUDE) $*.asm
+        wdis -l $*.obj
 
 .c.obj:
         $(CC) $(CFLAGS) $(CC_INCLUDE) $*.c
+        wdis -l $*.obj
 
 os2ahci.def:
@@ -143 +146 @@
         $(LD) $(LFLAGS) $(OBJS),$(TARGET),$*.map,$(LIB_DIRS) $(LIBS),$*.def
         $(MAPSYM) os2ahci
-
-