aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2019-07-30 17:18:31 +0000
committerEd Maste <emaste@FreeBSD.org>2019-07-30 17:18:31 +0000
commit305b9efefc266b5b502b6d6d660174fa3e9c788e (patch)
tree3149bdbefdfce4962927649d85fe67aa652fa88f /sys
parent49c3e8c8d147e0f23a41e3d7f8a6a8c1dba0c29d (diff)
downloadsrc-305b9efefc266b5b502b6d6d660174fa3e9c788e.tar.gz
src-305b9efefc266b5b502b6d6d660174fa3e9c788e.zip
linuxulator: rename linux_locore.s to .asm
It is assembled using "${CC} -x assembler-with-cpp", which by convention (bsd.suffixes.mk) uses the .asm extension. This is a portion of the review referenced below (D18344). That review also renamed linux_support.s to .S, but that is a functional change (using the compiler's integrated assembler instead of as) and will be revisited separately. MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D18344
Notes
Notes: svn path=/head/; revision=350451
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/linux/linux_locore.asm (renamed from sys/amd64/linux/linux_locore.s)0
-rw-r--r--sys/amd64/linux32/linux32_locore.asm (renamed from sys/amd64/linux32/linux32_locore.s)0
-rw-r--r--sys/arm64/linux/linux_locore.asm (renamed from sys/arm64/linux/linux_locore.s)0
-rw-r--r--sys/conf/files.amd642
-rw-r--r--sys/conf/files.i3862
-rw-r--r--sys/i386/linux/linux_locore.asm (renamed from sys/i386/linux/linux_locore.s)0
-rw-r--r--sys/modules/linux64/Makefile2
7 files changed, 3 insertions, 3 deletions
diff --git a/sys/amd64/linux/linux_locore.s b/sys/amd64/linux/linux_locore.asm
index 1bcf05bc57dd..1bcf05bc57dd 100644
--- a/sys/amd64/linux/linux_locore.s
+++ b/sys/amd64/linux/linux_locore.asm
diff --git a/sys/amd64/linux32/linux32_locore.s b/sys/amd64/linux32/linux32_locore.asm
index 5862f0a0d674..5862f0a0d674 100644
--- a/sys/amd64/linux32/linux32_locore.s
+++ b/sys/amd64/linux32/linux32_locore.asm
diff --git a/sys/arm64/linux/linux_locore.s b/sys/arm64/linux/linux_locore.asm
index 952131d25d81..952131d25d81 100644
--- a/sys/arm64/linux/linux_locore.s
+++ b/sys/arm64/linux/linux_locore.asm
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 03617dc3669b..05329034e3c2 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -45,7 +45,7 @@ linux32_assym.h optional compat_linux32 \
clean "linux32_assym.h"
#
linux32_locore.o optional compat_linux32 \
- dependency "linux32_assym.h $S/amd64/linux32/linux32_locore.s" \
+ dependency "linux32_assym.h $S/amd64/linux32/linux32_locore.asm" \
compile-with "${CC} -x assembler-with-cpp -DLOCORE -m32 -shared -s -pipe -I. -I$S -Werror -Wall -fPIC -fno-common -nostdinc -nostdlib -Wl,-T$S/amd64/linux32/linux32_vdso.lds.s -Wl,-soname=linux32_vdso.so,--eh-frame-hdr,-warn-common ${.IMPSRC} -o ${.TARGET}" \
no-obj no-implicit-rule \
clean "linux32_locore.o"
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 89de0c71e6c4..73c1f88a6918 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -32,7 +32,7 @@ linux_assym.h optional compat_linux \
clean "linux_assym.h"
#
linux_locore.o optional compat_linux \
- dependency "linux_assym.h $S/i386/linux/linux_locore.s" \
+ dependency "linux_assym.h $S/i386/linux/linux_locore.asm" \
compile-with "${CC} -x assembler-with-cpp -DLOCORE -shared -s -pipe -I. -I$S -Werror -Wall -fPIC -fno-common -nostdinc -nostdlib -Wl,-T$S/i386/linux/linux_vdso.lds.s -Wl,-soname=linux_vdso.so,--eh-frame-hdr,-warn-common ${.IMPSRC} -o ${.TARGET}" \
no-obj no-implicit-rule \
clean "linux_locore.o"
diff --git a/sys/i386/linux/linux_locore.s b/sys/i386/linux/linux_locore.asm
index 8c2499af872e..8c2499af872e 100644
--- a/sys/i386/linux/linux_locore.s
+++ b/sys/i386/linux/linux_locore.asm
diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile
index 1f6250dcd2e6..1f5707e32626 100644
--- a/sys/modules/linux64/Makefile
+++ b/sys/modules/linux64/Makefile
@@ -29,7 +29,7 @@ OBJS= ${VDSO}.so
linux_assym.h: linux_genassym.o
sh ${SYSDIR}/kern/genassym.sh linux_genassym.o > ${.TARGET}
-linux_locore.o: linux_locore.s linux_assym.h
+linux_locore.o: linux_locore.asm linux_assym.h
${CC} -x assembler-with-cpp -DLOCORE -shared -mcmodel=small \
-pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -fPIC -nostdinc \
-Wl,-T${SRCTOP}/sys/${MACHINE}/linux/${VDSO}.lds.s \