2
0
Эх сурвалжийг харах

* Make Win64 SEH support enabled by default. If necessary to disable, compiler should be cycled with OPT=-dDISABLE_WIN64_SEH. Mantis #24012.

git-svn-id: trunk@23732 -
sergei 12 жил өмнө
parent
commit
2caa05ccd1

+ 4 - 4
compiler/aggas.pas

@@ -105,9 +105,9 @@ implementation
       SysUtils,
       cutils,cfileutl,systems,
       fmodule,verbose,
-{$ifdef TEST_WIN64_SEH}
+{$ifndef DISABLE_WIN64_SEH}
       itcpugas,
-{$endif TEST_WIN64_SEH}
+{$endif DISABLE_WIN64_SEH}
 {$ifdef m68k}
       cpuinfo,aasmcpu,
 {$endif m68k}
@@ -1438,7 +1438,7 @@ implementation
 
            ait_seh_directive :
              begin
-{$ifdef TEST_WIN64_SEH}
+{$ifndef DISABLE_WIN64_SEH}
                AsmWrite(sehdirectivestr[tai_seh_directive(hp).kind]);
                case tai_seh_directive(hp).datatype of
                  sd_none:;
@@ -1459,7 +1459,7 @@ implementation
                      tostr(tai_seh_directive(hp).data.offset));
                end;
                AsmLn;
-{$endif TEST_WIN64_SEH}
+{$endif DISABLE_WIN64_SEH}
              end;
            ait_varloc:
              begin

+ 2 - 2
compiler/assemble.pas

@@ -1519,10 +1519,10 @@ Implementation
              ait_cutobject :
                if SmartAsm then
                 break;
-{$ifdef TEST_WIN64_SEH}
+{$ifndef DISABLE_WIN64_SEH}
              ait_seh_directive :
                tai_seh_directive(hp).generate_code(objdata);
-{$endif TEST_WIN64_SEH}
+{$endif DISABLE_WIN64_SEH}
            end;
            hp:=Tai(hp.next);
          end;

+ 2 - 2
compiler/options.pas

@@ -3325,10 +3325,10 @@ if (target_info.abi = abi_eabihf) then
       def_system_macro('FPC_USE_TLS_DIRECTORY');
 {$endif not DISABLE_TLS_DIRECTORY}
 
-{$ifdef TEST_WIN64_SEH}
+{$ifndef DISABLE_WIN64_SEH}
     if target_info.system=system_x86_64_win64 then
       def_system_macro('FPC_USE_WIN64_SEH');
-{$endif TEST_WIN64_SEH}
+{$endif DISABLE_WIN64_SEH}
 
 {$ifdef ARM}
   { define FPC_DOUBLE_HILO_SWAPPED if needed to properly handle doubles in RTL }

+ 2 - 2
compiler/psub.pas

@@ -972,9 +972,9 @@ implementation
             ((flags*([pi_has_assembler_block,pi_is_assembler,
                     pi_has_stackparameter,pi_needs_stackframe]+
                     exception_flags[(target_info.cpu=cpu_i386)
-{$ifdef TEST_WIN64_SEH}
+{$ifndef DISABLE_WIN64_SEH}
                     or (target_info.system=system_x86_64_win64)
-{$endif TEST_WIN64_SEH}
+{$endif DISABLE_WIN64_SEH}
                     ]))=[])
            )
         then

+ 2 - 2
compiler/x86_64/cpunode.pas

@@ -54,9 +54,9 @@ unit cpunode;
        nx64cal,
        nx64cnv,
        nx64mat,
-{$ifdef TEST_WIN64_SEH}
+{$ifndef DISABLE_WIN64_SEH}
        nx64flw,
-{$endif TEST_WIN64_SEH}
+{$endif DISABLE_WIN64_SEH}
        nx64inl
        ;