Explorar o código

* compilation fixed

git-svn-id: branches/avr@17293 -
florian %!s(int64=14) %!d(string=hai) anos
pai
achega
ebe8078263
Modificáronse 2 ficheiros con 10 adicións e 6 borrados
  1. 5 3
      compiler/avr/cgcpu.pas
  2. 5 3
      compiler/systems/t_embed.pas

+ 5 - 3
compiler/avr/cgcpu.pas

@@ -1161,17 +1161,19 @@ unit cgcpu;
         tmpflags : TResFlags;
       begin
         current_asmdata.getjumplabel(l);
+        {
         if flags_to_cond(f) then
           begin
             tmpflags:=f;
             inverse_flags(tmpflags);
             list.concat(taicpu.op_reg(A_CLR,reg));
             a_jmp_flags(list,tmpflags,l);
-            list.concat(taicpu.op_const_reg(A_LDI,reg,1));
+            list.concat(taicpu.op_reg_const(A_LDI,reg,1));
           end
         else
-          begin;
-            list.concat(taicpu.op_const_reg(A_LDI,reg,1));
+        }
+          begin
+            list.concat(taicpu.op_reg_const(A_LDI,reg,1));
             a_jmp_flags(list,f,l);
             list.concat(taicpu.op_reg(A_CLR,reg));
           end;

+ 5 - 3
compiler/systems/t_embed.pas

@@ -333,6 +333,7 @@ begin
 {$ifdef AVR}
   with linkres do
     begin
+      { linker script from ld 2.19 }
       Add('ENTRY(_START)');
       Add('OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")');
       Add('OUTPUT_ARCH(avr:2)');
@@ -419,7 +420,7 @@ begin
       Add('    *(.trampolines*)');
       Add('     __trampolines_end = . ;');
       Add('    /* For future tablejump instruction arrays for 3 byte pc devices.');
-      Add('       We don't relax jump/call instructions within these sections.  */');
+      Add('       We don''t relax jump/call instructions within these sections.  */');
       Add('    *(.jumptables)');
       Add('    *(.jumptables*)');
       Add('    /* For code that needs to reside in the lower 128k progmem.  */');
@@ -433,7 +434,7 @@ begin
       Add('     __dtors_end = . ;');
       Add('    KEEP(SORT(*)(.ctors))');
       Add('    KEEP(SORT(*)(.dtors))');
-      Add('    /* From this point on, we don't bother about wether the insns are');
+      Add('    /* From this point on, we don''t bother about wether the insns are');
       Add('       below or above the 16 bits boundary.  */');
       Add('    *(.init0)  /* Start here after reset.  */');
       Add('    KEEP (*(.init0))');
@@ -561,7 +562,8 @@ begin
       Add('  .debug_loc      0 : { *(.debug_loc) }');
       Add('  .debug_macinfo  0 : { *(.debug_macinfo) }');
       Add('}');
-{$end AVR}
+{$endif AVR}
+    end;
 
   { Write and Close response }
   linkres.writetodisk;