diff options
| -rw-r--r-- | compiler/globals.pas | 4 | ||||
| -rw-r--r-- | compiler/powerpc/nppcset.pas | 2 | ||||
| -rw-r--r-- | compiler/pp.pas | 6 | ||||
| -rw-r--r-- | compiler/scandir.pas | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/compiler/globals.pas b/compiler/globals.pas index 29d4ead968..cf7be9e4af 100644 --- a/compiler/globals.pas +++ b/compiler/globals.pas @@ -274,11 +274,11 @@ interface { for error info in pp.pas } parser_current_file : string = ''; -{$ifdef m68k} +{$if defined(m68k) or defined(arm)} { PalmOS resources } palmos_applicationname : string = 'FPC Application'; palmos_applicationid : string[4] = 'FPCA'; -{$endif m68k} +{$endif defined(m68k) or defined(arm)} {$ifdef powerpc} { default calling convention used on MorphOS } diff --git a/compiler/powerpc/nppcset.pas b/compiler/powerpc/nppcset.pas index 9bf937f1eb..74ad742588 100644 --- a/compiler/powerpc/nppcset.pas +++ b/compiler/powerpc/nppcset.pas @@ -208,8 +208,6 @@ implementation end; - - begin ccasenode:=tppccasenode; end. diff --git a/compiler/pp.pas b/compiler/pp.pas index 5d7c4b5c3e..acf6b6ce74 100644 --- a/compiler/pp.pas +++ b/compiler/pp.pas @@ -122,6 +122,12 @@ program pp; {$endif CPUDEFINED} {$define CPUDEFINED} {$endif MIPS} + {$ifdef AVR} + {$ifdef CPUDEFINED} + {$fatal ONLY one of the switches for the CPU type must be defined} + {$endif CPUDEFINED} + {$define CPUDEFINED} + {$endif AVR} {$ifndef CPUDEFINED} {$fatal A CPU type switch must be defined} {$endif CPUDEFINED} diff --git a/compiler/scandir.pas b/compiler/scandir.pas index c7f8476833..a711a6edf3 100644 --- a/compiler/scandir.pas +++ b/compiler/scandir.pas @@ -217,7 +217,7 @@ implementation Message1(scan_e_illegal_asmmode_specifier,s); end; -{$ifdef m68k} +{$if defined(m68k) or defined(arm)} procedure dir_appid; begin if target_info.system<>system_m68k_palmos then @@ -237,7 +237,7 @@ implementation current_scanner.skipspace; palmos_applicationname:=current_scanner.readcomment; end; -{$endif m68k} +{$endif defined(m68k) or defined(arm)} procedure dir_apptype; var |