OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sim: fix handling of 2nd arg to SIM_AC_OPTION_HARDWARE 

The 2nd arg to SIM_AC_OPTION_HARDWARE is described as "a space separated
list of devices that override the defaults" while the 3rd arg is "a space
separated list of extra target specific devices".  But the macro doesn't
seem to treat the 2nd arg this way.

Instead, it will always add the default list of devices, and only add the
extra target specific devices if the 2nd arg is not specified.  So rework
the logic slightly to handle the 2nd arg as documented.

This shouldn't affect any targets in the tree as no one passes in a non-
empty value as the 2nd arg.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2011-01-10 21:53:27 +00:00
parent 5f78776ab1
commit cb11d1f450
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sim/common/ChangeLog
View File

@ -1,4 +1,9 @@
2010-01-10 Mike Frysinger <vapier@gentoo.org>
2011-01-10 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4 (SIM_AC_OPTION_HARDWARE): Set $hardware to $2 when $2 is
not empty, and always append $3 to $hardware.
2011-01-10 Mike Frysinger <vapier@gentoo.org>
* hw-device.h (hw_abort, hw_vabort, hw_halt): Add noreturn attribute.
* sim-hw.h (sim_hw_abort): Likewise.

5
sim/common/aclocal.m4 vendored
View File

@ -571,10 +571,11 @@ else
sim_hw_p=no
fi
if test "[$2]"; then
hardware="core pal glue"
hardware="[$2]"
else
hardware="core pal glue [$3]"
hardware="core pal glue"
fi
hardware="$hardware [$3]"
sim_hw_cflags="-DWITH_HW=1"
sim_hw="$hardware"
sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([[^ ]][[^ ]]*\)/dv-\1.o/g'`"