Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/vax/boot Move common CFLAGS/AFLAGS to Makefile.inc.



details:   https://anonhg.NetBSD.org/src/rev/11582cfa2353
branches:  trunk
changeset: 556155:11582cfa2353
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Dec 08 07:32:19 2003 +0000

description:
Move common CFLAGS/AFLAGS to Makefile.inc.
For now, only suppy -mno-asm-pic when not using gcc3.

diffstat:

 sys/arch/vax/boot/Makefile.inc            |  8 +++++++-
 sys/arch/vax/boot/boot/Makefile           |  4 +---
 sys/arch/vax/boot/xxboot/Makefile         |  5 ++---
 sys/arch/vax/boot/xxboot_ustarfs/Makefile |  5 ++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r 3c169520ac36 -r 11582cfa2353 sys/arch/vax/boot/Makefile.inc
--- a/sys/arch/vax/boot/Makefile.inc    Mon Dec 08 06:43:55 2003 +0000
+++ b/sys/arch/vax/boot/Makefile.inc    Mon Dec 08 07:32:19 2003 +0000
@@ -1,7 +1,13 @@
-#      $NetBSD: Makefile.inc,v 1.6 2002/02/24 01:04:23 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2003/12/08 07:32:19 matt Exp $
 
 RELOC=0x2f0000
 .PATH: ${.CURDIR}/../../vax ${.CURDIR}/../common
 
 CPPFLAGS+=-I. -I${.CURDIR}/../../../../ -I${.CURDIR}/../../ -I${.CURDIR}/../common -I${.CURDIR}/../../include
 CPPFLAGS+=-DRELOC=${RELOC}
+
+CFLAGS+=-ffreestanding
+.if ${HAVE_GCC3} == "no"
+CFLAGS+=-mno-asm-pic
+AFLAGS+=-mno-asm-pic
+.endif
diff -r 3c169520ac36 -r 11582cfa2353 sys/arch/vax/boot/boot/Makefile
--- a/sys/arch/vax/boot/boot/Makefile   Mon Dec 08 06:43:55 2003 +0000
+++ b/sys/arch/vax/boot/boot/Makefile   Mon Dec 08 07:32:19 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.32 2003/10/26 07:25:37 lukem Exp $
+#      $NetBSD: Makefile,v 1.33 2003/12/08 07:32:19 matt Exp $
 
 S=     ${.CURDIR}/../../../..
 NOMAN= # defined
@@ -12,8 +12,6 @@
        consio.c consio2.S str.S ${DEVS} findcpu.c vers.c
 LIBC=
 
-CFLAGS+=-ffreestanding -mno-asm-pic
-AFLAGS+=-mno-asm-pic
 CLEANFILES+=${PROG} ${PROG}.sym vers.c
 CPPFLAGS+=-DSUPPORT_BOOTPARAMS -DSUPPORT_BOOTP -DSUPPORT_DHCP -D_STANDALONE \
        -DNO_MID_CHECK
diff -r 3c169520ac36 -r 11582cfa2353 sys/arch/vax/boot/xxboot/Makefile
--- a/sys/arch/vax/boot/xxboot/Makefile Mon Dec 08 06:43:55 2003 +0000
+++ b/sys/arch/vax/boot/xxboot/Makefile Mon Dec 08 07:32:19 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2003/02/04 13:21:49 matt Exp $
+#      $NetBSD: Makefile,v 1.18 2003/12/08 07:32:19 matt Exp $
 
 S=     ${.CURDIR}/../../../..
 
@@ -23,8 +23,7 @@
 BINDIR=        /usr/mdec
 NOMAN= # defined
 
-CFLAGS=        -Os -ffreestanding -mno-asm-pic
-AFLAGS= -mno-asm-pic
+CFLAGS=        -Os
 LIBC=
 
 SA_AS= library
diff -r 3c169520ac36 -r 11582cfa2353 sys/arch/vax/boot/xxboot_ustarfs/Makefile
--- a/sys/arch/vax/boot/xxboot_ustarfs/Makefile Mon Dec 08 06:43:55 2003 +0000
+++ b/sys/arch/vax/boot/xxboot_ustarfs/Makefile Mon Dec 08 07:32:19 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2002/11/05 14:35:33 thorpej Exp $
+#      $NetBSD: Makefile,v 1.5 2003/12/08 07:32:19 matt Exp $
 
 S=     ${.CURDIR}/../../../..
 
@@ -19,8 +19,7 @@
 BINDIR=        /usr/mdec
 NOMAN= # defined
 
-CFLAGS=        -Os -ffreestanding -mno-asm-pic
-AFLAGS= -mno-asm-pic
+CFLAGS=        -Os
 LIBC=
 
 SA_AS= library



Home | Main Index | Thread Index | Old Index