[src/trunk]: src/share/mk The MIPS toolchain now defines __ABICALLS__ when ab...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b6b0db571110
branches:  trunk
changeset: 539186:b6b0db571110
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Nov 10 18:15:29 2002 +0000

description:
The MIPS toolchain now defines __ABICALLS__ when abicalls are in use,
and the sources now use that define, so there is no need for us to define
ABICALLS.  Since that was the only use for the AINC variable, garbage-collect
it.

diffstat:

 share/mk/bsd.dep.mk |   6 +++---
 share/mk/bsd.lib.mk |  17 +++++++----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diffs (68 lines):

diff -r cbb24af56e86 -r b6b0db571110 share/mk/bsd.dep.mk
--- a/share/mk/bsd.dep.mk       Sun Nov 10 18:10:25 2002 +0000
+++ b/share/mk/bsd.dep.mk       Sun Nov 10 18:15:29 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.dep.mk,v 1.35 2002/06/04 21:22:54 thorpej Exp $
+#      $NetBSD: bsd.dep.mk,v 1.36 2002/11/10 18:15:29 thorpej Exp $
 
 ##### Basic targets
 .PHONY:                cleandepend
@@ -26,10 +26,10 @@
        @files="${.ALLSRC:M*.s} ${.ALLSRC:M*.S}"; \
        if [ "$$files" != " " ]; then \
          echo ${MKDEP} -a ${MKDEPFLAGS} \
-           ${AFLAGS:M-[ID]*:Q} ${CPPFLAGS:Q} ${__acpp_flags} ${AINC:Q} \
+           ${AFLAGS:M-[ID]*:Q} ${CPPFLAGS:Q} ${__acpp_flags} \
            $$files; \
          ${MKDEP} -a ${MKDEPFLAGS} \
-           ${AFLAGS:M-[ID]*} ${CPPFLAGS} ${__acpp_flags} ${AINC} $$files; \
+           ${AFLAGS:M-[ID]*} ${CPPFLAGS} ${__acpp_flags} $$files; \
        fi
        @files="${.ALLSRC:M*.c}"; \
        if [ "$$files" != "" ]; then \
diff -r cbb24af56e86 -r b6b0db571110 share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Sun Nov 10 18:10:25 2002 +0000
+++ b/share/mk/bsd.lib.mk       Sun Nov 10 18:15:29 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.209 2002/11/09 08:22:04 thorpej Exp $
+#      $NetBSD: bsd.lib.mk,v 1.210 2002/11/10 18:15:29 thorpej Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -109,9 +109,6 @@
 # not just sharedlibs.
 MKPICLIB= no
 
-# so turn shlib PIC flags on for ${AS}.
-AINC+=-DABICALLS
-
 .elif ${MACHINE_ARCH} == "vax" && ${OBJECT_FMT} == "ELF"
 
 # On the VAX, all object are PIC by default, not just sharedlibs.
@@ -302,20 +299,20 @@
 .endif
 
 .S.o .s.o:
-       @echo ${COMPILE.S:Q} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC}
-       @${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
+       @echo ${COMPILE.S:Q} ${CFLAGS:M-[ID]*} ${.IMPSRC}
+       @${COMPILE.S} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.o
        @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 
 .S.po .s.po:
-       @echo ${COMPILE.S:Q} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}
-       @${COMPILE.S} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
+       @echo ${COMPILE.S:Q} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}
+       @${COMPILE.S} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.o
        @${LD} -X -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o
 
 .S.so .s.so:
-       @echo ${COMPILE.S:Q} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}
-       @${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o
+       @echo ${COMPILE.S:Q} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}
+       @${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.o
        @${LD} -x -r ${.TARGET}.o -o ${.TARGET}
        @rm -f ${.TARGET}.o