From 0dc73ef7c304e6ffc9ce43b2131c77553a74e1d4 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 9 Jan 2016 05:13:37 -0500 Subject: sim: drop --enable-sim-{regparm,stdcall} options These options were never exposed for most sims (just the ppc one), and they are really only useful on 32-bit x86 systems. Considering modern systems tend to be 64-bit x86_64 and how well modern compilers are at optimizing code, these have outlived their usefulness. --- sim/common/ChangeLog | 11 +++ sim/common/Make-common.in | 4 -- sim/common/acinclude.m4 | 36 ---------- sim/common/configure | 2 - sim/common/sim-config.h | 14 ---- sim/common/sim-inline.h | 174 ++++++++++------------------------------------ 6 files changed, 49 insertions(+), 192 deletions(-) (limited to 'sim/common') diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 27ca374..6f4f916 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,16 @@ 2016-01-10 Mike Frysinger + * acinclude.m4: Delete --enable-sim-regparm and sim_regparm, + and --enable-sim-stdcall and sim_stdcall. + * configure: Regenerate. + * Make-common.in (SIM_REGPARM, SIM_STDCALL): Delete. + (CONFIG_CFLAGS): Delete $(SIM_REGPARM) and $(SIM_STDCALL). + * sim-config.h (WITH_REGPARM, WITH_STDCALL): Delete. + * sim-inline.h (REGPARM_MODULE, REGPARM): Delete. + (REGPARM_*): Delete all regparm defines and their use. + +2016-01-10 Mike Frysinger + * acinclude.m4: Delete --enable-sim-cflags and sim_cflags. * Make-common.in (SIM_CFLAGS): Delete. (CONFIG_CFLAGS): Delete $(SIM_CFLAGS). diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index a90d3d8..458bf4b 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -91,11 +91,9 @@ SIM_HW_OBJS = @sim_hw_objs@ SIM_HW = @sim_hw@ SIM_INLINE = @sim_inline@ SIM_PACKAGES = @sim_packages@ -SIM_REGPARM = @sim_regparm@ SIM_RESERVED_BITS = @sim_reserved_bits@ SIM_SCACHE = @sim_scache@ SIM_SMP = @sim_smp@ -SIM_STDCALL = @sim_stdcall@ SIM_XOR_ENDIAN = @sim_xor_endian@ WARN_CFLAGS = @WARN_CFLAGS@ WERROR_CFLAGS = @WERROR_CFLAGS@ @@ -240,11 +238,9 @@ CONFIG_CFLAGS = \ $(SIM_HW_CFLAGS) \ $(SIM_INLINE) \ $(SIM_PACKAGES) \ - $(SIM_REGPARM) \ $(SIM_RESERVED_BITS) \ $(SIM_SCACHE) \ $(SIM_SMP) \ - $(SIM_STDCALL) \ $(SIM_WARN_CFLAGS) \ $(SIM_WERROR_CFLAGS) \ $(SIM_XOR_ENDIAN) \ diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index e11e568..92eb265 100644 --- a/sim/common/acinclude.m4 +++ b/sim/common/acinclude.m4 @@ -694,24 +694,6 @@ fi])dnl AC_SUBST(sim_packages) -AC_DEFUN([SIM_AC_OPTION_REGPARM], -[ -AC_ARG_ENABLE(sim-regparm, -[AS_HELP_STRING([--enable-sim-regparm=nr-parm], - [Pass parameters in registers instead of on the stack - x86/GCC specific])], -[case "${enableval}" in - 0*|1*|2*|3*|4*|5*|6*|7*|8*|9*) sim_regparm="-DWITH_REGPARM=${enableval}";; - no) sim_regparm="" ;; - yes) sim_regparm="-DWITH_REGPARM=3";; - *) AC_MSG_ERROR("Unknown value $enableval for --enable-sim-regparm"); sim_regparm="";; -esac -if test x"$silent" != x"yes" && test x"$sim_regparm" != x""; then - echo "Setting regparm flags = $sim_regparm" 6>&1 -fi],[sim_regparm=""])dnl -]) -AC_SUBST(sim_regparm) - - AC_DEFUN([SIM_AC_OPTION_RESERVED_BITS], [ default_sim_reserved_bits="ifelse([$1],,1,[$1])" @@ -751,24 +733,6 @@ fi])dnl AC_SUBST(sim_smp) -AC_DEFUN([SIM_AC_OPTION_STDCALL], -[ -AC_ARG_ENABLE(sim-stdcall, -[AS_HELP_STRING([--enable-sim-stdcall=type], - [Use an alternative function call/return mechanism - x86/GCC specific])], -[case "${enableval}" in - no) sim_stdcall="" ;; - std*) sim_stdcall="-DWITH_STDCALL=1";; - yes) sim_stdcall="-DWITH_STDCALL=1";; - *) AC_MSG_ERROR("Unknown value $enableval for --enable-sim-stdcall"); sim_stdcall="";; -esac -if test x"$silent" != x"yes" && test x"$sim_stdcall" != x""; then - echo "Setting function call flags = $sim_stdcall" 6>&1 -fi],[sim_stdcall=""])dnl -]) -AC_SUBST(sim_stdcall) - - AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN], [ default_sim_xor_endian="ifelse([$1],,8,[$1])" diff --git a/sim/common/configure b/sim/common/configure index 3b11fbb..ccb6ce5 100755 --- a/sim/common/configure +++ b/sim/common/configure @@ -603,10 +603,8 @@ SHELL WERROR_CFLAGS WARN_CFLAGS sim_xor_endian -sim_stdcall sim_smp sim_reserved_bits -sim_regparm sim_packages sim_inline sim_hw diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h index 4bfcdc9..1c65365 100644 --- a/sim/common/sim-config.h +++ b/sim/common/sim-config.h @@ -355,20 +355,6 @@ extern int current_stdio; -/* Specify that configured calls pass parameters in registers when the - convention is that they are placed on the stack */ - -#ifndef WITH_REGPARM -#define WITH_REGPARM 0 -#endif - -/* Specify that configured calls use an alternative calling mechanism */ - -#ifndef WITH_STDCALL -#define WITH_STDCALL 0 -#endif - - /* Set the default state configuration, before parsing argv. */ extern void sim_config_default (SIM_DESC sd); diff --git a/sim/common/sim-inline.h b/sim/common/sim-inline.h index ed7451c..2c5406e 100644 --- a/sim/common/sim-inline.h +++ b/sim/common/sim-inline.h @@ -266,8 +266,6 @@ #define INLINE_GLOBALS 4 #define INLINE_LOCALS 8 -#define REGPARM_MODULE 32 - #define ALL_H_INLINE (H_REVEALS_MODULE | INLINE_GLOBALS | INLINE_LOCALS) #define ALL_C_INLINE (C_REVEALS_MODULE | INLINE_GLOBALS | INLINE_LOCALS) @@ -349,30 +347,6 @@ - -/* Your compilers nonstandard function call mechanism prefix */ - -#if !defined REGPARM -#if defined (__GNUC__) && (defined (__i386__) || defined (__i486__) || defined (__i586__) || defined (__i686__)) -#if (WITH_REGPARM && WITH_STDCALL) -#define REGPARM __attribute__((__regparm__(WITH_REGPARM),__stdcall__)) -#else -#if (WITH_REGPARM && !WITH_STDCALL) -#define REGPARM __attribute__((__regparm__(WITH_REGPARM))) -#else -#if (!WITH_REGPARM && WITH_STDCALL) -#define REGPARM __attribute__((__stdcall__)) -#endif -#endif -#endif -#endif -#endif - -#if !defined REGPARM -#define REGPARM -#endif - - /* ***** sim-bits and sim-endian are treated differently from the rest @@ -387,12 +361,6 @@ # define SIM_BITS_INLINE (ALL_H_INLINE) #endif -#if (SIM_BITS_INLINE & REGPARM_MODULE) -# define REGPARM_SIM_BITS REGPARM -#else -# define REGPARM_SIM_BITS -#endif - #if ((H_REVEALS_MODULE_P (SIM_BITS_INLINE) || defined (SIM_INLINE_C)) \ && !defined (SIM_BITS_C) \ && (REVEAL_MODULE_P (SIM_BITS_INLINE))) @@ -400,18 +368,18 @@ # define INLINE_SIM_BITS(TYPE) static INLINE TYPE UNUSED # define EXTERN_SIM_BITS_P 0 # else -# define INLINE_SIM_BITS(TYPE) static TYPE UNUSED REGPARM_SIM_BITS +# define INLINE_SIM_BITS(TYPE) static TYPE UNUSED # define EXTERN_SIM_BITS_P 0 # endif #else -# define INLINE_SIM_BITS(TYPE) TYPE REGPARM_SIM_BITS +# define INLINE_SIM_BITS(TYPE) TYPE # define EXTERN_SIM_BITS_P 1 #endif #if (SIM_BITS_INLINE & INLINE_LOCALS) # define STATIC_INLINE_SIM_BITS(TYPE) static INLINE TYPE #else -# define STATIC_INLINE_SIM_BITS(TYPE) static TYPE REGPARM_SIM_BITS +# define STATIC_INLINE_SIM_BITS(TYPE) static TYPE #endif #define STATIC_SIM_BITS(TYPE) static TYPE @@ -424,12 +392,6 @@ # define SIM_CORE_INLINE ALL_C_INLINE #endif -#if (SIM_CORE_INLINE & REGPARM_MODULE) -# define REGPARM_SIM_CORE REGPARM -#else -# define REGPARM_SIM_CORE -#endif - #if ((H_REVEALS_MODULE_P (SIM_CORE_INLINE) || defined (SIM_INLINE_C)) \ && !defined (SIM_CORE_C) \ && (REVEAL_MODULE_P (SIM_CORE_INLINE))) @@ -437,18 +399,18 @@ # define INLINE_SIM_CORE(TYPE) static INLINE TYPE UNUSED # define EXTERN_SIM_CORE_P 0 #else -# define INLINE_SIM_CORE(TYPE) static TYPE UNUSED REGPARM_SIM_CORE +# define INLINE_SIM_CORE(TYPE) static TYPE UNUSED # define EXTERN_SIM_CORE_P 0 #endif #else -# define INLINE_SIM_CORE(TYPE) TYPE REGPARM_SIM_CORE +# define INLINE_SIM_CORE(TYPE) TYPE # define EXTERN_SIM_CORE_P 1 #endif #if (SIM_CORE_INLINE & INLINE_LOCALS) # define STATIC_INLINE_SIM_CORE(TYPE) static INLINE TYPE #else -# define STATIC_INLINE_SIM_CORE(TYPE) static TYPE REGPARM_SIM_CORE +# define STATIC_INLINE_SIM_CORE(TYPE) static TYPE #endif #define STATIC_SIM_CORE(TYPE) static TYPE @@ -461,12 +423,6 @@ # define SIM_ENDIAN_INLINE ALL_H_INLINE #endif -#if (SIM_ENDIAN_INLINE & REGPARM_MODULE) -# define REGPARM_SIM_ENDIAN REGPARM -#else -# define REGPARM_SIM_ENDIAN -#endif - #if ((H_REVEALS_MODULE_P (SIM_ENDIAN_INLINE) || defined (SIM_INLINE_C)) \ && !defined (SIM_ENDIAN_C) \ && (REVEAL_MODULE_P (SIM_ENDIAN_INLINE))) @@ -474,18 +430,18 @@ # define INLINE_SIM_ENDIAN(TYPE) static INLINE TYPE UNUSED # define EXTERN_SIM_ENDIAN_P 0 # else -# define INLINE_SIM_ENDIAN(TYPE) static TYPE UNUSED REGPARM_SIM_ENDIAN +# define INLINE_SIM_ENDIAN(TYPE) static TYPE UNUSED # define EXTERN_SIM_ENDIAN_P 0 # endif #else -# define INLINE_SIM_ENDIAN(TYPE) TYPE REGPARM_SIM_ENDIAN +# define INLINE_SIM_ENDIAN(TYPE) TYPE # define EXTERN_SIM_ENDIAN_P 1 #endif #if (SIM_ENDIAN_INLINE & INLINE_LOCALS) # define STATIC_INLINE_SIM_ENDIAN(TYPE) static INLINE TYPE #else -# define STATIC_INLINE_SIM_ENDIAN(TYPE) static TYPE REGPARM_SIM_ENDIAN +# define STATIC_INLINE_SIM_ENDIAN(TYPE) static TYPE #endif #define STATIC_SIM_ENDIAN(TYPE) static TYPE @@ -498,12 +454,6 @@ # define SIM_EVENTS_INLINE ALL_C_INLINE #endif -#if (SIM_EVENTS_INLINE & REGPARM_MODULE) -# define REGPARM_SIM_EVENTS REGPARM -#else -# define REGPARM_SIM_EVENTS -#endif - #if ((H_REVEALS_MODULE_P (SIM_EVENTS_INLINE) || defined (SIM_INLINE_C)) \ && !defined (SIM_EVENTS_C) \ && (REVEAL_MODULE_P (SIM_EVENTS_INLINE))) @@ -511,18 +461,18 @@ # define INLINE_SIM_EVENTS(TYPE) static INLINE TYPE UNUSED # define EXTERN_SIM_EVENTS_P 0 # else -# define INLINE_SIM_EVENTS(TYPE) static TYPE UNUSED REGPARM_SIM_EVENTS +# define INLINE_SIM_EVENTS(TYPE) static TYPE UNUSED # define EXTERN_SIM_EVENTS_P 0 # endif #else -# define INLINE_SIM_EVENTS(TYPE) TYPE REGPARM_SIM_EVENTS +# define INLINE_SIM_EVENTS(TYPE) TYPE # define EXTERN_SIM_EVENTS_P 1 #endif #if (SIM_EVENTS_INLINE & INLINE_LOCALS) # define STATIC_INLINE_SIM_EVENTS(TYPE) static INLINE TYPE #else -# define STATIC_INLINE_SIM_EVENTS(TYPE) static TYPE REGPARM_SIM_EVENTS +# define STATIC_INLINE_SIM_EVENTS(TYPE) static TYPE #endif #define STATIC_SIM_EVENTS(TYPE) static TYPE @@ -535,12 +485,6 @@ # define SIM_FPU_INLINE ALL_C_INLINE #endif -#if (SIM_FPU_INLINE & REGPARM_MODULE) -# define REGPARM_SIM_FPU REGPARM -#else -# define REGPARM_SIM_FPU -#endif - #if ((H_REVEALS_MODULE_P (SIM_FPU_INLINE) || defined (SIM_INLINE_C)) \ && !defined (SIM_FPU_C) \ && (REVEAL_MODULE_P (SIM_FPU_INLINE))) @@ -548,18 +492,18 @@ # define INLINE_SIM_FPU(TYPE) static INLINE TYPE UNUSED # define EXTERN_SIM_FPU_P 0 # else -# define INLINE_SIM_FPU(TYPE) static TYPE UNUSED REGPARM_SIM_FPU +# define INLINE_SIM_FPU(TYPE) static TYPE UNUSED # define EXTERN_SIM_FPU_P 0 # endif #else -# define INLINE_SIM_FPU(TYPE) TYPE REGPARM_SIM_FPU +# define INLINE_SIM_FPU(TYPE) TYPE # define EXTERN_SIM_FPU_P 1 #endif #if (SIM_FPU_INLINE & INLINE_LOCALS) # define STATIC_INLINE_SIM_FPU(TYPE) static INLINE TYPE #else -# define STATIC_INLINE_SIM_FPU(TYPE) static TYPE REGPARM_SIM_FPU +# define STATIC_INLINE_SIM_FPU(TYPE) static TYPE #endif #define STATIC_SIM_FPU(TYPE) static TYPE @@ -568,12 +512,6 @@ /* sim-types */ -#if (SIM_TYPES_INLINE & REGPARM_MODULE) -# define REGPARM_SIM_TYPES REGPARM -#else -# define REGPARM_SIM_TYPES -#endif - #if ((H_REVEALS_MODULE_P (SIM_TYPES_INLINE) || defined (SIM_INLINE_C)) \ && !defined (SIM_TYPES_C) \ && (REVEAL_MODULE_P (SIM_TYPES_INLINE))) @@ -581,18 +519,18 @@ # define INLINE_SIM_TYPES(TYPE) static INLINE TYPE UNUSED # define EXTERN_SIM_TYPES_P 0 # else -# define INLINE_SIM_TYPES(TYPE) static TYPE UNUSED REGPARM_SIM_TYPES +# define INLINE_SIM_TYPES(TYPE) static TYPE UNUSED # define EXTERN_SIM_TYPES_P 0 # endif #else -# define INLINE_SIM_TYPES(TYPE) TYPE REGPARM_SIM_TYPES +# define INLINE_SIM_TYPES(TYPE) TYPE # define EXTERN_SIM_TYPES_P 1 #endif #if (SIM_TYPES_INLINE & INLINE_LOCALS) # define STATIC_INLINE_SIM_TYPES(TYPE) static INLINE TYPE #else -# define STATIC_INLINE_SIM_TYPES(TYPE) static TYPE REGPARM_SIM_TYPES +# define STATIC_INLINE_SIM_TYPES(TYPE) static TYPE #endif #define STATIC_SIM_TYPES(TYPE) static TYPE @@ -605,12 +543,6 @@ # define SIM_MAIN_INLINE (ALL_C_INLINE) #endif -#if (SIM_MAIN_INLINE & REGPARM_MODULE) -# define REGPARM_SIM_MAIN REGPARM -#else -# define REGPARM_SIM_MAIN -#endif - #if ((H_REVEALS_MODULE_P (SIM_MAIN_INLINE) || defined (SIM_INLINE_C)) \ && !defined (SIM_MAIN_C) \ && (REVEAL_MODULE_P (SIM_MAIN_INLINE))) @@ -618,30 +550,24 @@ # define INLINE_SIM_MAIN(TYPE) static INLINE TYPE UNUSED # define EXTERN_SIM_MAIN_P 0 # else -# define INLINE_SIM_MAIN(TYPE) static TYPE UNUSED REGPARM_SIM_MAIN +# define INLINE_SIM_MAIN(TYPE) static TYPE UNUSED # define EXTERN_SIM_MAIN_P 0 # endif #else -# define INLINE_SIM_MAIN(TYPE) TYPE REGPARM_SIM_MAIN +# define INLINE_SIM_MAIN(TYPE) TYPE # define EXTERN_SIM_MAIN_P 1 #endif #if (SIM_MAIN_INLINE & INLINE_LOCALS) # define STATIC_INLINE_SIM_MAIN(TYPE) static INLINE TYPE #else -# define STATIC_INLINE_SIM_MAIN(TYPE) static TYPE REGPARM_SIM_MAIN +# define STATIC_INLINE_SIM_MAIN(TYPE) static TYPE #endif #define STATIC_SIM_MAIN(TYPE) static TYPE /* engine */ -#if (ENGINE_INLINE & REGPARM_MODULE) -# define REGPARM_ENGINE REGPARM -#else -# define REGPARM_ENGINE -#endif - #if ((H_REVEALS_MODULE_P (ENGINE_INLINE) || defined (SIM_INLINE_C)) \ && !defined (ENGINE_C) \ && (REVEAL_MODULE_P (ENGINE_INLINE))) @@ -649,18 +575,18 @@ # define INLINE_ENGINE(TYPE) static INLINE TYPE UNUSED # define EXTERN_ENGINE_P 0 # else -# define INLINE_ENGINE(TYPE) static TYPE UNUSED REGPARM_ENGINE +# define INLINE_ENGINE(TYPE) static TYPE UNUSED # define EXTERN_ENGINE_P 0 # endif #else -# define INLINE_ENGINE(TYPE) TYPE REGPARM_ENGINE +# define INLINE_ENGINE(TYPE) TYPE # define EXTERN_ENGINE_P 1 #endif #if (ENGINE_INLINE & INLINE_LOCALS) # define STATIC_INLINE_ENGINE(TYPE) static INLINE TYPE #else -# define STATIC_INLINE_ENGINE(TYPE) static TYPE REGPARM_ENGINE +# define STATIC_INLINE_ENGINE(TYPE) static TYPE #endif #define STATIC_ENGINE(TYPE) static TYPE @@ -669,12 +595,6 @@ /* icache */ -#if (ICACHE_INLINE & REGPARM_MODULE) -# define REGPARM_ICACHE REGPARM -#else -# define REGPARM_ICACHE -#endif - #if ((H_REVEALS_MODULE_P (ICACHE_INLINE) || defined (SIM_INLINE_C)) \ && !defined (ICACHE_C) \ && (REVEAL_MODULE_P (ICACHE_INLINE))) @@ -682,18 +602,18 @@ # define INLINE_ICACHE(TYPE) static INLINE TYPE UNUSED # define EXTERN_ICACHE_P 0 #else -# define INLINE_ICACHE(TYPE) static TYPE UNUSED REGPARM_ICACHE +# define INLINE_ICACHE(TYPE) static TYPE UNUSED # define EXTERN_ICACHE_P 0 #endif #else -# define INLINE_ICACHE(TYPE) TYPE REGPARM_ICACHE +# define INLINE_ICACHE(TYPE) TYPE # define EXTERN_ICACHE_P 1 #endif #if (ICACHE_INLINE & INLINE_LOCALS) # define STATIC_INLINE_ICACHE(TYPE) static INLINE TYPE #else -# define STATIC_INLINE_ICACHE(TYPE) static TYPE REGPARM_ICACHE +# define STATIC_INLINE_ICACHE(TYPE) static TYPE #endif #define STATIC_ICACHE(TYPE) static TYPE @@ -702,12 +622,6 @@ /* idecode */ -#if (IDECODE_INLINE & REGPARM_MODULE) -# define REGPARM_IDECODE REGPARM -#else -# define REGPARM_IDECODE -#endif - #if ((H_REVEALS_MODULE_P (IDECODE_INLINE) || defined (SIM_INLINE_C)) \ && !defined (IDECODE_C) \ && (REVEAL_MODULE_P (IDECODE_INLINE))) @@ -715,18 +629,18 @@ # define INLINE_IDECODE(TYPE) static INLINE TYPE UNUSED # define EXTERN_IDECODE_P 0 #else -# define INLINE_IDECODE(TYPE) static TYPE UNUSED REGPARM_IDECODE +# define INLINE_IDECODE(TYPE) static TYPE UNUSED # define EXTERN_IDECODE_P 0 #endif #else -# define INLINE_IDECODE(TYPE) TYPE REGPARM_IDECODE +# define INLINE_IDECODE(TYPE) TYPE # define EXTERN_IDECODE_P 1 #endif #if (IDECODE_INLINE & INLINE_LOCALS) # define STATIC_INLINE_IDECODE(TYPE) static INLINE TYPE #else -# define STATIC_INLINE_IDECODE(TYPE) static TYPE REGPARM_IDECODE +# define STATIC_INLINE_IDECODE(TYPE) static TYPE #endif #define STATIC_IDECODE(TYPE) static TYPE @@ -735,12 +649,6 @@ /* semantics */ -#if (SEMANTICS_INLINE & REGPARM_MODULE) -# define REGPARM_SEMANTICS REGPARM -#else -# define REGPARM_SEMANTICS -#endif - #if ((H_REVEALS_MODULE_P (SEMANTICS_INLINE) || defined (SIM_INLINE_C)) \ && !defined (SEMANTICS_C) \ && (REVEAL_MODULE_P (SEMANTICS_INLINE))) @@ -748,24 +656,24 @@ # define INLINE_SEMANTICS(TYPE) static INLINE TYPE UNUSED # define EXTERN_SEMANTICS_P 0 #else -# define INLINE_SEMANTICS(TYPE) static TYPE UNUSED REGPARM_SEMANTICS +# define INLINE_SEMANTICS(TYPE) static TYPE UNUSED # define EXTERN_SEMANTICS_P 0 #endif #else -# define INLINE_SEMANTICS(TYPE) TYPE REGPARM_SEMANTICS +# define INLINE_SEMANTICS(TYPE) TYPE # define EXTERN_SEMANTICS_P 1 #endif #if EXTERN_SEMANTICS_P -# define EXTERN_SEMANTICS(TYPE) TYPE REGPARM_SEMANTICS +# define EXTERN_SEMANTICS(TYPE) TYPE #else -# define EXTERN_SEMANTICS(TYPE) static TYPE UNUSED REGPARM_SEMANTICS +# define EXTERN_SEMANTICS(TYPE) static TYPE UNUSED #endif #if (SEMANTICS_INLINE & INLINE_LOCALS) # define STATIC_INLINE_SEMANTICS(TYPE) static INLINE TYPE #else -# define STATIC_INLINE_SEMANTICS(TYPE) static TYPE REGPARM_SEMANTICS +# define STATIC_INLINE_SEMANTICS(TYPE) static TYPE #endif #define STATIC_SEMANTICS(TYPE) static TYPE @@ -778,12 +686,6 @@ # define SUPPORT_INLINE ALL_C_INLINE #endif -#if (SUPPORT_INLINE & REGPARM_MODULE) -# define REGPARM_SUPPORT REGPARM -#else -# define REGPARM_SUPPORT -#endif - #if ((H_REVEALS_MODULE_P (SUPPORT_INLINE) || defined (SIM_INLINE_C)) \ && !defined (SUPPORT_C) \ && (REVEAL_MODULE_P (SUPPORT_INLINE))) @@ -791,18 +693,18 @@ # define INLINE_SUPPORT(TYPE) static INLINE TYPE UNUSED # define EXTERN_SUPPORT_P 0 #else -# define INLINE_SUPPORT(TYPE) static TYPE UNUSED REGPARM_SUPPORT +# define INLINE_SUPPORT(TYPE) static TYPE UNUSED # define EXTERN_SUPPORT_P 0 #endif #else -# define INLINE_SUPPORT(TYPE) TYPE REGPARM_SUPPORT +# define INLINE_SUPPORT(TYPE) TYPE # define EXTERN_SUPPORT_P 1 #endif #if (SUPPORT_INLINE & INLINE_LOCALS) # define STATIC_INLINE_SUPPORT(TYPE) static INLINE TYPE #else -# define STATIC_INLINE_SUPPORT(TYPE) static TYPE REGPARM_SUPPORT +# define STATIC_INLINE_SUPPORT(TYPE) static TYPE #endif #define STATIC_SUPPORT(TYPE) static TYPE -- cgit v1.1