From 15ff888ae07dc20b986b0957953489f9583e4edd Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Thu, 21 Oct 2010 20:34:29 +0000
Subject: Update makeinfo include paths, and configuration settings for the as
 info page.

---
 gnu/usr.bin/binutils/doc/Makefile      |  4 ++--
 gnu/usr.bin/binutils/doc/asconfig.texi | 43 ++++++++++++++++++++++++----------
 2 files changed, 33 insertions(+), 14 deletions(-)

(limited to 'gnu')

diff --git a/gnu/usr.bin/binutils/doc/Makefile b/gnu/usr.bin/binutils/doc/Makefile
index 42c1784..1d102f5 100644
--- a/gnu/usr.bin/binutils/doc/Makefile
+++ b/gnu/usr.bin/binutils/doc/Makefile
@@ -11,8 +11,8 @@ INFOENTRY_ld=	"* Ld: (ld).		The GNU linker."
 INFOENTRY_binutils= "* Binutils: (binutils).		The GNU Binary Utilities."
 
 MAKEINFOFLAGS+= --no-validate
-MAKEINFOFLAGS+= -I ${SRCDIR}/gas/doc -I ${SRCDIR}/ld -I ${SRCDIR}/bfd/doc
-MAKEINFOFLAGS+= -I ${SRCDIR}/binutils
+MAKEINFOFLAGS+= -I ${SRCDIR}/libiberty
+MAKEINFOFLAGS+= -I ${SRCDIR}/bfd/doc
 
 CLEANFILES=	configdoc.texi config.texi gasver.texi ldver.texi
 
diff --git a/gnu/usr.bin/binutils/doc/asconfig.texi b/gnu/usr.bin/binutils/doc/asconfig.texi
index 2a7b652..53af5c5 100644
--- a/gnu/usr.bin/binutils/doc/asconfig.texi
+++ b/gnu/usr.bin/binutils/doc/asconfig.texi
@@ -1,4 +1,6 @@
-@c Copyright 1992, 1993 Free Software Foundation, Inc.
+@c Copyright 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, 2002,
+@c 2003, 2005
+@c Free Software Foundation, Inc.
 @c This file is part of the documentation for the GAS manual
 
 @c Configuration settings for all-inclusive version of manual
@@ -18,31 +20,48 @@
 @c Object formats of interest
 @c ==========================
 @clear AOUT
-@clear BOUT
 @clear COFF
 @set ELF
 @clear SOM
 
 @c CPUs of interest
 @c ================
-@clear A29K
+@clear ALPHA
 @clear ARC
-@clear ARM
+@set ARM
+@clear BFIN
+@clear CRIS
 @clear D10V
+@clear D30V
 @clear H8/300
-@clear H8/500
-@clear SH
+@clear HPPA
+@clear I370
 @set I80386
+@clear I860
 @clear I960
-@clear MIPS
+@set IA64
+@clear IP2K
+@clear M32C
 @clear M32R
+@clear xc16x
+@clear M68HC11
 @clear M680X0
-@clear Z8000
-@clear SPARC
-@clear VAX
-@clear VXWORKS
-@clear HPPA
+@clear MCORE
+@set MIPS
+@clear MMIX
+@clear MS1
+@clear MSP430
+@clear PDP11
+@clear PJ
+@set PPC
+@clear SH
+@set SPARC
+@clear TIC54X
 @clear V850
+@clear VAX
+@clear XTENSA
+@clear Z80
+@clear Z8000
 
 @c Does this version of the assembler use the difference-table kluge?
 @clear DIFF-TBL-KLUGE
-- 
cgit v1.1