From: Sascha Wildner <saw@online.de>
Date: Thu, 24 Mar 2011 16:57:11 +0000 (+0100)
Subject: Remove the remains of the removal of gasp in binutils 2.13 years ago.
X-Git-Tag: v2.11.0~175
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/d6fbbacf67e5a3af8f4123bd973b4e03917615f0

Remove the remains of the removal of gasp in binutils 2.13 years ago.
---

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index a1a39f24fc..a426e810d6 100644
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -1572,6 +1572,7 @@ TO_REMOVE+=/usr/share/man/cat3/SLIST_REMOVE_NEXT.3.gz
 TO_REMOVE+=/usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
 TO_REMOVE+=/usr/share/man/cat3/STAILQ_REMOVE_NEXT.3.gz
 TO_REMOVE+=/usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz
+TO_REMOVE+=/usr/bin/gasp
 
 # XXX Remove when pfsync(4) has been fixed
 TO_REMOVE+=/usr/share/man/cat4/pfsync.4.gz
diff --git a/gnu/usr.bin/binutils217/doc/Makefile b/gnu/usr.bin/binutils217/doc/Makefile
index 83b994c6da..e764345988 100644
--- a/gnu/usr.bin/binutils217/doc/Makefile
+++ b/gnu/usr.bin/binutils217/doc/Makefile
@@ -1,16 +1,12 @@
-# $DragonFly: src/gnu/usr.bin/binutils217/doc/Makefile,v 1.1 2007/04/13 12:24:32 corecode Exp $
-
 .include "../Makefile.inc0"
 
 CONTRIBDIR= ${.CURDIR}/../../../../contrib
 
 .PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc
 
-# GASP removed
 INFO = as ld binutils
 INFOSECTION=	"Programming & development tools."
 INFOENTRY_as=	"* As: (as).            The GNU assembler."
-INFOENTRY_gasp=	"* Gasp: (gasp).        The GNU Assembler Macro Preprocessor."
 INFOENTRY_ld=	"* Ld: (ld).		The GNU linker."
 INFOENTRY_binutils= "* Binutils: (binutils).		The GNU Binary Utilities."
 
diff --git a/gnu/usr.bin/binutils220/doc/Makefile b/gnu/usr.bin/binutils220/doc/Makefile
index a7242e8bd3..e764345988 100644
--- a/gnu/usr.bin/binutils220/doc/Makefile
+++ b/gnu/usr.bin/binutils220/doc/Makefile
@@ -4,11 +4,9 @@ CONTRIBDIR= ${.CURDIR}/../../../../contrib
 
 .PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc
 
-# GASP removed
 INFO = as ld binutils
 INFOSECTION=	"Programming & development tools."
 INFOENTRY_as=	"* As: (as).            The GNU assembler."
-INFOENTRY_gasp=	"* Gasp: (gasp).        The GNU Assembler Macro Preprocessor."
 INFOENTRY_ld=	"* Ld: (ld).		The GNU linker."
 INFOENTRY_binutils= "* Binutils: (binutils).		The GNU Binary Utilities."
 
diff --git a/gnu/usr.bin/binutils221/doc/Makefile b/gnu/usr.bin/binutils221/doc/Makefile
index a7242e8bd3..e764345988 100644
--- a/gnu/usr.bin/binutils221/doc/Makefile
+++ b/gnu/usr.bin/binutils221/doc/Makefile
@@ -4,11 +4,9 @@ CONTRIBDIR= ${.CURDIR}/../../../../contrib
 
 .PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc
 
-# GASP removed
 INFO = as ld binutils
 INFOSECTION=	"Programming & development tools."
 INFOENTRY_as=	"* As: (as).            The GNU assembler."
-INFOENTRY_gasp=	"* Gasp: (gasp).        The GNU Assembler Macro Preprocessor."
 INFOENTRY_ld=	"* Ld: (ld).		The GNU linker."
 INFOENTRY_binutils= "* Binutils: (binutils).		The GNU Binary Utilities."
 
diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile
index 536f578a09..b1dafab92f 100644
--- a/usr.bin/objformat/Makefile
+++ b/usr.bin/objformat/Makefile
@@ -23,7 +23,6 @@ CFLAGS+=	-DOBJFORMAT_PATH_DEFAULT="\"${OBJFORMAT_BUILTIN_PATH_DEFAULT}\""
 LINKS+=	${BINDIR}/objformat ${BINDIR}/addr2line
 LINKS+=	${BINDIR}/objformat ${BINDIR}/ar
 LINKS+=	${BINDIR}/objformat ${BINDIR}/as
-LINKS+=	${BINDIR}/objformat ${BINDIR}/gasp
 LINKS+=	${BINDIR}/objformat ${BINDIR}/ld
 LINKS+=	${BINDIR}/objformat ${BINDIR}/nm
 LINKS+=	${BINDIR}/objformat ${BINDIR}/objcopy
diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c
index 61b094ed14..ef87cc5f10 100644
--- a/usr.bin/objformat/objformat.c
+++ b/usr.bin/objformat/objformat.c
@@ -70,7 +70,6 @@ static struct command commands[] = {
 	{"addr2line",	BINUTILS2},
 	{"ar",		BINUTILS2},
 	{"as",		BINUTILS2},
-	{"gasp",	BINUTILS2},
 	{"gdb",		BINUTILS2},
 	{"ld",		BINUTILS2},
 	{"nm",		BINUTILS2},