summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortodd <todd@openbsd.org>2002-11-13 22:08:39 +0000
committertodd <todd@openbsd.org>2002-11-13 22:08:39 +0000
commit0c5cc4d1e3266d2d1a4acfc693b00234084934d3 (patch)
tree4549a956e03d501eb16fed0546b0ebc7f15f5d7f
parentmore testing. (diff)
downloadwireguard-openbsd-0c5cc4d1e3266d2d1a4acfc693b00234084934d3.tar.xz
wireguard-openbsd-0c5cc4d1e3266d2d1a4acfc693b00234084934d3.zip
put common CFLAGS+= in Makefile.inc
use single defs.h header test for a non-zero value ok fgsch@
-rw-r--r--regress/libexec/ld.so/weak/Makefile.inc3
-rw-r--r--regress/libexec/ld.so/weak/libstrong/Makefile3
-rw-r--r--regress/libexec/ld.so/weak/libweak/Makefile3
-rw-r--r--regress/libexec/ld.so/weak/prog/defs.h4
-rw-r--r--regress/libexec/ld.so/weak/prog2/defs.h10
5 files changed, 7 insertions, 16 deletions
diff --git a/regress/libexec/ld.so/weak/Makefile.inc b/regress/libexec/ld.so/weak/Makefile.inc
new file mode 100644
index 00000000000..db244aa88b2
--- /dev/null
+++ b/regress/libexec/ld.so/weak/Makefile.inc
@@ -0,0 +1,3 @@
+# $OpenBSD: Makefile.inc,v 1.1 2002/11/13 22:08:39 todd Exp $
+
+CFLAGS += -I${.CURDIR}/../prog -Wall -Werror
diff --git a/regress/libexec/ld.so/weak/libstrong/Makefile b/regress/libexec/ld.so/weak/libstrong/Makefile
index 5892830a396..ea6b9e6e43d 100644
--- a/regress/libexec/ld.so/weak/libstrong/Makefile
+++ b/regress/libexec/ld.so/weak/libstrong/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2002/02/10 22:51:41 fgsch Exp $
+# $OpenBSD: Makefile,v 1.2 2002/11/13 22:08:39 todd Exp $
LIB= strong
SRCS= strong.c
-CFLAGS+= -I${.CURDIR}/../prog
regress: all
diff --git a/regress/libexec/ld.so/weak/libweak/Makefile b/regress/libexec/ld.so/weak/libweak/Makefile
index e5a7e9e7556..200a83f25e7 100644
--- a/regress/libexec/ld.so/weak/libweak/Makefile
+++ b/regress/libexec/ld.so/weak/libweak/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.2 2002/02/14 04:56:22 fgsch Exp $
+# $OpenBSD: Makefile,v 1.3 2002/11/13 22:08:39 todd Exp $
LIB= weak
SRCS= weak.c
-CFLAGS+= -Wall -Werror -I${.CURDIR}/../prog
regress: all
diff --git a/regress/libexec/ld.so/weak/prog/defs.h b/regress/libexec/ld.so/weak/prog/defs.h
index d0a7da175c3..05df357e4fa 100644
--- a/regress/libexec/ld.so/weak/prog/defs.h
+++ b/regress/libexec/ld.so/weak/prog/defs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: defs.h,v 1.1.1.1 2002/02/10 22:51:41 fgsch Exp $ */
+/* $OpenBSD: defs.h,v 1.2 2002/11/13 22:08:39 todd Exp $ */
/*
* Public domain. 2002, Federico Schwindt <fgsch@openbsd.org>.
*/
-#define WEAK_REF 0
+#define WEAK_REF 3
#define STRONG_REF 1
int weak_func(void);
diff --git a/regress/libexec/ld.so/weak/prog2/defs.h b/regress/libexec/ld.so/weak/prog2/defs.h
deleted file mode 100644
index 249ad51ddf2..00000000000
--- a/regress/libexec/ld.so/weak/prog2/defs.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $OpenBSD: defs.h,v 1.1 2002/11/13 21:52:11 fgsch Exp $ */
-
-/*
- * Public domain. 2002, Federico Schwindt <fgsch@openbsd.org>.
- */
-
-#define WEAK_REF 0
-
-int weak_func(void);
-int func(void);