소스 검색

pass new asm extra opt using -ao option

git-svn-id: trunk@26540 -
pierre 11 년 전
부모
커밋
441b9feffc
2개의 변경된 파일4개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 2
      compiler/agjasmin.pas
  2. 1 0
      compiler/assemble.pas

+ 3 - 2
compiler/agjasmin.pas

@@ -687,7 +687,8 @@ implementation
        if cs_asm_extern in current_settings.globalswitches then
        if cs_asm_extern in current_settings.globalswitches then
          Replace(result,'$JASMINJAR',maybequoted(ScriptFixFileName(jasminjar)))
          Replace(result,'$JASMINJAR',maybequoted(ScriptFixFileName(jasminjar)))
        else
        else
-         Replace(result,'$JASMINJAR',ScriptFixFileName(jasminjar))
+         Replace(result,'$JASMINJAR',ScriptFixFileName(jasminjar));
+       Replace(result,'$EXTRAOPT',asmextraopt);
      end;
      end;
 
 
 
 
@@ -1223,7 +1224,7 @@ implementation
          id     : as_jvm_jasmin;
          id     : as_jvm_jasmin;
          idtxt  : 'Jasmin';
          idtxt  : 'Jasmin';
          asmbin : 'java';
          asmbin : 'java';
-         asmcmd : '-jar $JASMINJAR $ASM -d $OBJDIR';
+         asmcmd : '-jar $JASMINJAR $ASM $EXTRAOPT -d $OBJDIR';
          supported_targets : [system_jvm_java32,system_jvm_android32];
          supported_targets : [system_jvm_java32,system_jvm_android32];
          flags : [];
          flags : [];
          labelprefix : 'L';
          labelprefix : 'L';

+ 1 - 0
compiler/assemble.pas

@@ -606,6 +606,7 @@ Implementation
            Replace(result,'$NOWARN','')
            Replace(result,'$NOWARN','')
          else
          else
            Replace(result,'$NOWARN','-W');
            Replace(result,'$NOWARN','-W');
+         Replace(result,'$EXTRAOPT',asmextraopt);
       end;
       end;