Make this directory more regular. Since it is one we control, use the

freebsd-based names for filenames.  This allows us to eliminate
almost all of the uses of ${MACHINE_ARCH} here to do special things, and
instead we use it to include filenames.  This makes new architectures easier
to support.

4 files changed, 3 insertions, 14 deletions

diff --git a/gnu/usr.bin/gdb/gdbserver/Makefile b/gnu/usr.bin/gdb/gdbserver/Makefile
index 390ef32692b6..08f25ae61a55 100644
--- a/gnu/usr.bin/gdb/gdbserver/Makefile
+++ b/gnu/usr.bin/gdb/gdbserver/Makefile
@@ -14,20 +14,9 @@ SRCS=	inferiors.c mem-break.c regcache.c remote-utils.c	\
 	server.c signals.c target.c utils.c
 SRCS+=	fbsd-low.c
 
-.if ${MACHINE_ARCH} == "amd64"
-SRCS+= fbsd-amd64-low.c i387-fp.c reg-x86-64.c
-.endif
-
-.if ${MACHINE_ARCH} == "arm"
-SRCS+= fbsd-arm-low.c reg-arm.c
-.endif
-
-.if ${MACHINE_ARCH} == "i386"
-SRCS+= fbsd-i386-low.c i387-fp.c reg-i386.c
-.endif
-
-.if ${MACHINE_ARCH} == "powerpc"
-SRCS+= fbsd-ppc-low.c reg-ppc.c
+SRCS+= fbsd-${MACHINE_ARCH}-low.c reg-${MACHINE_ARCH}.c
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+SRCS+= i387-fp.c
 .endif
 
 #CFLAGS+=	-I${.CURDIR}/../arch/${MACHINE_ARCH}
diff --git a/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c b/gnu/usr.bin/gdb/gdbserver/fbsd-powerpc-low.c
index 35f7ac650928..35f7ac650928 100644
--- a/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c
+++ b/gnu/usr.bin/gdb/gdbserver/fbsd-powerpc-low.c
diff --git a/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c b/gnu/usr.bin/gdb/gdbserver/reg-amd64.c
index 7b0534f0d569..7b0534f0d569 100644
--- a/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c
+++ b/gnu/usr.bin/gdb/gdbserver/reg-amd64.c
diff --git a/gnu/usr.bin/gdb/gdbserver/reg-ppc.c b/gnu/usr.bin/gdb/gdbserver/reg-powerpc.c
index 47046631d52e..47046631d52e 100644
--- a/gnu/usr.bin/gdb/gdbserver/reg-ppc.c
+++ b/gnu/usr.bin/gdb/gdbserver/reg-powerpc.c