From: Ben Gras <ben@minix3.org>
Date: Mon, 13 Sep 2010 13:36:29 +0000 (+0000)
Subject: Makefiles: remove -D__minix for assembly invocations.
X-Git-Tag: v3.2.0~885
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/static/host.html?a=commitdiff_plain;h=b7eb0960888e38c9878d49543ee954886b1e5663;p=minix.git

Makefiles: remove -D__minix for assembly invocations.

They seem to be redundant (for gcc+ack+clang) and produce
very messy warnings (for clang, due to it already being defined).
---

diff --git a/share/mk/bsd.ack.mk b/share/mk/bsd.ack.mk
index 5280a5599..538f7e9f8 100644
--- a/share/mk/bsd.ack.mk
+++ b/share/mk/bsd.ack.mk
@@ -11,7 +11,7 @@ CPPFLAGS+= -wo
 # .endif
 
 ASMCONV=gas2ack
-AFLAGS+=-D__ASSEMBLY__ -D__minix -w -wo
+AFLAGS+=-D__ASSEMBLY__ -w -wo
 CPP.s=${CC} -E ${AFLAGS}
 ASMCONVFLAGS+=-mi386
 
diff --git a/share/mk/bsd.gcc.mk b/share/mk/bsd.gcc.mk
index 6554b76e2..66ee4ee40 100644
--- a/share/mk/bsd.gcc.mk
+++ b/share/mk/bsd.gcc.mk
@@ -1,2 +1,2 @@
-AFLAGS+=-D__ASSEMBLY__ -D_EM_WSIZE=4 -D__minix
+AFLAGS+=-D__ASSEMBLY__ -D_EM_WSIZE=4
 CFLAGS+= -fno-builtin