Author: ed
Date: Sun Aug 21 15:14:06 2016
New Revision: 304557
URL: https://svnweb.freebsd.org/changeset/base/304557
Log:
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.
Added:
head/sys/compat/cloudabi/cloudabi_vdso.lds
- copied, changed from r304556,
head/sys/compat/cloudabi64/cloudabi64_vdso.lds.s
Deleted:
head/sys/compat/cloudabi64/cloudabi64_vdso.lds.s
Modified:
head/sys/conf/files.amd64
head/sys/conf/files.arm64
head/sys/modules/cloudabi64/Makefile
Copied and modified: head/sys/compat/cloudabi/cloudabi_vdso.lds (from r304556,
head/sys/compat/cloudabi64/cloudabi64_vdso.lds.s)
==============================================================================
--- head/sys/compat/cloudabi64/cloudabi64_vdso.lds.s Sun Aug 21 09:32:20
2016 (r304556, copy source)
+++ head/sys/compat/cloudabi/cloudabi_vdso.lds Sun Aug 21 15:14:06 2016
(r304557)
@@ -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$
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Sun Aug 21 09:32:20 2016 (r304556)
+++ head/sys/conf/files.amd64 Sun Aug 21 15:14:06 2016 (r304557)
@@ -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"
#
Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64 Sun Aug 21 09:32:20 2016 (r304556)
+++ head/sys/conf/files.arm64 Sun Aug 21 15:14:06 2016 (r304557)
@@ -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"
#
Modified: head/sys/modules/cloudabi64/Makefile
==============================================================================
--- head/sys/modules/cloudabi64/Makefile Sun Aug 21 09:32:20 2016
(r304556)
+++ head/sys/modules/cloudabi64/Makefile Sun Aug 21 15:14:06 2016
(r304557)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
