sim: move sim-inline to the common code

This will allow us to build the common code with the same inline
settings as the arch subdirs, and only do the test once.
This commit is contained in:
Mike Frysinger 2021-06-15 22:45:07 -04:00
parent 406b4ada55
commit d73f39ee43
108 changed files with 230 additions and 1207 deletions

View file

@ -1,3 +1,8 @@
2021-06-20 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
* configure: Regenerate.
2021-06-19 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.

View file

@ -101,5 +101,4 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
m4_include([../../config/override.m4])
m4_include([../m4/sim_ac_common.m4])
m4_include([../m4/sim_ac_option_hardware.m4])
m4_include([../m4/sim_ac_option_inline.m4])
m4_include([../m4/sim_ac_output.m4])

View file

@ -631,7 +631,6 @@ PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
SHELL
sim_inline
sim_hw
sim_hw_objs
sim_hw_cflags'
@ -639,7 +638,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
enable_sim_inline
enable_sim_hardware
'
ac_precious_vars='build_alias
@ -1255,8 +1253,6 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
--enable-sim-inline=inlines
Specify which functions should be inlined
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@ -1718,37 +1714,6 @@ fi
sim_inline="-DDEFAULT_INLINE=0"
# Check whether --enable-sim-inline was given.
if test "${enable_sim_inline+set}" = set; then :
enableval=$enable_sim_inline; sim_inline=""
case "$enableval" in
no) sim_inline="-DDEFAULT_INLINE=0";;
0) sim_inline="-DDEFAULT_INLINE=0";;
yes | 2) sim_inline="-DDEFAULT_INLINE=ALL_C_INLINE";;
1) sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS";;
*) for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
new_flag=""
case "$x" in
*_INLINE=*) new_flag="-D$x";;
*=*) new_flag=`echo "$x" | sed -e "s/=/_INLINE=/" -e "s/^/-D/"`;;
*_INLINE) new_flag="-D$x=ALL_C_INLINE";;
*) new_flag="-D$x""_INLINE=ALL_C_INLINE";;
esac
if test x"$sim_inline" = x""; then
sim_inline="$new_flag"
else
sim_inline="$sim_inline $new_flag"
fi
done;;
esac
if test x"$silent" != x"yes" && test x"$sim_inline" != x""; then
echo "Setting inline flags = $sim_inline" 6>&1
fi
fi
hardware="cfi core pal glue "
sim_hw_cflags="-DWITH_HW=1"