瀏覽代碼

Fix -Cp option failure due to cputypestr array that must be uppercased

git-svn-id: trunk@23446 -
pierre 12 年之前
父節點
當前提交
9e6a2b868c
共有 2 個文件被更改,包括 11 次插入10 次删除
  1. 1 1
      compiler/mips/cpugas.pas
  2. 10 9
      compiler/mips/cpuinfo.pas

+ 1 - 1
compiler/mips/cpugas.pas

@@ -100,7 +100,7 @@ unit cpugas;
          { ABI selection }
          Replace(result,'$ABI','-mabi='+abitypestr[mips_abi]);
          { ARCH selection }
-         Replace(result,'$ARCH','-march='+cputypestr[mips_cpu]);
+         Replace(result,'$ARCH','-march='+lower(cputypestr[mips_cpu]));
       end;
 
 {****************************************************************************}

+ 10 - 9
compiler/mips/cpuinfo.pas

@@ -77,16 +77,17 @@ Const
    ];
 
    { cpu strings as accepted by 
-     GNU assembler in -arch=XXX option }
+     GNU assembler in -arch=XXX option 
+     this ilist needs to be uppercased }
    cputypestr : array[tcputype] of string[8] = ('',
-     { cpu_mips_default } 'mips2',
-     { cpu_mips1        } 'mips1',
-     { cpu_mips2        } 'mips2',
-     { cpu_mips3        } 'mips3',
-     { cpu_mips4        } 'mips4',
-     { cpu_mips5        } 'mips5',
-     { cpu_mips32       } 'mips32',
-     { cpu_mips32r2     } 'mips32r2'
+     { cpu_mips_default } 'MIPS2',
+     { cpu_mips1        } 'MIPS1',
+     { cpu_mips2        } 'MIPS2',
+     { cpu_mips3        } 'MIPS3',
+     { cpu_mips4        } 'MIPS4',
+     { cpu_mips5        } 'MIPS5',
+     { cpu_mips32       } 'MIPS32',
+     { cpu_mips32r2     } 'MIPS32R2'
    );
 
    mips_cpu : tcputype = cpu_mips_default;