Added Makefile.wat

diff --git a/Makefile.unix b/Makefile.unix
index 4324f5715364fe4a15572c56e62c93baed1cd7cd..a0416b74e733a48de22d17444658a243e1c413b7 100644 (file)
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -1,13 +1,11 @@
 #******************************************************************************
 # @file             Makefile.unix
 #******************************************************************************
-OBJDIR              ?=  $(CURDIR)
 SRCDIR              ?=  $(CURDIR)
-
 VPATH               :=  $(SRCDIR)
 
 CC                  :=  gcc
-CFLAGS              :=  -D_FILE_OFFSET_BITS=64 -I$(OBJDIR) -I$(SRCDIR)/include -O2 -Wall -Werror -Wextra -ansi -pedantic -std=c90
+CFLAGS              :=  -D_FILE_OFFSET_BITS=64 -O2 -Wall -Werror -Wextra -ansi -pedantic -std=c90
 
 CSRC                :=  aout.c elks.c hashtab.c ld.c lib.c link.c map.c pe.c report.c section.c symbol.c vector.c write7x.c
 
@@ -24,5 +22,6 @@ slink: $(CSRC)
 endif
 
 clean:
+
        if [ -f slink ]; then rm -rf slink; fi
        if [ -f slink.exe ]; then rm -rf slink.exe; fi

diff --git a/Makefile.w32 b/Makefile.w32
index 2067a85fc8eca1dc019a2b72deb1ad3943f8956e..7e70fd9622f673e0431d35c671f213acffac5daf 100644 (file)
--- a/Makefile.w32
+++ b/Makefile.w32
@@ -1,21 +1,21 @@
 #******************************************************************************
 # @file             Makefile.w32
 #******************************************************************************
-OBJDIR              ?=  $(CURDIR)
 SRCDIR              ?=  $(CURDIR)
-
 VPATH               :=  $(SRCDIR)
 
 CC                  :=  gcc
-CFLAGS              :=  -D_FILE_OFFSET_BITS=64 -I$(OBJDIR) -I$(SRCDIR)/include -O2 -Wall -Werror -Wextra -ansi -pedantic -std=c90
+CFLAGS              :=  -D_FILE_OFFSET_BITS=64 -O2 -Wall -Werror -Wextra -ansi -pedantic -std=c90
 
 CSRC                :=  aout.c elks.c hashtab.c ld.c lib.c link.c map.c pe.c report.c section.c symbol.c vector.c write7x.c
 
 all: slink.exe
 
 clean:
+
        if exist slink ( del /q slink )
        if exist slink.exe ( del /q slink.exe )
 
 slink.exe: $(CSRC)
+
        $(CC) $(CFLAGS) -o $@ $^

diff --git a/Makefile.wat b/Makefile.wat
new file mode 100644 (file)
index 0000000..96156bb
--- /dev/null
+++ b/Makefile.wat
@@ -0,0 +1,18 @@
+#******************************************************************************
+# @file             Makefile.wat
+#******************************************************************************
+SRCDIR              ?=  $(CURDIR)
+VPATH               :=  $(SRCDIR)
+
+SRC                 :=  aout.c elks.c hashtab.c ld.c lib.c link.c map.c pe.c report.c section.c symbol.c vector.c write7x.c
+
+all: slink.exe
+
+slink.exe: $(SRC)
+
+       wcl -fe=$@ $^
+
+clean:
+
+       for /r %%f in (*.obj) do ( if exist %%f ( del /q %%f ) )
+       if exist slink.exe ( del /q slink.exe )

diff --git a/hashtab.c b/hashtab.c
index 9ddaf7e83a6f4080f1d1983f7ffccc50a04a1121..f70fe20f4e02f14dd2ca74a6c2c8dc2eb3fb22c8 100644 (file)
--- a/hashtab.c
+++ b/hashtab.c
@@ -103,7 +103,7 @@ static unsigned int hash_string (const void *p, unsigned int length) {
     unsigned int result = 0;
     
     for (i = 0; i < length; i++) {
-        result = (((unsigned short) str[i]) << 4) + (result >> 9) + result + (result >> 3) + (((unsigned short) str[i]) << 2) - (result << 24);
+        result = (((unsigned short) str[i]) << 4) + (result >> 9) + result + (result >> 3) + (((unsigned short) str[i]) << 2) - (result << 12);
     }
     
     return result;

diff --git a/hashtab.h b/hashtab.h
index 47aab3bf2afd43dd6411933c084525c1e631e657..ed8e82898156dc39de666e0277740fcd65752d10 100644 (file)
--- a/hashtab.h
+++ b/hashtab.h
@@ -7,7 +7,7 @@
 struct hashtab_name {
 
     const char *chars;
-    int bytes, hash;
+    unsigned int bytes, hash;
 
 };
 

diff --git a/pe.c b/pe.c
index cf1bffa4ba99b8178f2f4f07d87898d6d5465fda..b49d128fa52c65a713da322fbc82ad240f24f93a 100644 (file)
--- a/pe.c
+++ b/pe.c
@@ -397,9 +397,9 @@ static unsigned long size_of_code = 0;
 static unsigned long size_of_initialized_data = 0;
 static unsigned long size_of_uninitialized_data = 0;
 
-static unsigned short translate_section_flags_to_characteristics (int flags) {
+static unsigned long translate_section_flags_to_characteristics (int flags) {
 
-    unsigned short characteristics = 0;
+    unsigned long characteristics = 0;
     
     if (!(flags & SECTION_FLAG_READONLY)) {
         characteristics |= IMAGE_SCN_MEM_WRITE;
@@ -444,7 +444,7 @@ static unsigned short translate_section_flags_to_characteristics (int flags) {
 static void write_sections (unsigned char *data) {
 
     unsigned char *pos = data + state->size_of_headers;
-    unsigned short characteristics = 0;
+    unsigned long characteristics = 0;
     
     struct pe_section_table_entry *hdr;
     struct section *section;
@@ -470,7 +470,7 @@ static void write_sections (unsigned char *data) {
         }
         
         characteristics = translate_section_flags_to_characteristics (section->flags);
-        write721_to_byte_array (hdr->Characteristics, characteristics);
+        write741_to_byte_array (hdr->Characteristics, characteristics);
         
         if (characteristics & IMAGE_SCN_CNT_CODE) {