diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2016-08-21 15:14:06 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2016-08-21 15:14:06 +0000 |
| commit | 4fbc90654cc14b60d67edc24bf962fe9f5dc6427 (patch) | |
| tree | aafbb51679ba4392d0b8438735fa3df070cb7efc /sys/conf | |
| parent | a953f555e176ef3d45f565b7afefe3ffc3b7c46b (diff) | |
| download | src-4fbc90654cc14b60d67edc24bf962fe9f5dc6427.tar.gz src-4fbc90654cc14b60d67edc24bf962fe9f5dc6427.zip | |
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.
Notes
Notes:
svn path=/head/; revision=304557
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.amd64 | 2 | ||||
| -rw-r--r-- | sys/conf/files.arm64 | 2 |
2 files changed, 2 insertions, 2 deletions
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" # |