From aabc36c5b82b54b0b0a83652ca3bdd450d630fee Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Thu, 10 Jun 2004 22:18:33 +0000
Subject: [PATCH] The gcc/config/i386/freebsd64.h file neglects to override the
 default (bogus, application name space) mcount function name on amd64. 
 Override it here instead.

I've done it this way to avoid touching gcc source while 3.4 is in
progress, and this is the smallest, lowest impact I could come up with.
Adding a patch touches about 10-14 lines of Makefile, this touches only 1.
This will likely go away with the 3.4 import.

I spoke with Alexander about this a few days ago, but waited until after
sorting out some of the other bugs in the userland profiling.
---
 gnu/usr.bin/cc/cc_tools/Makefile        | 1 +
 gnu/usr.bin/cc/cc_tools/freebsd64-fix.h | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 gnu/usr.bin/cc/cc_tools/freebsd64-fix.h

diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 5d9535a4191..f9895359c78 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -187,6 +187,7 @@ 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+=	${.CURDIR}/freebsd64-fix.h
 .endif
 TARGET_INC+=	defaults.h
 
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h b/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h
new file mode 100644
index 00000000000..23f14d1e088
--- /dev/null
+++ b/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h
@@ -0,0 +1,9 @@
+/*
+ * 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"