From ec9c19165c16c7c1148148f33ac9a68c7daa99e5 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Fri, 18 Apr 2008 16:06:46 +0000
Subject: [PATCH] Move our ".mcount" bits around a little.

---
 contrib/gcc/config/i386/freebsd64.h     | 3 +++
 gnu/usr.bin/cc/cc_tools/Makefile        | 1 -
 gnu/usr.bin/cc/cc_tools/freebsd64-fix.h | 9 ---------
 3 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 gnu/usr.bin/cc/cc_tools/freebsd64-fix.h

diff --git a/contrib/gcc/config/i386/freebsd64.h b/contrib/gcc/config/i386/freebsd64.h
index 473ef2f22b1b..f9f51163b0be 100644
--- a/contrib/gcc/config/i386/freebsd64.h
+++ b/contrib/gcc/config/i386/freebsd64.h
@@ -56,3 +56,6 @@ Boston, MA 02111-1307, USA.  */
 	%{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \
     %{static:-Bstatic}} \
   %{symbolic:-Bsymbolic}"
+
+#undef	MCOUNT_NAME
+#define	MCOUNT_NAME ".mcount"
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 9998499dd603..788cd349395f 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -247,7 +247,6 @@ TARGET_INC+=	${GCC_CPU}/freebsd.h
 .if ${TARGET_ARCH} == "amd64"
 TARGET_INC+=	${GCC_CPU}/x86-64.h
 TARGET_INC+=	${GCC_CPU}/freebsd64.h
-TARGET_INC+=	freebsd64-fix.h
 .endif
 .if ${TARGET_ARCH} == "powepc"
 TARGET_INC+=	altivec-defs.h
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h b/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h
deleted file mode 100644
index 23f14d1e088d..000000000000
--- a/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * config/i386/freebsd64.h neglects to override the default bogus mcount
- * function name.  In order to avoid touching vendor source while gcc3.4
- * is in progress, try a minimal workaround.
- *
- * $FreeBSD$
- */
-#undef MCOUNT_NAME
-#define MCOUNT_NAME ".mcount"