From 69df2d06f77fe95e43f7a9cf2949b0899da9bc4a Mon Sep 17 00:00:00 2001
From: Luchezar Georgiev <lig@linux.tu-varna.acad.bg>
Date: Thu, 18 Nov 2004 11:20:04 +0000
Subject: [PATCH] (Arkady) Remove -U option as Bart's new EXFLAT now uses XUPX
 variable directly Suppress TC++ 1.01 warnings (BC++ 3/4/5 not affected!) and
 MSC LIB prompt

git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/branches/UNSTABLE@1065 6ac86273-5f31-0410-b378-82cca8765d1b
---
 hdr/portab.h        |  8 ++++++++
 kernel/makefile     |  2 +-
 lib/makefile        |  4 ++--
 mkfiles/generic.mak | 13 -------------
 utils/exeflat.c     | 13 +++----------
 5 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/hdr/portab.h b/hdr/portab.h
index 875d80f..14b398b 100644
--- a/hdr/portab.h
+++ b/hdr/portab.h
@@ -66,6 +66,14 @@ static char *portab_hRcsId =
 #define I86
 #define CDECL   cdecl
 #if __TURBOC__ > 0x202
+#if __TURBOC__ < 0x400 /* targeted to TC++ 1.0 which is 0x297 (3.1 is 0x410) */
+#pragma warn -pia /* possibly incorrect assignment */
+#pragma warn -sus /* suspicious pointer conversion */
+/*
+ * NOTE: The above enable TC++ to build the kernel, but it's not recommended
+ * for development. Use [Open]Watcom (the best!) or newer Borland compilers!
+ */
+#endif
 /* printf callers do the right thing for tc++ 1.01 but not tc 2.01 */
 #define VA_CDECL
 #else
diff --git a/kernel/makefile b/kernel/makefile
index b194768..68717a3 100644
--- a/kernel/makefile
+++ b/kernel/makefile
@@ -31,7 +31,7 @@ all:		..\bin\$(TARGET).sys ..\bin\country.sys
 
 ..\bin\$(TARGET).sys: $(TARGET).lnk $(OBJS) $(LIBS) ..\utils\exeflat.exe
 		$(LINK) @$(TARGET).lnk;
-		..\utils\exeflat kernel.exe $*.sys $(LOADSEG) -S0x10 -S0x8B $(UPXOPT)
+		..\utils\exeflat kernel.exe $*.sys $(LOADSEG) -S0x10 -S0x8B
 		copy $*.sys ..\bin\kernel.sys
 
 ..\bin\country.sys: country.asm
diff --git a/lib/makefile b/lib/makefile
index e93f02e..9dbb4de 100644
--- a/lib/makefile
+++ b/lib/makefile
@@ -12,9 +12,9 @@ all:		libm.lib
 
 libm.lib:	$(CLIB) $(DEPENDS)
 		-$(RM) $*.lib
-		$(LIBUTIL) $(CLIB) $(MATH_EXTRACT) $(LIBTERM)
+		$(LIBUTIL) $(CLIB) $(MATH_EXTRACT)$(LIBTERM)
 		$(COMSPEC) /c for %i in (*.obj) do ..\utils\patchobj CODE=LCODE %i
-		$(LIBUTIL) $* $(MATH_INSERT) $(LIBTERM)
+		$(LIBUTIL) $* $(MATH_INSERT)$(LIBTERM)
 		-$(RM) *.obj
 
 ########################################################################
diff --git a/mkfiles/generic.mak b/mkfiles/generic.mak
index 211404a..6aae72e 100644
--- a/mkfiles/generic.mak
+++ b/mkfiles/generic.mak
@@ -32,19 +32,6 @@ INITPATCH=@rem
 LOADSEG=0x60
 !endif
 
-UPXOPT=-U
-!if $(__MAKE__)0 == 0	# NMAKE/WMAKE
-!if "$(XUPX)" == ""	# TC doesn't supports this
-XUPX=rem		# NMAKE doesn't supports @ in macro
-UPXOPT=
-!endif
-!else			# TC/BC MAKE
-!if !$d(XUPX)		# NMAKE/WMAKE doesn't supports $d()
-XUPX=@rem
-UPXOPT=
-!endif
-!endif
-
 !include "..\mkfiles\$(COMPILER).mak"
 
 TARGET=$(TARGET)$(XCPU)$(XFAT)
diff --git a/utils/exeflat.c b/utils/exeflat.c
index 2c6ddf8..c60a4da 100644
--- a/utils/exeflat.c
+++ b/utils/exeflat.c
@@ -331,7 +331,6 @@ int main(int argc, char **argv)
   int compress_sys_file;
   char *upx, *tmpexe, *buffer;
   char cmdbuf[128];
-  int UPX = FALSE;
   int i;
   FILE *dest;
   long size;
@@ -351,9 +350,6 @@ int main(int argc, char **argv)
 
     switch (toupper(argptr[0]))
     {
-      case 'U':
-        UPX = TRUE;
-        break;
       case 'S':
         if (silentcount >= LENGTH(silentSegments))
         {
@@ -373,9 +369,10 @@ int main(int argc, char **argv)
   /* arguments left :
      infile outfile relocation offset */
 
-  compress_sys_file = exeflat(UPX, argv[1], argv[2], argv[3],
+  upx = getenv("XUPX");
+  compress_sys_file = exeflat((int)upx, argv[1], argv[2], argv[3],
                               silentSegments, silentcount);
-  if (!UPX)
+  if (upx == NULL)
     exit(0);
 
   /* move kernel.sys tmp$$$$$.exe */
@@ -386,10 +383,6 @@ int main(int argc, char **argv)
     rename(argv[2], tmpexe);
   }
 
-  upx = getenv("XUPX");
-  if (upx == NULL)
-    upx = "UPX";
-
 #if !defined(__TURBOC__)
   /* upx kernel.exe -o kernel.sys */
   _snprintf(cmdbuf, sizeof cmdbuf, "%s %s", upx, tmpexe);