macho: fix load errors

diff --git a/extra/macho/macho.factor b/extra/macho/macho.factor
index ea71583072416fb4b4541b89fb50a9a4524e0645..47d78569f847464cf94b4ed9f1d0f452232f839c 100644 (file)
--- a/extra/macho/macho.factor
+++ b/extra/macho/macho.factor
@@ -523,8 +523,8 @@ CONSTANT: CPU_TYPE_ANY            -1
 CONSTANT: CPU_TYPE_VAX            1
 CONSTANT: CPU_TYPE_MC680x0        6
 CONSTANT: CPU_TYPE_X86            7
-CONSTANT: CPU_TYPE_I386           $ CPU_TYPE_X86
-CONSTANT: CPU_TYPE_X86_64         $[ CPU_TYPE_X86 CPU_ARCH_ABI64 bitor ]
+ALIAS: CPU_TYPE_I386              CPU_TYPE_X86
+CONSTANT: CPU_TYPE_X86_64         flags{ CPU_TYPE_X86 CPU_ARCH_ABI64 }
 CONSTANT: CPU_TYPE_MC98000        10
 CONSTANT: CPU_TYPE_HPPA           11
 CONSTANT: CPU_TYPE_ARM            12
@@ -532,7 +532,7 @@ CONSTANT: CPU_TYPE_MC88000        13
 CONSTANT: CPU_TYPE_SPARC          14
 CONSTANT: CPU_TYPE_I860           15
 CONSTANT: CPU_TYPE_POWERPC        18
-CONSTANT: CPU_TYPE_POWERPC64      $[ $ CPU_TYPE_POWERPC CPU_ARCH_ABI64 bitor ]
+CONSTANT: CPU_TYPE_POWERPC64      flags{ CPU_TYPE_POWERPC CPU_ARCH_ABI64 }
 
 CONSTANT: CPU_SUBTYPE_MASK    HEX: ff000000
 CONSTANT: CPU_SUBTYPE_LIB64   HEX: 80000000
@@ -658,13 +658,13 @@ CONSTANT: CPUFAMILY_ARM_11     HEX: 8ff620d8
 CONSTANT: CPUFAMILY_ARM_XSCALE HEX: 53b005f5
 CONSTANT: CPUFAMILY_ARM_13     HEX: 0cc90e64
 
-CONSTANT: CPUFAMILY_INTEL_YONAH   $ CPUFAMILY_INTEL_6_14
-CONSTANT: CPUFAMILY_INTEL_MEROM   $ CPUFAMILY_INTEL_6_15
-CONSTANT: CPUFAMILY_INTEL_PENRYN  $ CPUFAMILY_INTEL_6_23
-CONSTANT: CPUFAMILY_INTEL_NEHALEM $ CPUFAMILY_INTEL_6_26
+ALIAS: CPUFAMILY_INTEL_YONAH   CPUFAMILY_INTEL_6_14
+ALIAS: CPUFAMILY_INTEL_MEROM   CPUFAMILY_INTEL_6_15
+ALIAS: CPUFAMILY_INTEL_PENRYN  CPUFAMILY_INTEL_6_23
+ALIAS: CPUFAMILY_INTEL_NEHALEM CPUFAMILY_INTEL_6_26
 
-CONSTANT: CPUFAMILY_INTEL_CORE    $ CPUFAMILY_INTEL_6_14
-CONSTANT: CPUFAMILY_INTEL_CORE2   $ CPUFAMILY_INTEL_6_15
+ALIAS: CPUFAMILY_INTEL_CORE    CPUFAMILY_INTEL_6_14
+ALIAS: CPUFAMILY_INTEL_CORE2   CPUFAMILY_INTEL_6_15
 
 ! fat.h
 CONSTANT: FAT_MAGIC HEX: cafebabe