From 4fbc90654cc14b60d67edc24bf962fe9f5dc6427 Mon Sep 17 00:00:00 2001
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 21 Aug 2016 15:14:06 +0000
Subject: [PATCH] Move the linker script from cloudabi64/ to cloudabi/.

It turns out that it works perfectly fine for generating 32-bits vDSOs
as well. While there, get rid of the extraneous .s file extension.
---
 .../cloudabi64_vdso.lds.s => cloudabi/cloudabi_vdso.lds}        | 2 +-
 sys/conf/files.amd64                                            | 2 +-
 sys/conf/files.arm64                                            | 2 +-
 sys/modules/cloudabi64/Makefile                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename sys/compat/{cloudabi64/cloudabi64_vdso.lds.s => cloudabi/cloudabi_vdso.lds} (95%)

diff --git a/sys/compat/cloudabi64/cloudabi64_vdso.lds.s b/sys/compat/cloudabi/cloudabi_vdso.lds
similarity index 95%
rename from sys/compat/cloudabi64/cloudabi64_vdso.lds.s
rename to sys/compat/cloudabi/cloudabi_vdso.lds
index 29c94d3cdde8..807c48859bf2 100644
--- a/sys/compat/cloudabi64/cloudabi64_vdso.lds.s
+++ b/sys/compat/cloudabi/cloudabi_vdso.lds
@@ -1,5 +1,5 @@
 /*
- * Linker script for 64-bit vDSO for CloudABI.
+ * Linker script for the vDSO for CloudABI.
  * Based on sys/amd64/linux/linux_vdso.lds.s
  *
  * $FreeBSD$
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 7adceccdb64f..f32ebf62d9b0 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -10,7 +10,7 @@
 #
 cloudabi64_vdso.o		optional	compat_cloudabi64	\
 	dependency	"$S/contrib/cloudabi/cloudabi_vdso_x86_64.S"	\
-	compile-with	"${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi64/cloudabi64_vdso.lds.s $S/contrib/cloudabi/cloudabi_vdso_x86_64.S -o ${.TARGET}" \
+	compile-with	"${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi/cloudabi_vdso.lds $S/contrib/cloudabi/cloudabi_vdso_x86_64.S -o ${.TARGET}" \
 	no-obj no-implicit-rule						\
 	clean		"cloudabi64_vdso.o"
 #
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 631dab2cb1f2..9b7b724507fa 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -1,7 +1,7 @@
 # $FreeBSD$
 cloudabi64_vdso.o		optional	compat_cloudabi64	\
 	dependency	"$S/contrib/cloudabi/cloudabi_vdso_aarch64.S"	\
-	compile-with	"${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi64/cloudabi64_vdso.lds.s $S/contrib/cloudabi/cloudabi_vdso_aarch64.S -o ${.TARGET}" \
+	compile-with	"${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi/cloudabi_vdso.lds $S/contrib/cloudabi/cloudabi_vdso_aarch64.S -o ${.TARGET}" \
 	no-obj no-implicit-rule						\
 	clean		"cloudabi64_vdso.o"
 #
diff --git a/sys/modules/cloudabi64/Makefile b/sys/modules/cloudabi64/Makefile
index a82e836799ab..e63c7077a219 100644
--- a/sys/modules/cloudabi64/Makefile
+++ b/sys/modules/cloudabi64/Makefile
@@ -25,7 +25,7 @@ BINARY_ARCHITECTURE=i386
 
 cloudabi64_vdso.o: ${VDSO_SRCS}
 	${CC} -x assembler-with-cpp -shared -nostdinc -nostdlib \
-	    -Wl,-T${SYSDIR}/compat/cloudabi64/cloudabi64_vdso.lds.s \
+	    -Wl,-T${SYSDIR}/compat/cloudabi/cloudabi_vdso.lds \
 	    ${VDSO_SRCS} -o ${.TARGET}
 
 cloudabi64_vdso_blob.o: cloudabi64_vdso.o