summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbluhm <bluhm@openbsd.org>2019-02-12 21:31:16 +0000
committerbluhm <bluhm@openbsd.org>2019-02-12 21:31:16 +0000
commitc253489604ca737896682a2ff16bf55d1c31e740 (patch)
tree805c13975a8bdc615a4725a06f554c82ccd1443c
parentwhitespace and knf (diff)
downloadwireguard-openbsd-c253489604ca737896682a2ff16bf55d1c31e740.tar.xz
wireguard-openbsd-c253489604ca737896682a2ff16bf55d1c31e740.zip
Skip the gcc tests on aarch64, the compiler does not exist there.
-rw-r--r--regress/gnu/egcs/Makefile4
-rw-r--r--regress/gnu/egcs/gcc-bounds/Makefile15
-rw-r--r--regress/gnu/egcs/gcc-builtins/Makefile14
3 files changed, 26 insertions, 7 deletions
diff --git a/regress/gnu/egcs/Makefile b/regress/gnu/egcs/Makefile
index 2ce4ac9ebb1..1693eaa31a2 100644
--- a/regress/gnu/egcs/Makefile
+++ b/regress/gnu/egcs/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.9 2016/09/26 22:56:30 bluhm Exp $
+# $OpenBSD: Makefile,v 1.10 2019/02/12 21:31:16 bluhm Exp $
-SUBDIR+= gcc-bounds gcc-builtins
+SUBDIR= gcc-bounds gcc-builtins
install:
diff --git a/regress/gnu/egcs/gcc-bounds/Makefile b/regress/gnu/egcs/gcc-bounds/Makefile
index 9075da9ecc2..f5284f49f38 100644
--- a/regress/gnu/egcs/gcc-bounds/Makefile
+++ b/regress/gnu/egcs/gcc-bounds/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2016/09/25 21:35:12 bluhm Exp $
+# $OpenBSD: Makefile,v 1.17 2019/02/12 21:31:16 bluhm Exp $
C_MODULES?= strlcpy strlcat getcwd memcpy fread memcpy declare \
sscanf vararray md builtins
@@ -52,9 +52,16 @@ generate:
NOOBJ= Yes
-.include <bsd.regress.mk>
-.if ${COMPILER_VERSION:L} == "gcc3"
+.include <bsd.own.mk>
+
+.if ${BUILD_GCC3:L} == "yes"
EXP= .exp.gcc3
-.else
+.elif ${BUILD_GCC4:L} == "yes"
EXP= .exp.gcc4
+.else
+regress:
+ @echo neither gcc3 nor gcc4 exists on ${MACHINE_ARCH}
+ @echo SKIPPED
.endif
+
+.include <bsd.regress.mk>
diff --git a/regress/gnu/egcs/gcc-builtins/Makefile b/regress/gnu/egcs/gcc-builtins/Makefile
index 4d216affd8c..cd4e0c2bf09 100644
--- a/regress/gnu/egcs/gcc-builtins/Makefile
+++ b/regress/gnu/egcs/gcc-builtins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2016/09/25 21:35:12 bluhm Exp $
+# $OpenBSD: Makefile,v 1.4 2019/02/12 21:31:16 bluhm Exp $
GCC_BUILTINS= sprintf-1 sprintf-2 sprintf-3 stpcpy-1 stpcpy-2 strcat-1 \
strcat-2 strcpy-1 strcpy-2 strncat-1 vsprintf-1 vsprintf-2 \
@@ -23,4 +23,16 @@ generate:
NOOBJ= Yes
+.include <bsd.own.mk>
+
+.if ${BUILD_GCC3:L} == "yes"
+EXP= .exp.gcc3
+.elif ${BUILD_GCC4:L} == "yes"
+EXP= .exp.gcc4
+.else
+regress:
+ @echo neither gcc3 nor gcc4 exists on ${MACHINE_ARCH}
+ @echo SKIPPED
+.endif
+
.include <bsd.regress.mk>