Merge branch 'master' into gcc

Conflicts: kernel/init-mod.h
john-peterson · Dec 24, 2017 · 141e637 · 141e637
2 parents 35b176c + fdac78c
commit 141e637
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/kernel/config.c b/kernel/config.c
@@ -163,9 +163,9 @@ STATIC BYTE szBuf[256] BSS_INIT({0});
 struct CfgFile {
   COUNT nFileDesc;
   COUNT nCfgLine;
-} cfgFile[MAX_CHAINS];
-COUNT nCurChain = 0;
-COUNT nFileDesc;
+} cfgFile[MAX_CHAINS] BSS_INIT({0});
+COUNT nCurChain BSS_INIT(0);
+COUNT nFileDesc BSS_INIT(0);
 
 BYTE singleStep BSS_INIT(FALSE);        /* F8 processing */
 BYTE SkipAllConfig BSS_INIT(FALSE);     /* F5 processing */
@@ -419,8 +419,9 @@ void PreConfig2(void)
   if (ebda_size)  /* move the Extended BIOS Data Area from top of RAM here */
     movebda(ebda_size, FP_SEG(KernelAlloc(ebda_size, 'I', 0)));
 
-//  if (UmbState == 2)
-//    umb_init();
+/*  if (UmbState == 2)
+      umb_init();
+*/
 }
 
 /* Do third pass initialization.                                        */

diff --git a/kernel/init-mod.h b/kernel/init-mod.h
@@ -149,7 +149,6 @@ struct _nlsCountryInfoHardcoded {
   short TableSize;
 
   struct CountrySpecificInfo C;
-
 };
 
 /*

diff --git a/mkfiles/mscl8.mak b/mkfiles/mscl8.mak
@@ -23,8 +23,8 @@ LIB=$(COMPILERPATH)\lib
 # used for building the library
 
 CLIB=$(COMPILERPATH)\lib\slibce.lib
-MATH_EXTRACT=*aflmul *aFlshl *aFNauldi *aFulrem *aFulshr *aFuldiv *aFlrem *aFldiv
-MATH_INSERT= +aflmul +aFlshl +aFNauldi +aFulrem +aFulshr +aFuldiv +aFlrem +aFldiv
+MATH_EXTRACT=*aflmul *aFlshl *aFNaulsh *aFNauldi *aFulrem *aFulshr *aFuldiv *aFlrem *aFldiv
+MATH_INSERT= +aflmul +aFlshl +aFNaulsh +aFNauldi +aFulrem +aFulshr +aFuldiv +aFlrem +aFldiv
 
 TARGETOPT=
 !if $(XCPU) == 186

diff --git a/sys/fdkrncfg.c b/sys/fdkrncfg.c
@@ -46,6 +46,9 @@ unsigned long lseek(int fildes, unsigned long offset, int whence);
 
 #else
 #include <io.h>
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
 /* #include <stdio.h> */
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -149,7 +149,6 @@ struct _nlsCountryInfoHardcoded { @@
       short TableSize;
       struct CountrySpecificInfo C;
     };
     /*
@@ Expand Down @@