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

haiku: move i386 also to internal sysinit

git-svn-id: trunk@40791 -
Károly Balogh 6 жил өмнө
parent
commit
9ce876e2ae

+ 1 - 1
compiler/systems.pas

@@ -351,7 +351,7 @@ interface
        systems_internal_sysinit = [system_i386_win32,system_x86_64_win64,
                                    system_i386_linux,system_powerpc64_linux,system_sparc64_linux,system_x86_64_linux,
                                    system_m68k_atari,system_m68k_palmos,
-                                   system_x86_64_haiku
+                                   system_i386_haiku,system_x86_64_haiku
                                   ]+systems_darwin+systems_amigalike;
 
        { all systems that use garbage collection for reference-counted types }

+ 3 - 2
compiler/systems/i_haiku.pas

@@ -36,7 +36,8 @@ unit i_haiku;
             name         : 'Haiku for i386';
             shortname    : 'Haiku';
             flags        : [tf_under_development,tf_needs_symbol_size,tf_files_case_sensitive,
-                            tf_smartlink_sections, tf_has_winlike_resources];
+                            tf_pic_default,tf_pic_uses_got,tf_library_needs_pic,
+                            tf_smartlink_sections,tf_has_winlike_resources];
             cpu          : cpu_i386;
             unit_env     : 'HAIKUUNITS';
             extradefines : 'BEOS;UNIX;HASUNIX';
@@ -99,7 +100,7 @@ unit i_haiku;
               Under R5, this value is even greater. listarea report a default 
               size of 16 Mb for the user stack of the main thread.
               People who still use BeOS nowadays should use R5 (or Haiku), 
-              so i use this new value.  
+              so i use this new value.
             }
             stacksize    : 16 * 1024 * 1024;
             stackalign   : 4;

+ 3 - 3
rtl/haiku/system.pp

@@ -34,7 +34,7 @@ function disable_debugger(state : integer): integer; cdecl; external 'root' name
 {*****************************************************************************
                          System Dependent Exit code
 *****************************************************************************}
-{$ifdef i386}
+{$ifdef legacy_startup}
 procedure prthaltproc;external name '_haltproc';
 
 procedure system_exit;
@@ -43,14 +43,14 @@ begin
     jmp prthaltproc
   end;
 End;
-{$else i386}
+{$else legacy_startup}
 procedure haltproc(exitcode: longint); cdecl; external name '_haltproc';
 
 procedure system_exit;
 begin
   haltproc(ExitCode);
 end;
-{$endif i386}
+{$endif legacy_startup}
 
 
 { OS dependant parts  }