From c3225ca1a5f19956b0a1f18a405110298cb0ac73 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Thu, 14 Mar 2013 16:47:36 +0100
Subject: [PATCH] Reduce difference with NetBSD share/mk

Move Minix-specific parameters from bsd.gcc.mk to bsd.own.mk,
which is any way patched. This enables then bsd.gcc.mk to be aligned
on the NetBSD version.

Also remove a few duplicate settings which are not anymore needed.

Change-Id: I93384527d3a2f18c8ece9fab9d24aa7ef8516a2d
---
 servers/vfs/Makefile |  2 +-
 share/mk/bsd.gcc.mk  | 18 +-----------------
 share/mk/bsd.own.mk  | 19 +++++++++++++++----
 tools/gcc/Makefile   | 13 ++++++++-----
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/servers/vfs/Makefile b/servers/vfs/Makefile
index 083a5675c..8929fd9d4 100644
--- a/servers/vfs/Makefile
+++ b/servers/vfs/Makefile
@@ -14,7 +14,7 @@ SRCS+=  gcov.c
 CPPFLAGS+= -DUSE_COVERAGE
 .endif
 
-CFLAGS+= -Wall -Wextra -Werror
+CFLAGS+= -Wall -Wextra -Werror -Wno-sign-compare
 DPADD+=	${LIBSYS} ${LIBTIMERS} ${LIBEXEC}
 LDADD+=	-lsys -ltimers -lexec -lmthread
 
diff --git a/share/mk/bsd.gcc.mk b/share/mk/bsd.gcc.mk
index a491ab8b4..ddf04e6d7 100644
--- a/share/mk/bsd.gcc.mk
+++ b/share/mk/bsd.gcc.mk
@@ -3,7 +3,7 @@
 .if !defined(_BSD_GCC_MK_)
 _BSD_GCC_MK_=1
 
-.if defined(EXTERNAL_TOOLCHAIN) && !defined(__MINIX)
+.if defined(EXTERNAL_TOOLCHAIN)
 _GCC_CRTBEGIN!=		${CC} --print-file-name=crtbegin.o
 _GCC_CRTBEGINS!=	${CC} --print-file-name=crtbeginS.o
 _GCC_CRTEND!=		${CC} --print-file-name=crtend.o
@@ -23,20 +23,4 @@ _GCC_CRTDIR?=		${DESTDIR}/usr/lib
 _GCC_LIBGCCDIR?=	${DESTDIR}/usr/lib
 .endif
 
-.if defined(__MINIX)
-AFLAGS+=-D__ASSEMBLY__
-CPPFLAGS+= -fno-builtin -Wall -Wno-sign-compare
-
-#LSC FIXME: Needed by clang for now
-.if ${MACHINE_ARCH} == "i386"
-CPUFLAGS+= -march=i586
-.endif
-
-# LSC In the current state there is too much to be done
-# Some package have been identified by directly adding NOGCCERROR
-# To their Makefiles
-NOGCCERROR:= yes
-NOCLANGERROR:= yes
-.endif # defined(__MINIX)
-
 .endif	# ! defined(_BSD_GCC_MK_)
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 4006fa746..eca9bfbc2 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -22,16 +22,27 @@ MANGRP?=	operator
 INFOGRP?=	operator
 DOCGRP?=	operator
 
-MKBINUTILS:=	no
-MKGDB:=		no
+MKBINUTILS?=	no
+MKGDB?=		no
 MKGCC?=		no
 
-# LSC To check if works
-#DESTDIR?=	/usr/destdir.${MACHINE_ARCH}
+# LSC In the current state there is too much to be done
+# # Some package have been identified by directly adding NOGCCERROR
+# # To their Makefiles
+NOGCCERROR?= yes 
+NOCLANGERROR?= yes 
+
+AFLAGS+=        -D__ASSEMBLY__
+CFLAGS+=        -fno-builtin
 
 # For C++ programs
 CPPFLAGS+=      -I${DESTDIR}/usr/include/g++
 
+#LSC FIXME: Needed by clang for now
+.if ${MACHINE_ARCH} == "i386"
+CPUFLAGS+= -march=i586
+.endif
+
 # LSC MINIX SMP Support?
 .ifdef CONFIG_SMP
 SMP_FLAGS += -DCONFIG_SMP
diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
index cd48195bb..fbeeb72c1 100644
--- a/tools/gcc/Makefile
+++ b/tools/gcc/Makefile
@@ -4,6 +4,13 @@
 
 .ifdef __MINIX
 GCC_LANGUAGES=c c++
+
+# LSC FIXME Some flags have to be adapted in order to work for minix
+MINIX_CONFIGURE_ARGS= \
+			--disable-libssp \
+			--disable-threads \
+			--disable-visibility \
+			--disable-libunwind
 .else
 GCC_LANGUAGES=c c++ objc
 .endif
@@ -36,18 +43,14 @@ MULTILIB_ARGS= --disable-multilib
 SOFTFLOAT_ARGS=	-with-float=soft
 .endif
 
-# LSC FIXME Some flags have to be adapted in order to work for minix
 COMMON_CONFIGURE_ARGS=	--target=${MACHINE_GNU_PLATFORM} \
-			--disable-libssp \
-			--disable-threads \
-			--disable-visibility \
-			--disable-libunwind \
 			--enable-long-long \
 			--enable-threads \
 			--with-bugurl=http://www.NetBSD.org/Misc/send-pr.html \
 			--with-pkgversion="NetBSD nb1 20120916" \
 			--with-system-zlib \
 			${VAX_CONFIGURE_ARGS} \
+			${MINIX_CONFIGURE_ARGS} \
 			--enable-__cxa_atexit
 .if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
 COMMON_CONFIGURE_ARGS+=	--with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}