summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjasper <jasper@openbsd.org>2014-07-13 21:18:44 +0000
committerjasper <jasper@openbsd.org>2014-07-13 21:18:44 +0000
commit29e0bc2c35572b850dbfcb0f1dedb19b1f40bdb2 (patch)
treebb66173a30db81521c99ded6733ca633b0a0d864 /sys
parent#$%#@$# CONSPEED (diff)
downloadwireguard-openbsd-29e0bc2c35572b850dbfcb0f1dedb19b1f40bdb2.tar.xz
wireguard-openbsd-29e0bc2c35572b850dbfcb0f1dedb19b1f40bdb2.zip
fix even more trailing tabs
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/stand/biosboot/Makefile4
-rw-r--r--sys/arch/amd64/stand/boot/Makefile4
-rw-r--r--sys/arch/amd64/stand/cdboot/Makefile6
-rw-r--r--sys/arch/amd64/stand/cdbr/Makefile4
-rw-r--r--sys/arch/amd64/stand/mbr/Makefile6
-rw-r--r--sys/arch/amd64/stand/pxeboot/Makefile4
-rw-r--r--sys/arch/armish/stand/boot/Makefile4
-rw-r--r--sys/arch/aviion/stand/boot/Makefile6
-rw-r--r--sys/arch/aviion/stand/libsa/Makefile4
-rw-r--r--sys/arch/hppa64/stand/boot/Makefile4
-rw-r--r--sys/arch/landisk/stand/xxboot/Makefile6
-rw-r--r--sys/arch/vax/stand/Makefile2
-rw-r--r--sys/arch/vax/stand/boot/Makefile4
13 files changed, 29 insertions, 29 deletions
diff --git a/sys/arch/amd64/stand/biosboot/Makefile b/sys/arch/amd64/stand/biosboot/Makefile
index 5d79292ab5a..36901b17480 100644
--- a/sys/arch/amd64/stand/biosboot/Makefile
+++ b/sys/arch/amd64/stand/biosboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2013/01/18 21:09:04 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2014/07/13 21:18:44 jasper Exp $
MAN= biosboot.8
@@ -10,7 +10,7 @@ PROG= biosboot
SRCS= biosboot.S
LD=ld
LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic -nopie
-LDFLAGS+=-melf_i386 -L/usr/libdata
+LDFLAGS+=-melf_i386 -L/usr/libdata
INSTALL_STRIP=
.depend biosboot.o: assym.h
diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile
index 2e475c61af4..761a2d0790a 100644
--- a/sys/arch/amd64/stand/boot/Makefile
+++ b/sys/arch/amd64/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2014/07/13 09:26:08 jasper Exp $
+# $OpenBSD: Makefile,v 1.29 2014/07/13 21:18:44 jasper Exp $
COPTS?=
MAN?= boot.8
@@ -19,7 +19,7 @@ SRCS= srt0.S conf.c
LD?= ld
SIZE?= size
LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie
-LDFLAGS+=-melf_i386 -L/usr/libdata
+LDFLAGS+=-melf_i386 -L/usr/libdata
.PATH: ${S}/stand/boot
SRCS+= boot.c bootarg.c cmd.c vars.c
diff --git a/sys/arch/amd64/stand/cdboot/Makefile b/sys/arch/amd64/stand/cdboot/Makefile
index b13d29664de..075931de4a8 100644
--- a/sys/arch/amd64/stand/cdboot/Makefile
+++ b/sys/arch/amd64/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2014/07/13 09:26:08 jasper Exp $
+# $OpenBSD: Makefile,v 1.25 2014/07/13 21:18:44 jasper Exp $
MAN= cdboot.8
@@ -10,8 +10,8 @@ PROG= cdboot
SRCS= srt0.S boot.c conf.c
LD?= ld
SIZE?= size
-LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie
-LDFLAGS+=-melf_i386 -L/usr/libdata
+LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie
+LDFLAGS+=-melf_i386 -L/usr/libdata
INSTALL_STRIP=
.PATH: ${SADIR}/libsa
diff --git a/sys/arch/amd64/stand/cdbr/Makefile b/sys/arch/amd64/stand/cdbr/Makefile
index da1e5eec531..c304a652804 100644
--- a/sys/arch/amd64/stand/cdbr/Makefile
+++ b/sys/arch/amd64/stand/cdbr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2013/01/17 12:25:11 jsing Exp $
+# $OpenBSD: Makefile,v 1.8 2014/07/13 21:18:44 jasper Exp $
#
S= ${.CURDIR}/../../../..
@@ -14,7 +14,7 @@ AFLAGS+=-fno-pie
LD=ld
ORG= 0x0000
LDFLAGS=-nostdlib -Ttext ${ORG} -x -N -s -Bstatic -e start -nopie
-LDFLAGS+=-melf_i386 -L/usr/libdata
+LDFLAGS+=-melf_i386 -L/usr/libdata
INSTALL_STRIP=
NOMAN=
diff --git a/sys/arch/amd64/stand/mbr/Makefile b/sys/arch/amd64/stand/mbr/Makefile
index cfc3566731d..4dba61931b4 100644
--- a/sys/arch/amd64/stand/mbr/Makefile
+++ b/sys/arch/amd64/stand/mbr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2013/01/18 21:09:04 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2014/07/13 21:18:44 jasper Exp $
#
S= ${.CURDIR}/../../../..
@@ -10,8 +10,8 @@ AFLAGS+=-m32
AFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../.. #-Wa,-a
AFLAGS+=-fno-pie
LD=ld
-LDFLAGS=-nostdlib -Ttext 0 -x -N -s -Bstatic -e start -nopie
-LDFLAGS+=-melf_i386 -L/usr/libdata
+LDFLAGS=-nostdlib -Ttext 0 -x -N -s -Bstatic -e start -nopie
+LDFLAGS+=-melf_i386 -L/usr/libdata
NOMAN=
#MAN+= mbr.8
diff --git a/sys/arch/amd64/stand/pxeboot/Makefile b/sys/arch/amd64/stand/pxeboot/Makefile
index 72b13f83eb8..e4241bd9ded 100644
--- a/sys/arch/amd64/stand/pxeboot/Makefile
+++ b/sys/arch/amd64/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2014/07/13 09:26:08 jasper Exp $
+# $OpenBSD: Makefile,v 1.21 2014/07/13 21:18:44 jasper Exp $
MAN= pxeboot.8
@@ -11,7 +11,7 @@ SRCS= srt0.S conf.c devopen.c net.c open.c
LD?= ld
SIZE?= size
LDFLAGS+=-nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -nopie
-LDFLAGS+=-melf_i386 -L/usr/libdata
+LDFLAGS+=-melf_i386 -L/usr/libdata
INSTALL_STRIP=
.PATH: ${SADIR}/libsa
diff --git a/sys/arch/armish/stand/boot/Makefile b/sys/arch/armish/stand/boot/Makefile
index e9149055cb8..3b93242bfc6 100644
--- a/sys/arch/armish/stand/boot/Makefile
+++ b/sys/arch/armish/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2014/07/13 09:26:08 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2014/07/13 21:18:44 jasper Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -18,7 +18,7 @@ CPPFLAGS+= -DCONADDR=0xfe800000UL -DCONSPEED=115200 -fno-pie
COPTS+= -ffreestanding -fno-stack-protector
-SRCS= start.S
+SRCS= start.S
SRCS+= boot.c cmd.c vars.c
SRCS+= conf.c devopen.c exec.c machdep.c dev_armish.c time.c
SRCS+= clock.c ns16550.c wd.c wdc.c pciide.c
diff --git a/sys/arch/aviion/stand/boot/Makefile b/sys/arch/aviion/stand/boot/Makefile
index 899a790aef5..8f72c0fa0e5 100644
--- a/sys/arch/aviion/stand/boot/Makefile
+++ b/sys/arch/aviion/stand/boot/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2013/10/17 16:44:22 miod Exp $
+# $OpenBSD: Makefile,v 1.6 2014/07/13 21:18:44 jasper Exp $
SIZE?= size
S= ${.CURDIR}/../../../..
-DEFS= -DSUN_BOOTPARAMS
+DEFS= -DSUN_BOOTPARAMS
#DEFS+= -DNETIF_DEBUG
INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libprom \
-I${S} -I${S}/lib/libsa
@@ -17,7 +17,7 @@ CLEANFILES+=boot boot.ELF
# Keep crt.c first in the object list for ld's sake.
SRCS= crt.c boot.c conf.c devopen.c version.c
-SRCS+= oaic.c oosiop.c scsi.c sd.c
+SRCS+= oaic.c oosiop.c scsi.c sd.c
SRCS+= dev_net.c if_le.c
OBJS= ${SRCS:S/.c/.o/g}
LIBS= ${LIBSA} ${LIBPROM} ${LIBZ}
diff --git a/sys/arch/aviion/stand/libsa/Makefile b/sys/arch/aviion/stand/libsa/Makefile
index ce8d4a6e6c5..3eb7d3d4758 100644
--- a/sys/arch/aviion/stand/libsa/Makefile
+++ b/sys/arch/aviion/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2013/10/08 21:55:21 miod Exp $
+# $OpenBSD: Makefile,v 1.5 2014/07/13 21:18:44 jasper Exp $
LIB=sa
@@ -19,7 +19,7 @@ SRCS+= alloc.c memcpy.c exit.c getfile.c gets.c globals.c loadfile.c \
lseek.c open.c nullfs.c read.c fstat.c disklabel.c \
ufs.c cread.c
SRCS+= arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c \
- rarp.c bootparam.c
+ rarp.c bootparam.c
.PATH: ${S}/lib/libkern/arch/m88k ${S}/lib/libkern
SRCS+= ashrdi3.c bzero.c __main.c
diff --git a/sys/arch/hppa64/stand/boot/Makefile b/sys/arch/hppa64/stand/boot/Makefile
index 4719760caed..a259b766fd3 100644
--- a/sys/arch/hppa64/stand/boot/Makefile
+++ b/sys/arch/hppa64/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2012/08/21 14:46:18 pascal Exp $
+# $OpenBSD: Makefile,v 1.5 2014/07/13 21:18:44 jasper Exp $
MAN= boot.8
MANSUBDIR=hppa64
@@ -11,7 +11,7 @@ PROG= boot
SRCS= srt0.S exec.c conf.c
.PATH: ${S}/stand/boot
-SRCS+= bootarg.c boot.c vars.c cmd.c
+SRCS+= bootarg.c boot.c vars.c cmd.c
.PATH: ${S}/lib/libkern/arch/hppa ${S}/lib/libkern
SRCS+= milli.S ashrdi3.c memcmp.c memcpy.c memset.c muldi3.c \
diff --git a/sys/arch/landisk/stand/xxboot/Makefile b/sys/arch/landisk/stand/xxboot/Makefile
index 2f38e6826af..b5ec85080c4 100644
--- a/sys/arch/landisk/stand/xxboot/Makefile
+++ b/sys/arch/landisk/stand/xxboot/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2012/09/02 16:21:05 deraadt Exp $
+# $OpenBSD: Makefile,v 1.7 2014/07/13 21:18:44 jasper Exp $
MAN= xxboot.8
.if ${MACHINE} == "landisk"
PROG= xxboot
-LINKS= ${BINDIR}/xxboot ${BINDIR}/sdboot
-LINKS+= ${BINDIR}/xxboot ${BINDIR}/wdboot
+LINKS= ${BINDIR}/xxboot ${BINDIR}/sdboot
+LINKS+= ${BINDIR}/xxboot ${BINDIR}/wdboot
SRCS= pbr.S xxboot.S boot1.c
LDFLAGS=-nostdlib -Ttext 0x8c201000 -N -x -Bstatic -e start -nopie
diff --git a/sys/arch/vax/stand/Makefile b/sys/arch/vax/stand/Makefile
index d3fd0817120..6ff6d5151a6 100644
--- a/sys/arch/vax/stand/Makefile
+++ b/sys/arch/vax/stand/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2000/05/25 21:55:09 deraadt Exp $
+# $OpenBSD: Makefile,v 1.13 2014/07/13 21:18:44 jasper Exp $
# $NetBSD: Makefile,v 1.21 1999/03/06 16:36:04 ragge Exp $
#
diff --git a/sys/arch/vax/stand/boot/Makefile b/sys/arch/vax/stand/boot/Makefile
index 908c930c11e..843ffbb3272 100644
--- a/sys/arch/vax/stand/boot/Makefile
+++ b/sys/arch/vax/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2013/10/15 22:49:03 deraadt Exp $
+# $OpenBSD: Makefile,v 1.13 2014/07/13 21:18:44 jasper Exp $
# $NetBSD: Makefile,v 1.27 2002/04/07 07:00:25 matt Exp $
S!= cd ${.CURDIR}/../../../../; pwd
@@ -26,7 +26,7 @@ SAREL=
LIBSA= ${SALIB}
Z_AS= library
-CFLAGS+=-I${S}/lib/libsa
+CFLAGS+=-I${S}/lib/libsa
.include "${S}/lib/libz/Makefile.inc"
LIBZ= ${ZLIB}