diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 9738895298..4ecc04b345 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,7 @@ +2008-11-12 Joel Sherrill + + * aclocal.m4: Fix underquoting of function names. + 2008-10-21 Julian Brown * Make-common.in (run$(EXEEXT)): Add LDFLAGS. diff --git a/sim/common/aclocal.m4 b/sim/common/aclocal.m4 index d916e6203c..e8fd1477ff 100644 --- a/sim/common/aclocal.m4 +++ b/sim/common/aclocal.m4 @@ -18,7 +18,7 @@ # # SIM_AC_OUTPUT -AC_DEFUN(SIM_AC_COMMON, +AC_DEFUN([SIM_AC_COMMON], [ # autoconf.info says this should be called right after AC_INIT. AC_CONFIG_HEADER(ifelse([$1],,config.h,[$1]):config.in) @@ -245,7 +245,7 @@ dnl If the simulator doesn't invoke this, only the user environment is dnl supported. dnl ??? Until there is demonstrable value in doing something more complicated, dnl let's not. -AC_DEFUN(SIM_AC_OPTION_ENVIRONMENT, +AC_DEFUN([SIM_AC_OPTION_ENVIRONMENT], [ AC_ARG_ENABLE(sim-environment, [ --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.], @@ -269,7 +269,7 @@ dnl Specify the alignment restrictions of the target architecture. dnl Without this option all possible alignment restrictions are accommodated. dnl arg[1] is hardwired target alignment dnl arg[2] is default target alignment -AC_DEFUN(SIM_AC_OPTION_ALIGNMENT, +AC_DEFUN([SIM_AC_OPTION_ALIGNMENT], wire_alignment="[$1]" default_alignment="[$2]" [ @@ -318,7 +318,7 @@ AC_SUBST(sim_alignment) dnl Conditionally compile in assertion statements. -AC_DEFUN(SIM_AC_OPTION_ASSERT, +AC_DEFUN([SIM_AC_OPTION_ASSERT], [ AC_ARG_ENABLE(sim-assert, [ --enable-sim-assert Specify whether to perform random assertions.], @@ -342,7 +342,7 @@ dnl arg[2] is the number assigned to the most significant bit dnl arg[3] is the number of bits in an address dnl arg[4] is the number of bits in an OpenFirmware cell. dnl FIXME: this information should be obtained from bfd/archure -AC_DEFUN(SIM_AC_OPTION_BITSIZE, +AC_DEFUN([SIM_AC_OPTION_BITSIZE], wire_word_bitsize="[$1]" wire_word_msb="[$2]" wire_address_bitsize="[$3]" @@ -408,7 +408,7 @@ dnl --enable-sim-endian={yes,no,big,little} is for simulators dnl that support both big and little endian targets. dnl arg[1] is hardwired target endianness. dnl arg[2] is default target endianness. -AC_DEFUN(SIM_AC_OPTION_ENDIAN, +AC_DEFUN([SIM_AC_OPTION_ENDIAN], [ wire_endian="[$1]" default_endian="[$2]" @@ -458,7 +458,7 @@ AC_SUBST(sim_endian) dnl --enable-sim-hostendian is for users of the simulator when dnl they find that AC_C_BIGENDIAN does not function correctly dnl (for instance in a canadian cross) -AC_DEFUN(SIM_AC_OPTION_HOSTENDIAN, +AC_DEFUN([SIM_AC_OPTION_HOSTENDIAN], [ AC_ARG_ENABLE(sim-hostendian, [ --enable-sim-hostendian=end Specify host byte endian orientation.], @@ -490,7 +490,7 @@ dnl It specifies the presence of hardware floating point dnl And optionally the bitsize of the floating point register. dnl arg[1] specifies the presence (or absence) of floating point hardware dnl arg[2] specifies the number of bits in a floating point register -AC_DEFUN(SIM_AC_OPTION_FLOAT, +AC_DEFUN([SIM_AC_OPTION_FLOAT], [ default_sim_float="[$1]" default_sim_float_bitsize="[$2]" @@ -519,7 +519,7 @@ AC_SUBST(sim_float) dnl The argument is the default cache size if none is specified. -AC_DEFUN(SIM_AC_OPTION_SCACHE, +AC_DEFUN([SIM_AC_OPTION_SCACHE], [ default_sim_scache="ifelse([$1],,0,[$1])" AC_ARG_ENABLE(sim-scache, @@ -539,7 +539,7 @@ AC_SUBST(sim_scache) dnl The argument is the default model if none is specified. -AC_DEFUN(SIM_AC_OPTION_DEFAULT_MODEL, +AC_DEFUN([SIM_AC_OPTION_DEFAULT_MODEL], [ default_sim_default_model="ifelse([$1],,0,[$1])" AC_ARG_ENABLE(sim-default-model, @@ -559,7 +559,7 @@ dnl --enable-sim-hardware is for users of the simulator dnl arg[1] Enable sim-hw by default? ("yes" or "no") dnl arg[2] is a space separated list of devices that override the defaults dnl arg[3] is a space separated list of extra target specific devices. -AC_DEFUN(SIM_AC_OPTION_HARDWARE, +AC_DEFUN([SIM_AC_OPTION_HARDWARE], [ if test x"[$1]" = x"yes"; then sim_hw_p=yes @@ -621,7 +621,7 @@ dnl --enable-sim-inline is for users that wish to ramp up the simulator's dnl performance by inlining functions. dnl Guarantee that unconfigured simulators do not do any inlining sim_inline="-DDEFAULT_INLINE=0" -AC_DEFUN(SIM_AC_OPTION_INLINE, +AC_DEFUN([SIM_AC_OPTION_INLINE], [ default_sim_inline="ifelse([$1],,,-DDEFAULT_INLINE=[$1])" AC_ARG_ENABLE(sim-inline, @@ -666,7 +666,7 @@ fi])dnl AC_SUBST(sim_inline) -AC_DEFUN(SIM_AC_OPTION_PACKAGES, +AC_DEFUN([SIM_AC_OPTION_PACKAGES], [ AC_ARG_ENABLE(sim-packages, [ --enable-sim-packages=list Specify the packages to be included in the build.], @@ -692,7 +692,7 @@ fi])dnl AC_SUBST(sim_packages) -AC_DEFUN(SIM_AC_OPTION_REGPARM, +AC_DEFUN([SIM_AC_OPTION_REGPARM], [ AC_ARG_ENABLE(sim-regparm, [ --enable-sim-regparm=nr-parm Pass parameters in registers instead of on the stack - x86/GCC specific.], @@ -709,7 +709,7 @@ fi],[sim_regparm=""])dnl AC_SUBST(sim_regparm) -AC_DEFUN(SIM_AC_OPTION_RESERVED_BITS, +AC_DEFUN([SIM_AC_OPTION_RESERVED_BITS], [ default_sim_reserved_bits="ifelse([$1],,1,[$1])" AC_ARG_ENABLE(sim-reserved-bits, @@ -726,7 +726,7 @@ fi],[sim_reserved_bits="-DWITH_RESERVED_BITS=${default_sim_reserved_bits}"])dnl AC_SUBST(sim_reserved_bits) -AC_DEFUN(SIM_AC_OPTION_SMP, +AC_DEFUN([SIM_AC_OPTION_SMP], [ default_sim_smp="ifelse([$1],,5,[$1])" AC_ARG_ENABLE(sim-smp, @@ -746,7 +746,7 @@ fi])dnl AC_SUBST(sim_smp) -AC_DEFUN(SIM_AC_OPTION_STDCALL, +AC_DEFUN([SIM_AC_OPTION_STDCALL], [ AC_ARG_ENABLE(sim-stdcall, [ --enable-sim-stdcall=type Use an alternative function call/return mechanism - x86/GCC specific.], @@ -763,7 +763,7 @@ fi],[sim_stdcall=""])dnl AC_SUBST(sim_stdcall) -AC_DEFUN(SIM_AC_OPTION_XOR_ENDIAN, +AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN], [ default_sim_xor_endian="ifelse([$1],,8,[$1])" AC_ARG_ENABLE(sim-xor-endian, @@ -782,7 +782,7 @@ AC_SUBST(sim_xor_endian) dnl --enable-build-warnings is for developers of the simulator. dnl it enables extra GCC specific warnings. -AC_DEFUN(SIM_AC_OPTION_WARNINGS, +AC_DEFUN([SIM_AC_OPTION_WARNINGS], [ # NOTE: Don't add -Wall or -Wunused, they both include # -Wunused-parameter which reports bogus warnings. @@ -866,7 +866,7 @@ dnl We cope by having autoconf generate two files and then merge them into dnl one afterwards. The two pieces of the common fragment are inserted into dnl the target's fragment at the appropriate points. -AC_DEFUN(SIM_AC_OUTPUT, +AC_DEFUN([SIM_AC_OUTPUT], [ AC_LINK_FILES($sim_link_files, $sim_link_links) dnl Make @cgen_breaks@ non-null only if the sim uses CGEN. @@ -896,7 +896,7 @@ sinclude(../../config/gettext-sister.m4) sinclude(../../config/acx.m4) dnl --enable-cgen-maint support -AC_DEFUN(SIM_AC_OPTION_CGEN_MAINT, +AC_DEFUN([SIM_AC_OPTION_CGEN_MAINT], [ cgen_maint=no dnl Default is to use one in build tree.