From 5f8749516c131aeb43019604eb9d6cdcff021349 Mon Sep 17 00:00:00 2001
From: Peter Johnson <peter@tortall.net>
Date: Sat, 24 Feb 2007 23:33:27 +0000
Subject: [PATCH] Add Mach-O to yasm_objfmts(7) man page.

svn path=/trunk/yasm/; revision=1796
---
 modules/objfmts/yasm_objfmts.xml | 13 ++++++++++++-
 yasm_objfmts.7                   | 11 +++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/modules/objfmts/yasm_objfmts.xml b/modules/objfmts/yasm_objfmts.xml
index 1e9f095f..3a70fedc 100644
--- a/modules/objfmts/yasm_objfmts.xml
+++ b/modules/objfmts/yasm_objfmts.xml
@@ -8,7 +8,7 @@
 
  <refentryinfo>
   <title>Yasm Supported Object Formats</title>
-  <date>October 2006</date>
+  <date>February 2007</date>
   <productname>Yasm</productname>
   <author>
    <firstname>Peter</firstname>
@@ -105,6 +105,17 @@
    ELF has complex support for relocatable and shared objects.</para>
  </refsect1>
 
+ <refsect1>
+  <title>macho</title>
+
+  <para>The Mach-O object format really comes in two flavors:
+   <quote>macho32</quote> (for 32-bit targets) and
+   <quote>macho64</quote> (for 64-bit targets).  Mach-O is used as
+   the object format on MacOS X.  As Yasm currently only supports
+   x86 and AMD64 instruction sets, it can only generate Mach-O
+   objects for Intel-based Macs.</para>
+ </refsect1>
+
  <refsect1>
   <title>rdf</title>
 
diff --git a/yasm_objfmts.7 b/yasm_objfmts.7
index b36288d2..9825c0ac 100644
--- a/yasm_objfmts.7
+++ b/yasm_objfmts.7
@@ -1,11 +1,11 @@
 .\"     Title: yasm_objfmts
 .\"    Author: Peter Johnson <peter@tortall.net>
 .\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
-.\"      Date: October 2006
+.\"      Date: February 2007
 .\"    Manual: Yasm Supported Object Formats
 .\"    Source: Yasm
 .\"
-.TH "YASM_OBJFMTS" "7" "October 2006" "Yasm" "Yasm Supported Object Formats"
+.TH "YASM_OBJFMTS" "7" "February 2007" "Yasm" "Yasm Supported Object Formats"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -46,6 +46,13 @@ The ELF object format really comes in two flavors:
 (for 32\-bit targets) and
 \(lqelf64\(rq
 (for 64\-bit targets). ELF is a standard object format in common use on modern Unix and compatible systems (e.g. Linux, FreeBSD). ELF has complex support for relocatable and shared objects.
+.SH "MACHO"
+.PP
+The Mach\-O object format really comes in two flavors:
+\(lqmacho32\(rq
+(for 32\-bit targets) and
+\(lqmacho64\(rq
+(for 64\-bit targets). Mach\-O is used as the object format on MacOS X. As Yasm currently only supports x86 and AMD64 instruction sets, it can only generate Mach\-O objects for Intel\-based Macs.
 .SH "RDF"
 .PP
 The RDOFF2 object format is a simple multi\-section format originally designed for NASM. It supports segment references but not WRT references. It was designed primarily for simplicity and has minimalistic headers for ease of loading and linking. A complete toolchain (linker, librarian, and loader) is distributed with NASM.
-- 
2.40.0