knazarov/rve
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make riscof test suite actually compile the test binaries

Browse source
This commit is contained in:
Konstantin Nazarov 2024-12-15 15:01:19 +00:00
parent 1b7ddce372
commit d84c5022bd
Signed by: knazarov
GPG key ID: 4CFE0A42FA409C22
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/rve/riscof_rve.py
View file

@ -62,7 +62,7 @@ class rve(pluginTemplate):
# Note the march is not hardwired here, because it will change for each # Note the march is not hardwired here, because it will change for each
# test. Similarly the output elf name and compile macros will be assigned later in the # test. Similarly the output elf name and compile macros will be assigned later in the
# runTests function # runTests function
self.compile_cmd = 'riscv{1}-unknown-elf-gcc -march={0} \ self.compile_cmd = 'riscv{1}-none-elf-gcc -march={0} \
-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles -g\ -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles -g\
-T '+self.pluginpath+'/env/link.ld\ -T '+self.pluginpath+'/env/link.ld\
-I '+self.pluginpath+'/env/\ -I '+self.pluginpath+'/env/\

8
test/sail_cSim/riscof_sail_cSim.py
View file

@ -41,8 +41,8 @@ class sail_cSim(pluginTemplate):
def initialise(self, suite, work_dir, archtest_env): def initialise(self, suite, work_dir, archtest_env):
self.suite = suite self.suite = suite
self.work_dir = work_dir self.work_dir = work_dir
self.objdump_cmd = 'riscv{1}-unknown-elf-objdump -D {0} > {2};' self.objdump_cmd = 'riscv{1}-none-elf-objdump -D {0} > {2};'
self.compile_cmd = 'riscv{1}-unknown-elf-gcc -march={0} \ self.compile_cmd = 'riscv{1}-none-elf-gcc -march={0} \
-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles\ -static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles\
-T '+self.pluginpath+'/env/link.ld\ -T '+self.pluginpath+'/env/link.ld\
-I '+self.pluginpath+'/env/\ -I '+self.pluginpath+'/env/\
@ -63,11 +63,11 @@ class sail_cSim(pluginTemplate):
self.isa += 'f' self.isa += 'f'
if "D" in ispec["ISA"]: if "D" in ispec["ISA"]:
self.isa += 'd' self.isa += 'd'
objdump = "riscv{0}-unknown-elf-objdump".format(self.xlen) objdump = "riscv{0}-none-elf-objdump".format(self.xlen)
if shutil.which(objdump) is None: if shutil.which(objdump) is None:
logger.error(objdump+": executable not found. Please check environment setup.") logger.error(objdump+": executable not found. Please check environment setup.")
raise SystemExit(1) raise SystemExit(1)
compiler = "riscv{0}-unknown-elf-gcc".format(self.xlen) compiler = "riscv{0}-none-elf-gcc".format(self.xlen)
if shutil.which(compiler) is None: if shutil.which(compiler) is None:
logger.error(compiler+": executable not found. Please check environment setup.") logger.error(compiler+": executable not found. Please check environment setup.")
raise SystemExit(1) raise SystemExit(1)