From d8280c36a8fbf8df502bd11f6395490d696e4a56 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Sun, 9 Aug 2009 10:21:22 -0700
Subject: [PATCH] GCC - Add NO_GCC44 feature and use it in test/amd64/Makefile

* Feature added primarily so we can get amd64 buildworlds working again,
  until gcc-4.4 starts building with it.
---
 Makefile.inc1                       | 4 ++++
 gnu/lib/Makefile                    | 5 ++++-
 gnu/usr.bin/Makefile                | 2 ++
 gnu/usr.bin/cc44/gmp/Makefile.amd64 | 3 +++
 test/amd64/Makefile                 | 6 ++++--
 5 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 gnu/usr.bin/cc44/gmp/Makefile.amd64

diff --git a/Makefile.inc1 b/Makefile.inc1
index 01c7005906..2076ac5f10 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -787,8 +787,10 @@ _gcc34_tools= gnu/usr.bin/cc34/cc_prep gnu/usr.bin/cc34/cc_tools
 .endif
 _gcc41_cross= gnu/usr.bin/cc41
 _gcc41_tools= gnu/usr.bin/cc41/cc_prep gnu/usr.bin/cc41/cc_tools
+.if !defined(NO_GCC44)
 _gcc44_cross= gnu/usr.bin/cc44
 _gcc44_tools= gnu/usr.bin/cc44/cc_prep gnu/usr.bin/cc44/cc_tools
+.endif
 _custom_cross= libexec/customcc
 _binutils= gnu/usr.bin/binutils217
 
@@ -854,9 +856,11 @@ libraries:
 	cd ${.CURDIR}; \
 	    HOST_CCVER=${HOST_CCVER} CCVER=gcc41 \
 		${MAKE} -f Makefile.inc1 _startup_libs41;
+.if !defined(NO_GCC44)
 	cd ${.CURDIR}; \
 	    HOST_CCVER=${HOST_CCVER} CCVER=gcc44 \
 		${MAKE} -f Makefile.inc1 _startup_libs44;
+.endif
 	cd ${.CURDIR}; \
 	    ${MAKE} -f Makefile.inc1 _startup_libs; \
 	    ${MAKE} -f Makefile.inc1 _prebuild_libs; \
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 9745d12120..9f2afdede9 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,7 +1,10 @@
 # $FreeBSD: src/gnu/lib/Makefile,v 1.25.2.4 2001/01/06 23:16:53 obrien Exp $
 # $DragonFly: src/gnu/lib/Makefile,v 1.17 2008/06/27 08:08:25 corecode Exp $
 
-SUBDIR= libdialog libregex gcc41 gcc44
+SUBDIR= libdialog libregex gcc41
+.if !defined(NO_GCC44)
+SUBDIR+= gcc44
+.endif
 .if !defined(NO_GCC34)
 SUBDIR+= gcc34
 .endif
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 951054a9c6..cfab427116 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -21,7 +21,9 @@ SUBDIR+= cc34
 SUBDIR+= cc41
 .ORDER: binutils217 cc41
 
+.if !defined(NO_GCC44)
 SUBDIR+= cc44
 .ORDER: binutils217 cc44
+.endif
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/cc44/gmp/Makefile.amd64 b/gnu/usr.bin/cc44/gmp/Makefile.amd64
new file mode 100644
index 0000000000..0d8b181054
--- /dev/null
+++ b/gnu/usr.bin/cc44/gmp/Makefile.amd64
@@ -0,0 +1,3 @@
+LONG_INT_BITS=	64
+INT_BITS=	32
+SHORT_BITS=	16
diff --git a/test/amd64/Makefile b/test/amd64/Makefile
index 56b64dd014..19e0dfe09a 100644
--- a/test/amd64/Makefile
+++ b/test/amd64/Makefile
@@ -127,7 +127,8 @@ world32: checkq
 
 world64: checkq
 	cd ${SRCDIR} && \
-	    make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 buildworld
+	    make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 NO_GCC44=1 \
+	    buildworld
 
 kernel64: checkq
 	cd ${SRCDIR} && \
@@ -139,7 +140,8 @@ kernel64: checkq
 #
 quickworld64: checkq
 	cd ${SRCDIR} && \
-	    make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 quickworld
+	    make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 NO_GCC44=1 \
+	    quickworld
 
 quickkernel64: checkq
 	cd ${SRCDIR} && \
-- 
2.41.0