15 files changed, 1 insertions, 27 deletions
diff --git a/tools/regression/tls/Makefile b/tools/regression/tls/Makefile
index 76def9685e75..063e3dec7d8d 100644
--- a/tools/regression/tls/Makefile
+++ b/tools/regression/tls/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 SUBDIR=libxx libyy ttls1 ttls2 ttls4
 
 .if ${MACHINE_ARCH} == "i386"
diff --git a/tools/regression/tls/libxx/Makefile b/tools/regression/tls/libxx/Makefile
index cf4e68069f23..18195384ad9c 100644
--- a/tools/regression/tls/libxx/Makefile
+++ b/tools/regression/tls/libxx/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 SHLIB_NAME=	libxx.so
 
 SRCS=	xx.c
diff --git a/tools/regression/tls/libxx/xx.c b/tools/regression/tls/libxx/xx.c
index 6d1e73f79a05..bc81531e2ce0 100644
--- a/tools/regression/tls/libxx/xx.c
+++ b/tools/regression/tls/libxx/xx.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 extern int __thread yy1;
 int __thread xx1 = 1;
diff --git a/tools/regression/tls/libyy/Makefile b/tools/regression/tls/libyy/Makefile
index b7a7198cb319..05ecfc735c62 100644
--- a/tools/regression/tls/libyy/Makefile
+++ b/tools/regression/tls/libyy/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 SHLIB_NAME=	libyy.so
 
 SRCS=	yy.c
diff --git a/tools/regression/tls/libyy/yy.c b/tools/regression/tls/libyy/yy.c
index c00cb8770ec4..e7265829b93a 100644
--- a/tools/regression/tls/libyy/yy.c
+++ b/tools/regression/tls/libyy/yy.c
@@ -1,3 +1,2 @@
-/* $FreeBSD$ */
 
 int __thread yy1 = 101;
diff --git a/tools/regression/tls/ttls1/Makefile b/tools/regression/tls/ttls1/Makefile
index a4535e0213d1..8560de58cc9a 100644
--- a/tools/regression/tls/ttls1/Makefile
+++ b/tools/regression/tls/ttls1/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PROG=	ttls1
 LDFLAGS+= -L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx
 LDFLAGS+= -L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy
diff --git a/tools/regression/tls/ttls1/ttls1.c b/tools/regression/tls/ttls1/ttls1.c
index 9c514aeecf7a..24e4b1636e7d 100644
--- a/tools/regression/tls/ttls1/ttls1.c
+++ b/tools/regression/tls/ttls1/ttls1.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #include <stdio.h>
 
diff --git a/tools/regression/tls/ttls2/Makefile b/tools/regression/tls/ttls2/Makefile
index cbebbe769e2f..782808823efe 100644
--- a/tools/regression/tls/ttls2/Makefile
+++ b/tools/regression/tls/ttls2/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PROG=	ttls2
 LIBADD= pthread
 MAN=
diff --git a/tools/regression/tls/ttls2/ttls2.c b/tools/regression/tls/ttls2/ttls2.c
index 15eb640e3e3c..6fe316e15128 100644
--- a/tools/regression/tls/ttls2/ttls2.c
+++ b/tools/regression/tls/ttls2/ttls2.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 
 #include <pthread.h>
 #include <stdio.h>
diff --git a/tools/regression/tls/ttls3/Makefile b/tools/regression/tls/ttls3/Makefile
index b171181e74fb..03413ea8e1d6 100644
--- a/tools/regression/tls/ttls3/Makefile
+++ b/tools/regression/tls/ttls3/Makefile
@@ -1,8 +1,6 @@
-# $FreeBSD$
-
 all: ttls3
 
-LDFLAGS=-shared -Bsymbolic --allow-shlib-undefined
+LDFLAGS+=-shared -Bsymbolic --allow-shlib-undefined
 CFLAGS+= -lpthread
 CFLAGS+= -Wl,--rpath=${.OBJDIR}
 
diff --git a/tools/regression/tls/ttls3/elftls.S b/tools/regression/tls/ttls3/elftls.S
index 0fad08d90a7c..b13d286c264c 100644
--- a/tools/regression/tls/ttls3/elftls.S
+++ b/tools/regression/tls/ttls3/elftls.S
@@ -22,8 +22,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$FreeBSD$
  */
 
 .file "elftls.S"
diff --git a/tools/regression/tls/ttls3/tls-test-lib.c b/tools/regression/tls/ttls3/tls-test-lib.c
index bc88ad1383dd..ebdd27c83302 100644
--- a/tools/regression/tls/ttls3/tls-test-lib.c
+++ b/tools/regression/tls/ttls3/tls-test-lib.c
@@ -22,8 +22,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/tools/regression/tls/ttls3/tls-test.c b/tools/regression/tls/ttls3/tls-test.c
index 539b6ce1ed11..0f2c3fdb79f3 100644
--- a/tools/regression/tls/ttls3/tls-test.c
+++ b/tools/regression/tls/ttls3/tls-test.c
@@ -22,8 +22,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/tools/regression/tls/ttls4/Makefile b/tools/regression/tls/ttls4/Makefile
index ab6ca6fe753c..b87343ecdd00 100644
--- a/tools/regression/tls/ttls4/Makefile
+++ b/tools/regression/tls/ttls4/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PROG=	ttls4
 LIBADD=	pthread
 MAN=
diff --git a/tools/regression/tls/ttls4/ttls4.c b/tools/regression/tls/ttls4/ttls4.c
index 914b220f5e7e..60cd91d4542a 100644
--- a/tools/regression/tls/ttls4/ttls4.c
+++ b/tools/regression/tls/ttls4/ttls4.c
@@ -3,8 +3,6 @@
  * is clean.
  *
  * David Xu <davidxu@freebsd.org>
- *
- * $FreeBSD$
  */
 
 #include <stdio.h>