From 09031d81741837a78d5088306bb24dfb0e0e9722 Mon Sep 17 00:00:00 2001
From: slava <slava@factorcode.org>
Date: Mon, 3 Jul 2006 07:26:56 +0000
Subject: [PATCH] Load Mac OS X x86 ABI support in -stage2

---
 library/bootstrap/boot-stage1.factor |  1 -
 library/bootstrap/boot-stage2.factor | 43 ++++++++++++++++------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/library/bootstrap/boot-stage1.factor b/library/bootstrap/boot-stage1.factor
index a603258514..3a0e839922 100644
--- a/library/bootstrap/boot-stage1.factor
+++ b/library/bootstrap/boot-stage1.factor
@@ -317,7 +317,6 @@ sequences vectors words ;
     { "x86" "pentium4" } {
         "/library/compiler/x86/assembler.factor"
         "/library/compiler/x86/architecture.factor"
-        "/library/compiler/x86/alien.factor"
         "/library/compiler/x86/intrinsics.factor"
     } if-arch
     
diff --git a/library/bootstrap/boot-stage2.factor b/library/bootstrap/boot-stage2.factor
index 17f0155052..9317874b0a 100644
--- a/library/bootstrap/boot-stage2.factor
+++ b/library/bootstrap/boot-stage2.factor
@@ -10,30 +10,37 @@ parser sequences sequences-internals words ;
     "Cross-referencing..." print flush
     H{ } clone crossref set-global xref-words
 
+    cpu "x86" = [
+        macosx?
+        "/library/compiler/x86/alien-macosx.factor"
+        "/library/compiler/x86/alien.factor"
+        ?
+    ] when
+
     "compile" get [
         "native-io" get [
             unix? [
                 "/library/unix/load.factor" run-resource
             ] when
         ] when
-    
+
         windows? [
             "/library/windows/load.factor" run-resource
         ] when
-        
+
         parse-command-line
-    
+
         "Compiling base..." print flush
-    
+
         [
             \ + compile
             \ = compile
             { "kernel" "sequences" "assembler" } compile-vocabs
-        
+
             "Compiling system..." print flush
             compile-all
         ] with-class<cache
-        
+
         terpri
         "Unless you're working on the compiler, ignore the errors above." print
         "Not every word compiles, by design." print
@@ -41,48 +48,48 @@ parser sequences sequences-internals words ;
 
         "Initializing native I/O..." print flush
         "native-io" get [ init-io ] when
-        
+
         "cocoa" get [
             "/library/ui/cocoa/load.factor" run-resource
         ] when
-        
+
         "x11" get [
             "/library/ui/x11/load.factor" run-resource
         ] when
-    
+
         windows? "native-io" get and [
             "/library/windows/ui.factor" run-resource
             "/library/windows/clipboard.factor" run-resource
             compile-all
         ] when
     ] when
-        
+
     "Building online help search index..." print flush
     H{ } clone parent-graph set-global xref-help
     H{ } clone term-index set-global index-help
-    
+
     [
         boot
         run-user-init
         "shell" get "shells" lookup execute
         0 exit
     ] set-boot
-    
+
     [ compiled? ] word-subset length
     number>string write " compiled words" print
-    
+
     [ symbol? ] word-subset length
     number>string write " symbol words" print
-    
+
     all-words length
-    number>string write " words total" print 
-    
+    number>string write " words total" print
+
     "Total bootstrap GC time: " write gc-time
     number>string write " ms" print
-    
+
     "Bootstrapping is complete." print
     "Now, you can run ./f factor.image" print flush
-    
+
     "factor.image" resource-path save-image
 ] [ print-error listener ] recover