فهرست منبع

* compilation for arm target fixed

git-svn-id: trunk@2408 -
florian 19 سال پیش
والد
کامیت
4662a12fd5
4فایلهای تغییر یافته به همراه10 افزوده شده و 6 حذف شده
  1. 2 2
      compiler/globals.pas
  2. 0 2
      compiler/powerpc/nppcset.pas
  3. 6 0
      compiler/pp.pas
  4. 2 2
      compiler/scandir.pas

+ 2 - 2
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 }

+ 0 - 2
compiler/powerpc/nppcset.pas

@@ -208,8 +208,6 @@ implementation
       end;
 
 
-
-
 begin
    ccasenode:=tppccasenode;
 end.

+ 6 - 0
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}

+ 2 - 2
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