Merge arch and machine sources. Add some options so it will

be easier to get at the ISA (instruction set architecture)

1 files changed, 33 insertions, 6 deletions

diff --git a/usr.bin/arch/arch.1 b/usr.bin/arch/arch.1
index 4e3e2b34490..892cf112e59 100644
--- a/usr.bin/arch/arch.1
+++ b/usr.bin/arch/arch.1
@@ -26,30 +26,57 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: arch.1,v 1.3 1999/07/04 11:53:50 aaron Exp $
+.\"	$OpenBSD: arch.1,v 1.4 1999/08/19 22:17:38 niklas Exp $
 .\"
 .Dd June 22, 1996
 .Dt ARCH 1
 .Os
 .Sh NAME
-.Nm arch
+.Nm arch ,
+.Nm machine
 .Nd print architecture type
 .Sh SYNOPSIS
 .Nm arch
-.Op Fl k
+.Op Fl ks
+.Nm machine
+.Op Fl a
 .Sh DESCRIPTION
 The
 .Nm
-command displays the machine's architecture type.
+and
+.Nm machine
+command displays the machine's architecture in slightly different ways.
+.Nm
+by default displays the application architecture, defined by both the
+operating system and the instruction set architecture, while
+.Nm machine
+displays the kernel architecture (without the operating system part).
+Note that both commands output the target architecture as opposed to
+.Xr uname 1
+which describes the host.  This is useful for dynamic discovery
+of the target architecture in build or configuration scripts
+needing to work in cross-compilation environments.
 .Pp
-The following options are available:
+The following options are available to
+.Nm arch :
 .Bl -tag -width indent
 .It Fl k
 Display the kernel architecture instead of application
 architecture.
+.It Fl s
+Display the chosen architecture in a short form, i.e. without the
+operating system prefixed.
+.El
+.Pp
+The
+.Nm machine
+command accepts this option:
+.Bl -tag -width indent
+.It Fl a
+Display the application architecture instead of the kernel architecture.
 .El
 .Sh SEE ALSO
-.Xr machine 1
+.Xr uname 1
 .Sh HISTORY
 The
 .Nm