diff --git a/src/compiler/error.bas b/src/compiler/error.bas index 127ed6d95..41a32382e 100644 --- a/src/compiler/error.bas +++ b/src/compiler/error.bas @@ -454,7 +454,7 @@ sub errInit( ) '' sanity check that warningMsgs() and errorMsgs() are the correct length assert( ubound(warningMsgs) = FB_WARNINGMSGS ) - assert( *warningMsgs(FB_WARNINGMSGS).text = "FB_WARNINGMSGS" ) + assert( *warningMsgs(FB_WARNINGMSGS).text = "FB_WARNINGMSGS" ) assert( ubound(errorMsgs) = FB_ERRMSGS ) assert( *errorMsgs(FB_ERRMSGS) = "FB_ERRMSGS" ) end sub diff --git a/src/compiler/fb.bas b/src/compiler/fb.bas index fb51a2b14..5d7de3414 100644 --- a/src/compiler/fb.bas +++ b/src/compiler/fb.bas @@ -112,8 +112,8 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _ FB_FUNCMODE_STDCALL, _ '' fbcall FB_FUNCMODE_STDCALL, _ '' stdcall 0 or FB_TARGETOPT_EXPORT _ - or FB_TARGETOPT_RETURNINREGS _ - or FB_TARGETOPT_COFF _ + or FB_TARGETOPT_RETURNINREGS _ + or FB_TARGETOPT_COFF _ ), _ ( _ @"cygwin", _ @@ -121,9 +121,9 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _ FB_FUNCMODE_STDCALL, _ FB_FUNCMODE_STDCALL, _ 0 or FB_TARGETOPT_UNIX _ - or FB_TARGETOPT_EXPORT _ - or FB_TARGETOPT_RETURNINREGS _ - or FB_TARGETOPT_COFF _ + or FB_TARGETOPT_EXPORT _ + or FB_TARGETOPT_RETURNINREGS _ + or FB_TARGETOPT_COFF _ ), _ ( _ @"linux", _ @@ -131,19 +131,19 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _ FB_FUNCMODE_CDECL, _ FB_FUNCMODE_STDCALL_MS, _ 0 or FB_TARGETOPT_UNIX _ - or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ - or FB_TARGETOPT_STACKALIGN16 _ - or FB_TARGETOPT_ELF _ + or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ + or FB_TARGETOPT_STACKALIGN16 _ + or FB_TARGETOPT_ELF _ ), _ ( _ @"android", _ FB_DATATYPE_ULONG, _ FB_FUNCMODE_CDECL, _ FB_FUNCMODE_STDCALL_MS, _ - 0 or FB_TARGETOPT_UNIX _ - or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ - or FB_TARGETOPT_STACKALIGN16 _ - or FB_TARGETOPT_ELF _ + 0 or FB_TARGETOPT_UNIX _ + or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ + or FB_TARGETOPT_STACKALIGN16 _ + or FB_TARGETOPT_ELF _ ), _ ( _ @"dos", _ @@ -151,7 +151,7 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _ FB_FUNCMODE_CDECL, _ FB_FUNCMODE_STDCALL_MS, _ 0 or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ - or FB_TARGETOPT_COFF _ + or FB_TARGETOPT_COFF _ ), _ ( _ @"xbox", _ @@ -159,7 +159,7 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _ FB_FUNCMODE_STDCALL, _ FB_FUNCMODE_STDCALL, _ 0 or FB_TARGETOPT_RETURNINREGS _ - or FB_TARGETOPT_COFF _ + or FB_TARGETOPT_COFF _ ), _ ( _ @"freebsd", _ @@ -167,10 +167,10 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _ FB_FUNCMODE_CDECL, _ FB_FUNCMODE_STDCALL_MS, _ 0 or FB_TARGETOPT_UNIX _ - or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ - or FB_TARGETOPT_RETURNINREGS _ - or FB_TARGETOPT_RETURNINFLTS _ - or FB_TARGETOPT_ELF _ + or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ + or FB_TARGETOPT_RETURNINREGS _ + or FB_TARGETOPT_RETURNINFLTS _ + or FB_TARGETOPT_ELF _ ), _ ( _ @"dragonfly", _ @@ -178,9 +178,9 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _ FB_FUNCMODE_CDECL, _ FB_FUNCMODE_STDCALL_MS, _ 0 or FB_TARGETOPT_UNIX _ - or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ - or FB_TARGETOPT_RETURNINREGS _ - or FB_TARGETOPT_ELF _ + or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ + or FB_TARGETOPT_RETURNINREGS _ + or FB_TARGETOPT_ELF _ ), _ ( _ @"solaris", _ @@ -188,9 +188,9 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _ FB_FUNCMODE_CDECL, _ FB_FUNCMODE_STDCALL_MS, _ 0 or FB_TARGETOPT_UNIX _ - or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ - or FB_TARGETOPT_RETURNINREGS _ - or FB_TARGETOPT_ELF _ + or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ + or FB_TARGETOPT_RETURNINREGS _ + or FB_TARGETOPT_ELF _ ), _ ( _ @"openbsd", _ @@ -198,10 +198,10 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _ FB_FUNCMODE_CDECL, _ FB_FUNCMODE_STDCALL_MS, _ 0 or FB_TARGETOPT_UNIX _ - or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ - or FB_TARGETOPT_RETURNINREGS _ - or FB_TARGETOPT_RETURNINFLTS _ - or FB_TARGETOPT_ELF _ + or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ + or FB_TARGETOPT_RETURNINREGS _ + or FB_TARGETOPT_RETURNINFLTS _ + or FB_TARGETOPT_ELF _ ), _ ( _ @"darwin", _ @@ -209,10 +209,10 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _ FB_FUNCMODE_CDECL, _ FB_FUNCMODE_STDCALL_MS, _ 0 or FB_TARGETOPT_UNIX _ - or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ - or FB_TARGETOPT_RETURNINREGS _ - or FB_TARGETOPT_STACKALIGN16 _ - or FB_TARGETOPT_MACHO _ + or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ + or FB_TARGETOPT_RETURNINREGS _ + or FB_TARGETOPT_STACKALIGN16 _ + or FB_TARGETOPT_MACHO _ ), _ ( _ @"netbsd", _ @@ -220,10 +220,10 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _ FB_FUNCMODE_CDECL, _ FB_FUNCMODE_STDCALL_MS, _ 0 or FB_TARGETOPT_UNIX _ - or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ - or FB_TARGETOPT_RETURNINREGS _ - or FB_TARGETOPT_RETURNINFLTS _ - or FB_TARGETOPT_ELF _ + or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ + or FB_TARGETOPT_RETURNINREGS _ + or FB_TARGETOPT_RETURNINFLTS _ + or FB_TARGETOPT_ELF _ ), _ ( _ @"js", _ @@ -231,8 +231,8 @@ dim shared as FBTARGET targetinfo(0 to FB_COMPTARGETS-1) = _ FB_FUNCMODE_CDECL, _ FB_FUNCMODE_STDCALL_MS, _ 0 or FB_TARGETOPT_UNIX _ - or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ - or FB_TARGETOPT_RETURNINREGS _ + or FB_TARGETOPT_CALLEEPOPSHIDDENPTR _ + or FB_TARGETOPT_RETURNINREGS _ ) _ } diff --git a/src/compiler/fbc.bas b/src/compiler/fbc.bas index 00ab8e07e..a677dfd04 100644 --- a/src/compiler/fbc.bas +++ b/src/compiler/fbc.bas @@ -772,7 +772,7 @@ private function hLinkFiles( ) as integer '' Optional? ' select case( fbGetCpuFamily( ) ) ' case FB_CPUFAMILY_X86 - ' ldcline += "-m elf_i386 " + ' ldcline += "-m elf_i386 " ' end select case FB_COMPTARGET_DARWIN select case( fbGetCpuFamily( ) )