CVS commit: [netbsd-9] src/share/mk
Module Name:src
Committed By: martin
Date: Thu Feb 4 19:05:01 UTC 2021
Modified Files:
src/share/mk [netbsd-9]: bsd.own.mk
Log Message:
Fix editor mishap in previous merge
To generate a diff of this commit:
cvs rdiff -u -r1.1149.2.5 -r1.1149.2.6 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1149.2.5 src/share/mk/bsd.own.mk:1.1149.2.6
--- src/share/mk/bsd.own.mk:1.1149.2.5 Thu Feb 4 17:12:10 2021
+++ src/share/mk/bsd.own.mk Thu Feb 4 19:05:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1149.2.5 2021/02/04 17:12:10 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1149.2.6 2021/02/04 19:05:00 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1395,7 +1395,7 @@ ${var}?= no
# format if USE_PIGZGZIP is enabled.
.if ${USE_PIGZGZIP} == "no" && \
(${MACHINE} == "amd64" || \
- ${MACHINE} == "sparc64"
+ ${MACHINE} == "sparc64")
USE_XZ_SETS?= yes
.else
USE_XZ_SETS?= no
CVS commit: [netbsd-9] src/share/mk
Module Name:src
Committed By: martin
Date: Thu Feb 4 17:12:10 UTC 2021
Modified Files:
src/share/mk [netbsd-9]: bsd.own.mk
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1193):
share/mk/bsd.own.mk: revision 1.1229
Switch alpha to USE_XZ_SETS=no, i.e. using gzip for installation sets.
Ok'ed by martin@ in PR/55751. Maybe worth to pullup to netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.1149.2.4 -r1.1149.2.5 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1149.2.4 src/share/mk/bsd.own.mk:1.1149.2.5
--- src/share/mk/bsd.own.mk:1.1149.2.4 Fri Aug 14 11:02:42 2020
+++ src/share/mk/bsd.own.mk Thu Feb 4 17:12:10 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1149.2.4 2020/08/14 11:02:42 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1149.2.5 2021/02/04 17:12:10 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1395,8 +1395,7 @@ ${var}?= no
# format if USE_PIGZGZIP is enabled.
.if ${USE_PIGZGZIP} == "no" && \
(${MACHINE} == "amd64" || \
- ${MACHINE} == "sparc64" || \
- ${MACHINE} == "alpha")
+ ${MACHINE} == "sparc64"
USE_XZ_SETS?= yes
.else
USE_XZ_SETS?= no
CVS commit: [netbsd-9] src/share/mk
Module Name:src
Committed By: martin
Date: Mon Feb 10 19:07:22 UTC 2020
Modified Files:
src/share/mk [netbsd-9]: sys.mk
Log Message:
Pull up following revision(s) (requested by maya in ticket #689):
share/mk/sys.mk: revision 1.143
Don't special case aarch64 and add -fomit-frame-pointer to builds.
This behaviour is probably due to a past behaviour of clang, where it
always emitted frame pointer code.
This is no longer true for clang on netbsd, and I don't think it was true
for GCC.
Meanwhile, this flag bleeds into pkgsrc where it breaks random packages,
requiring workarounds like lang/ruby*-base/hacks.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.139.2.1 -r1.139.2.2 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.139.2.1 src/share/mk/sys.mk:1.139.2.2
--- src/share/mk/sys.mk:1.139.2.1 Tue Dec 24 17:32:20 2019
+++ src/share/mk/sys.mk Mon Feb 10 19:07:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.139.2.1 2019/12/24 17:32:20 martin Exp $
+# $NetBSD: sys.mk,v 1.139.2.2 2020/02/10 19:07:22 martin Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
#
# This file contains the basic rules for make(1) and is read first
@@ -33,8 +33,6 @@ DBG?= -Os -freorder-blocks
DBG?= -O2 -fno-reorder-blocks
.elif ${MACHINE_ARCH} == "coldfire"
DBG?= -O1
-.elif !empty(MACHINE_ARCH:Maarch64*)
-DBG?= -O2 ${"${.TARGET:M*.po}" == "":? -fomit-frame-pointer:}
.else
DBG?= -O2
.endif
CVS commit: [netbsd-9] src/share/mk
Module Name:src
Committed By: martin
Date: Tue Dec 24 17:32:21 UTC 2019
Modified Files:
src/share/mk [netbsd-9]: bsd.sys.mk sys.mk
Log Message:
Pull up following revision(s) (requested by christos in ticket #575):
share/mk/bsd.sys.mk: revision 1.298
share/mk/sys.mk: revision 1.140
move MV to sys.mk because it is used there. Pointed out by joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.292.2.1 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.139 -r1.139.2.1 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.292 src/share/mk/bsd.sys.mk:1.292.2.1
--- src/share/mk/bsd.sys.mk:1.292 Wed May 22 08:31:25 2019
+++ src/share/mk/bsd.sys.mk Tue Dec 24 17:32:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.292 2019/05/22 08:31:25 kamil Exp $
+# $NetBSD: bsd.sys.mk,v 1.292.2.1 2019/12/24 17:32:20 martin Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -264,7 +264,6 @@ OBJCOPY?= objcopy
OBJDUMP?= objdump
PAXCTL?= paxctl
STRIP?= strip
-MV?= mv -f
.SUFFIXES: .o .ln .lo .c .cc .cpp .cxx .C .m ${YHEADER:D.h}
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.139 src/share/mk/sys.mk:1.139.2.1
--- src/share/mk/sys.mk:1.139 Sun Apr 7 19:32:24 2019
+++ src/share/mk/sys.mk Tue Dec 24 17:32:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.139 2019/04/07 19:32:24 christos Exp $
+# $NetBSD: sys.mk,v 1.139.2.1 2019/12/24 17:32:20 martin Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
#
# This file contains the basic rules for make(1) and is read first
@@ -14,6 +14,7 @@ unix?= We run NetBSD.
AR?= ar
ARFLAGS?= rl
RANLIB?= ranlib
+MV?= mv -f
AS?= as
AFLAGS?=
CVS commit: [netbsd-9] src/share/mk
Module Name:src
Committed By: martin
Date: Sun Dec 8 14:36:21 UTC 2019
Modified Files:
src/share/mk [netbsd-9]: bsd.kmodule.mk
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #512):
share/mk/bsd.kmodule.mk: revision 1.63
Build aarch64 modules without fp or simd instructions.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.62.2.1 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.62 src/share/mk/bsd.kmodule.mk:1.62.2.1
--- src/share/mk/bsd.kmodule.mk:1.62 Fri Jul 5 08:28:16 2019
+++ src/share/mk/bsd.kmodule.mk Sun Dec 8 14:36:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.62 2019/07/05 08:28:16 hannken Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.62.2.1 2019/12/08 14:36:21 martin Exp $
# We are not building this with PIE
MKPIE=no
@@ -42,7 +42,9 @@ CFLAGS+= -fno-strict-aliasing -Wno-point
# The real solution to this involves generating trampolines for those
# relocations inside the loader and removing this workaround, as the
# resulting code would be much faster.
-.if ${MACHINE_CPU} == "arm"
+.if ${MACHINE_CPU} == "aarch64"
+CFLAGS+= -march=armv8-a+nofp+nosimd
+.elif ${MACHINE_CPU} == "arm"
CFLAGS+= -fno-common -fno-unwind-tables
.elif ${MACHINE_CPU} == "hppa"
CFLAGS+= -mlong-calls
