Move our ".mcount" bits around a little.

2008-04-18 16:06:46 +00:00 · 2008-04-18 16:06:46 +00:00 · ec9c19165c
commit ec9c19165c
parent 84826bfaa8
3 changed files with 3 additions and 10 deletions
--- 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"
--- 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
--- a/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h
+++ b/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h
@ -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"