Paths

Table of Contentst

Differential D14180

Rename assym.s to .S to use the compiler driver
ClosedPublic
Actions

Authored by emaste on Feb 3 2018, 1:15 AM.

Tags

None

Referenced Files

	Unknown Object (File)
	Fri, Nov 22, 11:19 AM

	Unknown Object (File)
	Sat, Oct 26, 9:44 PM

	Unknown Object (File)
	Oct 21 2024, 4:25 PM

	Unknown Object (File)
	Oct 18 2024, 4:57 AM

	Unknown Object (File)
	Oct 16 2024, 5:57 PM

	Unknown Object (File)
	Oct 12 2024, 9:42 PM

	Unknown Object (File)
	Oct 4 2024, 7:57 PM

	Unknown Object (File)
	Oct 2 2024, 11:56 AM

View All 71 Files

Subscribers

Details

Reviewers

jhb
andrew
imp
bdrewery
gnn
manu

Commits

rS331254: Rename assym.s to assym.inc

Summary

By convention .s is assembled by ${AS} while .S is assembled by ${CC}. Consistently use the compiler driver across all platforms, including those that do not have an in-tree standalone assembler, like arm64.

Diff Detail

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

emaste created this revision.Feb 3 2018, 1:15 AM

remove stale assym.s and depend file
chase the rename across the tree

Herald added a subscriber: jhibbits. · View Herald TranscriptFeb 5 2018, 2:23 PM

why foo.S.orig? Seems like a mistake...

This might be sensible from a consistency perspective, but is not necessary; the underlying issue that prompted this is addressed in rS328883 from @andrew's input

In D14180#297908, @imp wrote:

why foo.S.orig? Seems like a mistake...

Oops, *.orig and LINT were added by accident; now removed.

this looks good to my eye.

A couple of caveats... Years ago I tried a cleanup of things rebuilding too much and ran into issues with assym.s being in modules not for assym.s itself, but because other things got generated as a side effect. Be wary of these and be sure to test on all architectures... I don't have notes from the time, so I can't be less vague...

This revision is now accepted and ready to land.Feb 5 2018, 5:17 PM

I wonder if we should rename it assym.inc instead, since we shouldn't be trying to assemble it with either as or Clang IAS.

bdrewery accepted this revision.Feb 28 2018, 6:21 PM

Use .inc extension instead

This revision now requires review to proceed.Mar 16 2018, 1:36 PM

emaste added inline comments.Mar 16 2018, 1:39 PM

sys/modules/hyperv/vmbus/Makefile
26	Accidentally left behind by a rebase, will be removed.

this looks good to my eye.

This revision is now accepted and ready to land.Mar 16 2018, 8:42 PM

Closed by commit rS331254: Rename assym.s to assym.inc (authored by emaste). · Explain WhyJul 28 2018, 3:27 AM

This revision was automatically updated to reflect the committed changes.

Herald added a reviewer: gnn. · View Herald TranscriptJul 28 2018, 3:27 AM

Herald added a reviewer: manu. · View Herald Transcript

Revision Contents
Changeset List

Path

Size

10 lines

sys/

amd64/

acpica/

acpi_wakecode.S

2 lines

amd64/

2 lines

apic_vector.S.orig

333 lines

2 lines

atpic_vector.S.orig

73 lines

2 lines

cpu_switch.S.orig

499 lines

2 lines

exception.S.orig

969 lines

genassym.c.orig

233 lines

2 lines

2618 lines

mp_machdep.c.orig

643 lines

2 lines

8146 lines

2 lines

2 lines

861 lines

sys_machdep.c.orig

748 lines

947 lines

vm_machdep.c.orig

725 lines

2 lines

ia32/

ia32_exception.S

2 lines

linux/

linux_support.s

2 lines

linux32/

linux32_support.s

2 lines

sgx/

2 lines

arm/

arm/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

hypervisor-stub.S

2 lines

2 lines

2 lines

4 lines

2 lines

2 lines

2 lines

2 lines

conf/

916 lines

arm64/

arm64/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

conf/

249 lines

cddl/

dev/

dtrace/

aarch64/

2 lines

amd64/

2 lines

arm/

2 lines

i386/

2 lines

powerpc/

2 lines

riscv/

2 lines

conf/

2 lines

2 lines

6 lines

8 lines

dev/

hyperv/

vmbus/

amd64/

2 lines

i386/

2 lines

i386/

acpica/

acpi_wakecode.S

2 lines

i386/

2 lines

apic_vector.s.orig

314 lines

2 lines

atpic_vector.s.orig

78 lines

2 lines

2 lines

exception.s.orig

514 lines

2 lines

2 lines

5684 lines

2 lines

2 lines

2 lines

linux/

2 lines

linux_support.s

2 lines

mips/

cavium/

2 lines

ingenic/

jz4780_mpboot.S

2 lines

mips/

2 lines

2 lines

2 lines

2 lines

octeon_cop2_swtch.S

2 lines

2 lines

2 lines

nlm/

2 lines

modules/

dtrace/

dtrace/

6 lines

hyperv/

vmbus/

4 lines

linux/

8 lines

linux64/

6 lines

sgx/

4 lines

powerpc/

aim/

2 lines

2 lines

booke/

2 lines

powerpc/

2 lines

2 lines

2 lines

2 lines

riscv/

riscv/

2 lines

2 lines

2 lines

2 lines

2 lines

sparc64/

sparc64/

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

Diff 38885

Makefile.inc1

Loading...

sys/amd64/acpica/acpi_wakecode.S

Loading...

sys/amd64/amd64/apic_vector.S

Loading...

sys/amd64/amd64/apic_vector.S.orig

Loading...

sys/amd64/amd64/atpic_vector.S

Loading...

sys/amd64/amd64/atpic_vector.S.orig

Loading...

sys/amd64/amd64/cpu_switch.S

Loading...

sys/amd64/amd64/cpu_switch.S.orig

Loading...

sys/amd64/amd64/exception.S

Loading...

sys/amd64/amd64/exception.S.orig

Loading...

sys/amd64/amd64/genassym.c.orig

Loading...

sys/amd64/amd64/locore.S

Loading...

sys/amd64/amd64/machdep.c.orig

Loading...

sys/amd64/amd64/mp_machdep.c.orig

Loading...

sys/amd64/amd64/mpboot.S

Loading...

sys/amd64/amd64/pmap.c.orig

Loading...

sys/amd64/amd64/sigtramp.S

Loading...

sys/amd64/amd64/support.S

Loading...

sys/amd64/amd64/support.S.orig

Loading...

sys/amd64/amd64/sys_machdep.c.orig

Loading...

sys/amd64/amd64/trap.c.orig

Loading...

sys/amd64/amd64/vm_machdep.c.orig

Loading...

sys/amd64/amd64/xen-locore.S

Loading...

sys/amd64/ia32/ia32_exception.S

Loading...

sys/amd64/linux/linux_support.s

Loading...

sys/amd64/linux32/linux32_support.s

Loading...

sys/amd64/sgx/sgx_support.S

Loading...

sys/arm/arm/bcopy_page.S

Loading...

sys/arm/arm/bcopyinout.S

Loading...

sys/arm/arm/copystr.S

Loading...

sys/arm/arm/cpu_asm-v6.S

Loading...

sys/arm/arm/exception.S

Loading...

sys/arm/arm/fusu.S

Loading...

sys/arm/arm/hypervisor-stub.S

Loading...

sys/arm/arm/in_cksum_arm.S

Loading...

sys/arm/arm/locore-v4.S

Loading...

sys/arm/arm/locore-v6.S

Loading...

sys/arm/arm/support.S

Loading...

sys/arm/arm/swtch-v4.S

Loading...

sys/arm/arm/swtch-v6.S

Loading...

sys/arm/arm/swtch.S

Loading...

sys/arm/conf/LINT

Loading...

sys/arm64/arm64/bzero.S

Loading...

sys/arm64/arm64/copyinout.S

Loading...

sys/arm64/arm64/exception.S

Loading...

sys/arm64/arm64/locore.S

Loading...

sys/arm64/arm64/support.S

Loading...

sys/arm64/arm64/swtch.S

Loading...

sys/arm64/conf/GENERIC.orig

Loading...

sys/cddl/dev/dtrace/aarch64/dtrace_asm.S

Loading...

sys/cddl/dev/dtrace/amd64/dtrace_asm.S

Loading...

sys/cddl/dev/dtrace/arm/dtrace_asm.S

Loading...

sys/cddl/dev/dtrace/i386/dtrace_asm.S

Loading...

sys/cddl/dev/dtrace/powerpc/dtrace_asm.S

Loading...

sys/cddl/dev/dtrace/riscv/dtrace_asm.S

Loading...

sys/conf/files.amd64

Loading...

sys/conf/files.i386

Loading...

sys/conf/kern.post.mk

Loading...

sys/conf/kmod.mk

Loading...

sys/dev/hyperv/vmbus/amd64/vmbus_vector.S

Loading...

sys/dev/hyperv/vmbus/i386/vmbus_vector.S

Loading...

sys/i386/acpica/acpi_wakecode.S

Loading...

sys/i386/i386/apic_vector.s

Loading...

sys/i386/i386/apic_vector.s.orig

Loading...

sys/i386/i386/atpic_vector.s

Loading...

sys/i386/i386/atpic_vector.s.orig

Loading...

sys/i386/i386/bioscall.s

Loading...

sys/i386/i386/exception.s

Loading...

sys/i386/i386/exception.s.orig

Loading...

sys/i386/i386/locore.s

Loading...

sys/i386/i386/mpboot.s

Loading...

sys/i386/i386/pmap.c.orig

Loading...

sys/i386/i386/support.s

Loading...

sys/i386/i386/swtch.s

Loading...

sys/i386/i386/vm86bios.s

Loading...

sys/i386/linux/linux_locore.s

Loading...

sys/i386/linux/linux_support.s

Loading...

sys/mips/cavium/octeon_cop2.S

Loading...

sys/mips/ingenic/jz4780_mpboot.S

Loading...

sys/mips/mips/exception.S

Loading...

sys/mips/mips/fp.S

Loading...

sys/mips/mips/locore.S

Loading...

sys/mips/mips/mpboot.S

Loading...

sys/mips/mips/octeon_cop2_swtch.S

Loading...

sys/mips/mips/support.S

Loading...

sys/mips/mips/swtch.S

Loading...

sys/mips/nlm/mpreset.S

Loading...

sys/modules/dtrace/dtrace/Makefile

Loading...

sys/modules/hyperv/vmbus/Makefile

Loading...

sys/modules/linux/Makefile

Loading...

sys/modules/linux64/Makefile

Loading...

sys/modules/sgx/Makefile

Loading...

sys/powerpc/aim/locore32.S

Loading...

sys/powerpc/aim/locore64.S

Loading...

sys/powerpc/booke/locore.S

Loading...

sys/powerpc/powerpc/sigcode32.S

Loading...

sys/powerpc/powerpc/sigcode64.S

Loading...

sys/powerpc/powerpc/swtch32.S

Loading...

sys/powerpc/powerpc/swtch64.S

Loading...

sys/riscv/riscv/copyinout.S

Loading...

sys/riscv/riscv/exception.S

Loading...

sys/riscv/riscv/locore.S

Loading...

sys/riscv/riscv/support.S

Loading...

sys/riscv/riscv/swtch.S

Loading...

sys/sparc64/sparc64/exception.S

Loading...

sys/sparc64/sparc64/interrupt.S

Loading...

sys/sparc64/sparc64/locore.S

Loading...

sys/sparc64/sparc64/mp_exception.S

Loading...

sys/sparc64/sparc64/mp_locore.S

Loading...

sys/sparc64/sparc64/support.S

Loading...

sys/sparc64/sparc64/swtch.S

Loading...