From 08a17b70d350493cbc0cb98ff93c36f0d46f3206 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Sat, 16 Mar 2002 19:33:23 +0000
Subject: Fix unaligned access in the GDB binary on Alpha.

Submitted by:	gallatin
---
 gnu/usr.bin/binutils/gdb/Makefile       | 3 ++-
 gnu/usr.bin/binutils/gdb/Makefile.alpha | 5 +++++
 gnu/usr.bin/binutils/gdb/Makefile.i386  | 5 +++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index 82ad7c7..752738b 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -16,7 +16,7 @@ XSRCS=	annotate.c ax-general.c ax-gdb.c bcache.c blockframe.c		\
 	corefile.c corelow.c cp-valprint.c dcache.c dbxread.c		\
 	demangle.c dwarfread.c dwarf2read.c elfread.c environ.c eval.c	\
 	exec.c expprint.c f-exp.y f-lang.c f-typeprint.c f-valprint.c	\
-	findvar.c fork-child.c freebsd-uthread.c gdbarch.c gdbtypes.c	\
+	findvar%UAfix.c fork-child.c freebsd-uthread.c gdbarch.c gdbtypes.c \
 	infcmd.c inflow.c infptrace.c infrun.c inftarg.c language.c	\
 	jv-exp.y jv-lang.c jv-valprint.c jv-typeprint.c nlmread.c	\
 	m2-lang.c m2-exp.y m2-typeprint.c m2-valprint.c main.c maint.c	\
@@ -67,6 +67,7 @@ CFLAGS+= -DNO_MMALLOC
 YFLAGS=
 
 CLEANFILES=	init.c init.c-tmp wait.h
+CLEANFILES=	findvar%UAfix.c
 
 # We do this by grepping through sources.  If that turns out to be too slow,
 # maybe we could just require every .o file to have an initialization routine
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.alpha b/gnu/usr.bin/binutils/gdb/Makefile.alpha
index bb11105..0ae3389 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.alpha
+++ b/gnu/usr.bin/binutils/gdb/Makefile.alpha
@@ -5,4 +5,9 @@
 XSRCS+= freebsd-nat.c alpha-tdep.c kvm-fbsd.c
 LDADD+= -lkvm
 
+findvar%UAfix.c: findvar.c
+	sed -e \
+	    's,char registers[REGISTER_BYTES + /* SLOP */ 256];,char registers[REGISTER_BYTES + /* SLOP */ 256] __attribute__ ((aligned (8)));,g' \
+	    ${.ALLSRC} >${.TARGET}
+
 .PATH: ${.CURDIR}/alpha
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.i386 b/gnu/usr.bin/binutils/gdb/Makefile.i386
index 607463b..f2d4960 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.i386
+++ b/gnu/usr.bin/binutils/gdb/Makefile.i386
@@ -1,7 +1,8 @@
-#
 # $FreeBSD$
-#
 
 XSRCS+= freebsd-nat.c i386-tdep.c i387-tdep.c kvm-fbsd.c
 
+findvar%UAfix.c: findvar.c
+	ln -sf ${.ALLSRC} ${.TARGET}
+
 .PATH: ${.CURDIR}/i386
-- 
cgit v1.1