Restructure the binutils hierarchy somewhat in order to better

support building it for variant architectures.  It was already
becoming clear that the former structure was too rigid and didn't
scale well.

The usual sort of makefile magic arranges to .include an architecture
specific makefile "Makefile.${MACHINE_ARCH}" in each directory
where it exists.  Also, sources will be found in each subdirectory
"${MACHINE_ARCH}" that exists.  This is all taken care of automatically
by the top level "Makefile.inc0".

This all seems to work right for the i386 now.  I have also converted
those alpha pieces already present to the new schema as best I
could.

Also: change the BINDIR on the i386 to /usr/libexec/elf for "ar"
and "ranlib".  They are not object format independent enough to
put into /usr/bin.

9 files changed, 0 insertions, 181 deletions

diff --git a/gnu/usr.bin/binutils/i386-aout/Makefile b/gnu/usr.bin/binutils/i386-aout/Makefile
deleted file mode 100644
index 0aa4d2a..0000000
--- a/gnu/usr.bin/binutils/i386-aout/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-.include "../Makefile.inc0"
-
-SUBDIR=		as
-
-.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/binutils/i386-aout/Makefile.inc b/gnu/usr.bin/binutils/i386-aout/Makefile.inc
deleted file mode 100644
index e5f947c..0000000
--- a/gnu/usr.bin/binutils/i386-aout/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-
-BINDIR?=	/usr/libexec/aout
diff --git a/gnu/usr.bin/binutils/i386-aout/Makefile.inc0 b/gnu/usr.bin/binutils/i386-aout/Makefile.inc0
deleted file mode 100644
index 40b0f93..0000000
--- a/gnu/usr.bin/binutils/i386-aout/Makefile.inc0
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-.include "../Makefile.inc0"
-
-RELTOP:=	../${RELTOP}
diff --git a/gnu/usr.bin/binutils/i386-aout/as/Makefile b/gnu/usr.bin/binutils/i386-aout/as/Makefile
deleted file mode 100644
index 0083074..0000000
--- a/gnu/usr.bin/binutils/i386-aout/as/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id$
-#
-
-.include "../Makefile.inc0"
-
-.PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
-
-PROG=		as
-MAN1=		doc/as.1
-SRCS=		app.c as.c atof-generic.c atof-ieee.c bignum-copy.c \
-		cond.c ecoff.c expr.c flonum-copy.c flonum-konst.c \
-		flonum-mult.c frags.c hash.c input-file.c \
-		input-scrub.c listing.c literal.c macro.c messages.c \
-		obj-aout.c output-file.c read.c sb.c stabs.c \
-		subsegs.c symbols.c tc-i386.c write.c
-CFLAGS+=	-I${SRCDIR}/gas
-CFLAGS+=	-I${SRCDIR}/gas/config
-CFLAGS+=	-I${SRCDIR}
-LDADD+=		-L${RELTOP}/libbfd -lbfd
-LDADD+=		-L${RELTOP}/libiberty -liberty
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/i386-aout/as/config.h b/gnu/usr.bin/binutils/i386-aout/as/config.h
deleted file mode 100644
index 98d0141..0000000
--- a/gnu/usr.bin/binutils/i386-aout/as/config.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* config.h.  Generated automatically by make.  */
-#ifndef GAS_VERSION
-#define GAS_VERSION "2.8.1"
-
-/* conf.  Generated automatically by configure.  */
-/* conf.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if using alloca.c.  */
-/* #undef C_ALLOCA */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define as __inline if that's what the C compiler calls it.  */
-/* #undef inline */
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
-
-/* Should gas use high-level BFD interfaces?  */
-#define BFD_ASSEMBLER 1
-
-/* Some assert/preprocessor combinations are incapable of handling
-   certain kinds of constructs in the argument of assert.  For example,
-   quoted strings (if requoting isn't done right) or newlines.  */
-/* #undef BROKEN_ASSERT */
-
-/* If we aren't doing cross-assembling, some operations can be optimized,
-   since byte orders and value sizes don't need to be adjusted.  */
-/* #undef CROSS_COMPILE */
-
-/* Some gas code wants to know these parameters.  */
-#define TARGET_ALIAS "i386-unknown-freebsd"
-#define TARGET_CPU "i386"
-#define TARGET_CANONICAL "i386-unknown-freebsd"
-#define TARGET_OS "freebsd"
-#define TARGET_VENDOR "unknown"
-
-/* Sometimes the system header files don't declare strstr.  */
-/* #undef NEED_DECLARATION_STRSTR */
-
-/* Sometimes the system header files don't declare malloc and realloc.  */
-/* #undef NEED_DECLARATION_MALLOC */
-
-/* Sometimes the system header files don't declare free.  */
-/* #undef NEED_DECLARATION_FREE */
-
-/* Sometimes the system header files don't declare sbrk.  */
-/* #undef NEED_DECLARATION_SBRK */
-
-/* Sometimes errno.h doesn't declare errno itself.  */
-/* #undef NEED_DECLARATION_ERRNO */
-
-/* #undef MANY_SEGMENTS */
-
-/* Needed only for sparc configuration.  */
-/* #undef SPARC_V9 */
-/* #undef SPARC_ARCH64 */
-
-/* Defined if using CGEN.  */
-/* #undef USING_CGEN */
-
-/* Needed only for some configurations that can produce multiple output
-   formats.  */
-#define DEFAULT_EMULATION ""
-#define EMULATIONS 
-/* #undef USE_EMULATIONS */
-/* #undef OBJ_MAYBE_AOUT */
-/* #undef OBJ_MAYBE_BOUT */
-/* #undef OBJ_MAYBE_COFF */
-/* #undef OBJ_MAYBE_ECOFF */
-/* #undef OBJ_MAYBE_ELF */
-/* #undef OBJ_MAYBE_GENERIC */
-/* #undef OBJ_MAYBE_HP300 */
-/* #undef OBJ_MAYBE_IEEE */
-/* #undef OBJ_MAYBE_SOM */
-/* #undef OBJ_MAYBE_VMS */
-
-/* Used for some of the COFF configurations, when the COFF code needs
-   to select something based on the CPU type before it knows it... */
-/* #undef I386COFF */
-/* #undef M68KCOFF */
-/* #undef M88KCOFF */
-
-/* Define if you have the remove function.  */
-/* #undef HAVE_REMOVE */
-
-/* Define if you have the sbrk function.  */
-#define HAVE_SBRK 1
-
-/* Define if you have the unlink function.  */
-#define HAVE_UNLINK 1
-
-/* Define if you have the <errno.h> header file.  */
-#define HAVE_ERRNO_H 1
-
-/* Define if you have the <memory.h> header file.  */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the <stdarg.h> header file.  */
-#define HAVE_STDARG_H 1
-
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <strings.h> header file.  */
-#define HAVE_STRINGS_H 1
-
-/* Define if you have the <sys/types.h> header file.  */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the <varargs.h> header file.  */
-#define HAVE_VARARGS_H 1
-#endif /* GAS_VERSION */
diff --git a/gnu/usr.bin/binutils/i386-aout/as/itbl-cpu.h b/gnu/usr.bin/binutils/i386-aout/as/itbl-cpu.h
deleted file mode 100644
index 5488021..0000000
--- a/gnu/usr.bin/binutils/i386-aout/as/itbl-cpu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "itbl-i386.h"
diff --git a/gnu/usr.bin/binutils/i386-aout/as/obj-format.h b/gnu/usr.bin/binutils/i386-aout/as/obj-format.h
deleted file mode 100644
index e8a4d33..0000000
--- a/gnu/usr.bin/binutils/i386-aout/as/obj-format.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "obj-aout.h"
diff --git a/gnu/usr.bin/binutils/i386-aout/as/targ-cpu.h b/gnu/usr.bin/binutils/i386-aout/as/targ-cpu.h
deleted file mode 100644
index f4be0e5..0000000
--- a/gnu/usr.bin/binutils/i386-aout/as/targ-cpu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "tc-i386.h"
diff --git a/gnu/usr.bin/binutils/i386-aout/as/targ-env.h b/gnu/usr.bin/binutils/i386-aout/as/targ-env.h
deleted file mode 100644
index 032e7ac..0000000
--- a/gnu/usr.bin/binutils/i386-aout/as/targ-env.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "te-freebsd.h"