On 14/7/18 2:30 PM, Chung-Lin Tang wrote: > For the default multilib settings, it looks like you just intended to > use -mcustom-fpu-cfg=60-2. I suggest you modify t-rtems to do that > instead of enumerating the individual FPU insn options. > > Other than that, the patch looks okay. > > Chung-Lin
BTW, I assume you have done the appropriate testing for a nios2-rtems toolchain? Thanks, Chung-Lin > On 2014/6/26 07:43 PM, Sebastian Huber wrote: >> diff --git a/gcc/config/nios2/t-rtems b/gcc/config/nios2/t-rtems >> new file mode 100644 >> index 0000000..f95fa3c >> --- /dev/null >> +++ b/gcc/config/nios2/t-rtems >> @@ -0,0 +1,133 @@ >> +# Custom RTEMS multilibs >> + >> +MULTILIB_OPTIONS = mhw-mul mhw-mulx mhw-div mcustom-fadds=253 >> mcustom-fdivs=255 mcustom-fmuls=252 mcustom-fsubs=254 >> + >> +# Enumeration of multilibs >> + >> +# MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mhw-div/mcustom-fadds=253 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mhw-div/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mhw-div/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mhw-div/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mhw-div/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mhw-div/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mhw-div/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mhw-div/mcustom-fsubs=254 >> +# MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mhw-div >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mcustom-fadds=253/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mcustom-fadds=253/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mcustom-fadds=253/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mcustom-fadds=253/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mcustom-fadds=253 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-mulx/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-mulx >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-div/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-div/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-div/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-div/mcustom-fadds=253/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-div/mcustom-fadds=253/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-div/mcustom-fadds=253/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-div/mcustom-fadds=253/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-div/mcustom-fadds=253 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mhw-div/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-div/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-div/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-div/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-div/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-div/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-div/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mhw-div >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mcustom-fadds=253/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mcustom-fadds=253/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mcustom-fadds=253/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mul/mcustom-fadds=253/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mcustom-fadds=253 >> +MULTILIB_EXCEPTIONS += >> mhw-mul/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mul/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += mhw-mul/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mul/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mul/mcustom-fsubs=254 >> +# MULTILIB_EXCEPTIONS += mhw-mul >> +MULTILIB_EXCEPTIONS += >> mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += >> mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += >> mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += >> mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mhw-div/mcustom-fadds=253/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mhw-div/mcustom-fadds=253 >> +MULTILIB_EXCEPTIONS += >> mhw-mulx/mhw-div/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mhw-div/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mhw-div/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mhw-div/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mhw-div/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mhw-div/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mhw-div/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mhw-div >> +MULTILIB_EXCEPTIONS += >> mhw-mulx/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += >> mhw-mulx/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += >> mhw-mulx/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mcustom-fadds=253/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += >> mhw-mulx/mcustom-fadds=253/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mcustom-fadds=253/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mcustom-fadds=253/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mcustom-fadds=253 >> +MULTILIB_EXCEPTIONS += >> mhw-mulx/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-mulx/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-mulx >> +MULTILIB_EXCEPTIONS += >> mhw-div/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += >> mhw-div/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += >> mhw-div/mcustom-fadds=253/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-div/mcustom-fadds=253/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += >> mhw-div/mcustom-fadds=253/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-div/mcustom-fadds=253/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-div/mcustom-fadds=253/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-div/mcustom-fadds=253 >> +MULTILIB_EXCEPTIONS += >> mhw-div/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-div/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-div/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-div/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += mhw-div/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-div/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mhw-div/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mhw-div >> +MULTILIB_EXCEPTIONS += >> mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mcustom-fadds=253/mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mcustom-fadds=253/mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mcustom-fadds=253/mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += mcustom-fadds=253/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mcustom-fadds=253/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mcustom-fadds=253/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mcustom-fadds=253 >> +MULTILIB_EXCEPTIONS += mcustom-fdivs=255/mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mcustom-fdivs=255/mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mcustom-fdivs=255/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mcustom-fdivs=255 >> +MULTILIB_EXCEPTIONS += mcustom-fmuls=252/mcustom-fsubs=254 >> +MULTILIB_EXCEPTIONS += mcustom-fmuls=252 >> +MULTILIB_EXCEPTIONS += mcustom-fsubs=254 >
