tyler.durden/kernel
1
0
Fork 0
mirror of https://github.com/FDOS/kernel.git synced 2025-07-22 13:24:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

(Arkady) Remove -U option as Bart's new EXFLAT now uses XUPX variable directly

Browse Source 
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
This commit is contained in:
Luchezar Georgiev 2004-11-18 11:20:04 +00:00
parent dc550c065a
commit 69df2d06f7
5 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hdr/portab.h
View File

@ -66,6 +66,14 @@ static char *portab_hRcsId =
#define I86 #define I86
#define CDECL cdecl #define CDECL cdecl
#if __TURBOC__ > 0x202 #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 */ /* printf callers do the right thing for tc++ 1.01 but not tc 2.01 */
#define VA_CDECL #define VA_CDECL
#else #else

2
kernel/makefile
View File

@ -31,7 +31,7 @@ all: ..\bin\$(TARGET).sys ..\bin\country.sys
..\bin\$(TARGET).sys: $(TARGET).lnk $(OBJS) $(LIBS) ..\utils\exeflat.exe ..\bin\$(TARGET).sys: $(TARGET).lnk $(OBJS) $(LIBS) ..\utils\exeflat.exe
$(LINK) @$(TARGET).lnk; $(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 copy $*.sys ..\bin\kernel.sys
..\bin\country.sys: country.asm ..\bin\country.sys: country.asm

4
lib/makefile
View File

@ -12,9 +12,9 @@ all: libm.lib
libm.lib: $(CLIB) $(DEPENDS) libm.lib: $(CLIB) $(DEPENDS)
-$(RM) $*.lib -$(RM) $*.lib
$(LIBUTIL) $(CLIB) $(MATH_EXTRACT) $(LIBTERM) $(LIBUTIL) $(CLIB) $(MATH_EXTRACT)$(LIBTERM)
$(COMSPEC) /c for %i in (*.obj) do ..\utils\patchobj CODE=LCODE %i $(COMSPEC) /c for %i in (*.obj) do ..\utils\patchobj CODE=LCODE %i
$(LIBUTIL) $* $(MATH_INSERT) $(LIBTERM) $(LIBUTIL) $* $(MATH_INSERT)$(LIBTERM)
-$(RM) *.obj -$(RM) *.obj
######################################################################## ########################################################################

13
mkfiles/generic.mak
View File

@ -32,19 +32,6 @@ INITPATCH=@rem
LOADSEG=0x60 LOADSEG=0x60
!endif !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" !include "..\mkfiles\$(COMPILER).mak"
TARGET=$(TARGET)$(XCPU)$(XFAT) TARGET=$(TARGET)$(XCPU)$(XFAT)

13
utils/exeflat.c
View File

@ -331,7 +331,6 @@ int main(int argc, char **argv)
int compress_sys_file; int compress_sys_file;
char *upx, *tmpexe, *buffer; char *upx, *tmpexe, *buffer;
char cmdbuf[128]; char cmdbuf[128];
int UPX = FALSE;
int i; int i;
FILE *dest; FILE *dest;
long size; long size;
@ -351,9 +350,6 @@ int main(int argc, char **argv)
switch (toupper(argptr[0])) switch (toupper(argptr[0]))
{ {
case 'U':
UPX = TRUE;
break;
case 'S': case 'S':
if (silentcount >= LENGTH(silentSegments)) if (silentcount >= LENGTH(silentSegments))
{ {
@ -373,9 +369,10 @@ int main(int argc, char **argv)
/* arguments left : /* arguments left :
infile outfile relocation offset */ 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); silentSegments, silentcount);
if (!UPX) if (upx == NULL)
exit(0); exit(0);
/* move kernel.sys tmp$$$$$.exe */ /* move kernel.sys tmp$$$$$.exe */
@ -386,10 +383,6 @@ int main(int argc, char **argv)
rename(argv[2], tmpexe); rename(argv[2], tmpexe);
} }
upx = getenv("XUPX");
if (upx == NULL)
upx = "UPX";
#if !defined(__TURBOC__) #if !defined(__TURBOC__)
/* upx kernel.exe -o kernel.sys */ /* upx kernel.exe -o kernel.sys */
_snprintf(cmdbuf, sizeof cmdbuf, "%s %s", upx, tmpexe); _snprintf(cmdbuf, sizeof cmdbuf, "%s %s", upx, tmpexe);