Page MenuHomeFreeBSD

Retire the GENERICSF kernel config.
ClosedPublic

Authored by jhb on Apr 22 2020, 9:13 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, May 28, 3:47 PM
Unknown Object (File)
Mon, May 27, 2:20 AM
Unknown Object (File)
Wed, May 22, 3:16 PM
Unknown Object (File)
Wed, May 22, 3:11 PM
Unknown Object (File)
Wed, May 22, 4:59 AM
Unknown Object (File)
Wed, May 22, 2:27 AM
Unknown Object (File)
Tue, May 21, 9:39 AM
Unknown Object (File)
May 8 2024, 6:13 PM
Subscribers

Details

Summary

Now that hw.machine_arch handles soft-float vs hard-float there is no
longer a reason for this config.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

jhb added inline comments.
sys/conf/Makefile.riscv
22 ↗(On Diff #70899)

This means you can 'make tinderbox' on stable/12 again as well (right now it terminates early with an error since the host config is too old when it tries to run 'config -m' on each candidate kernel config)

imp added inline comments.
sys/conf/Makefile.riscv
22 ↗(On Diff #70899)

I should MFC the config changes to there then, but don't take that as any reason to not revert the version bump...

This revision is now accepted and ready to land.Apr 22 2020, 9:58 PM

The following excerpt from kern.mk should also be cleaned up as part of this commit:

.if ${MACHINE_ARCH:Mriscv*sf}
CFLAGS+=        -march=rv64imac
.else
CFLAGS+=        -march=rv64imafdc
.endif

Otherwise, I think compilation will fail when TARGET_ARCH=riscv64sf and the FPE option is enabled.

The following excerpt from kern.mk should also be cleaned up as part of this commit:

.if ${MACHINE_ARCH:Mriscv*sf}
CFLAGS+=        -march=rv64imac
.else
CFLAGS+=        -march=rv64imafdc
.endif

Otherwise, I think compilation will fail when TARGET_ARCH=riscv64sf and the FPE option is enabled.

FWIW, I think the right answer is that kernels should always be riscv64 and only the userland ABI varies (so riscv64sf is really a userland-only ABI if that makes sense), but yes, we can probably remove that bit as well.

  • Drop riscv64sf special case from kern.mk.
This revision now requires review to proceed.Apr 24 2020, 10:13 PM

Ping (especially @kp since you added this)

This revision is now accepted and ready to land.Apr 27 2020, 6:20 PM
This revision was automatically updated to reflect the committed changes.