Skip to content

Commit

Permalink
morello: Remove deprecated flags from build config.
Browse files Browse the repository at this point in the history
The kernel build on Morello still uses some options that pre-date
support for EFLAGS in Morello lld.
  • Loading branch information
qwattash committed May 3, 2024
1 parent 51a2a4b commit de99e83
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 18 deletions.
5 changes: 1 addition & 4 deletions sys/conf/kern.mk
Original file line number Diff line number Diff line change
Expand Up @@ -352,10 +352,7 @@ CCLDFLAGS+= -fuse-ld=${LD:[1]:S/^ld.//1W}

# Set target-specific linker emulation name.
LD_EMULATION_aarch64=aarch64elf
# XXX-AM: This is a workaround for not having full eflag support in morello lld.
# should be removed as soon as the linker can link in capability mode based on
# input files eflags instead.
LD_EMULATION_aarch64c=aarch64elf_cheri
LD_EMULATION_aarch64c=aarch64elf
LD_EMULATION_amd64=elf_x86_64_fbsd
LD_EMULATION_arm=armelf_fbsd
LD_EMULATION_armv6=armelf_fbsd
Expand Down
7 changes: 0 additions & 7 deletions sys/conf/kern.pre.mk
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,6 @@ CFLAGS+= ${GCOV_CFLAGS}
# the others.
CFLAGS+= ${CONF_CFLAGS}

# XXX-AM: This is a workaround for not having full eflag support in morello lld.
# should be removed as soon as the linker can link in capability mode based on
# input files eflags instead.
.if ${MACHINE_ARCH:Maarch64*c*}
LDFLAGS+= --morello-c64-plt
.endif

.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id}
LDFLAGS+= --build-id=sha1
.endif
Expand Down
7 changes: 0 additions & 7 deletions sys/conf/kmod.mk
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,6 @@ CFLAGS+= -fPIC
LDFLAGS+= --no-relax
.endif

# XXX-AM: This is a workaround for not having full eflag support in morello lld.
# should be removed as soon as the linker can link in capability mode based on
# input files eflags instead.
.if ${MACHINE_ARCH:Maarch64*c*}
LDFLAGS+= --morello-c64-plt
.endif

# Temporary workaround for PR 196407, which contains the fascinating details.
# Don't allow clang to use fpu instructions or registers in kernel modules.
.if ${MACHINE_CPUARCH} == arm
Expand Down

0 comments on commit de99e83

Please sign in to comment.