Sat Oct 26 10:10:14 2019 UTC ()

Misc cleanup to avoid future confusion.

- Remove more unnecessary debug sections
- Use DBG instead of COPTS to specify -Os as defined in bsd.prog.mk
- Use CFLAGS and CPPFLAGS correctly
- Explicitly set -ffreestanding


(tsutsui)

diff -r1.11 -r1.12 src/sys/arch/zaurus/stand/zbsdmod/Makefile

--- src/sys/arch/zaurus/stand/zbsdmod/Makefile 2019/09/23 13:42:37	1.11
+++ src/sys/arch/zaurus/stand/zbsdmod/Makefile 2019/10/26 10:10:14	1.12

 @@ -1,33 +1,44 @@
-#	$NetBSD: Makefile,v 1.11 2019/09/23 13:42:37 christos Exp $
+#	$NetBSD: Makefile,v 1.12 2019/10/26 10:10:14 tsutsui Exp $
 WARNS?=	4
 .include <bsd.init.mk>
 S=	${.CURDIR}/../../../..
 OBJS=	zbsdmod.o
 SRCS=	zbsdmod.c
 NOMAN=	# defined
 OBJCOPY_FLAGS=			\
 	-R .debug_abbrev	\
 	-R .debug_aranges	\
 	-R .debug_info		\
 	-R .debug_line		\
 	-R .debug_loc		\
 	-R .debug_ranges	\
 	-R .debug_str		\
 	-R .eh_frame
 realall: ${OBJS}
-	${OBJCOPY} -R .eh_frame ${.OBJDIR}/zbsdmod.o
+	${OBJCOPY} ${OBJCOPY_FLAGS} ${.OBJDIR}/zbsdmod.o
 .include <bsd.klinks.mk>
 .include <bsd.prog.mk>
 afterinstall:
 	${INSTALL_FILE} ${INSTALL_COPY} -o root -g wheel -m 644 \
 		${OBJS} ${DESTDIR}/${BINDIR}
 CPUFLAGS=
-COPTS=		-Os
+DBG=		-Os
 CFLAGS+=	-fno-strict-aliasing
-CFLAGS+=	-DMACHINE=\"${MACHINE}\" -DUTS_RELEASE=\"2.4.20\"
+CFLAGS+=	-ffreestanding -nostdinc
-CPPFLAGS+=	${ARM_APCS_FLAGS} -mcpu=xscale
+CFLAGS+=	${ARM_APCS_FLAGS} -mcpu=xscale
-CPPFLAGS+=      -nostdinc -D_STANDALONE
+CPPFLAGS+=	-DMACHINE=\"${MACHINE}\" -DUTS_RELEASE=\"2.4.20\"
 CPPFLAGS+=	-D_STANDALONE
 CPPFLAGS+=	-I${.OBJDIR} -I${S}
 release: check_RELEASEDIR
 	${HOST_INSTALL_FILE} -m ${NONBINMODE} ${OBJS} \
 	    ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation