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.

7 files changed, 30 insertions, 134 deletions

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 25bdd6ccdeb..01b07c99159 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,5 +1,17 @@
 2016-01-10  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure.ac: Delete --enable-sim-regparm and sim_regparm,
+	and --enable-sim-stdcall and sim_stdcall.
+	* configure: Regenerate.
+	* Makefile.in (REGPARM_CFLAGS, STDCALL_CFLAGS): Delete.
+	(CONFIG_CFLAGS): Delete $(REGPARM_CFLAGS) and $(STDCALL_CFLAGS).
+	* inline.h: Delete REGPARM everywhere.
+	* options.c (print_options): Delete WITH_REGPARM and
+	WITH_STDCALL.
+	* std-config.h (WITH_REGPARM, WITH_STDCALL, REGPARM): Delete.
+
+2016-01-10  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac: Delete --enable-sim-cflags and sim_cflags.
 	* configure: Regenerate.
 	* INSTALL: Delete all mention of --enable-sim-cflags.
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 139fc6c7038..7d30faec335 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -72,8 +72,6 @@ RANLIB = @RANLIB@
 
 INLINE_CFLAGS = @sim_inline@
 ENDIAN_CFLAGS = @sim_endian@
-REGPARM_CFLAGS = @sim_regparm@
-STDCALL_CFLAGS = @sim_stdcall@
 HOSTENDIAN_CFLAGS = @sim_hostendian@
 SMP_CFLAGS = @sim_smp@
 XOR_ENDIAN_CFLAGS = @sim_xor_endian@
@@ -94,8 +92,6 @@ WARNING_CFLAGS = @sim_warnings@
 DEVZERO_CFLAGS = @sim_devzero@
 CONFIG_CFLAGS = \
   $(ENDIAN_CFLAGS) \
-  $(REGPARM_CFLAGS) \
-  $(STDCALL_CFLAGS) \
   $(HOSTENDIAN_CFLAGS) \
   $(SMP_CFLAGS) \
   $(XOR_ENDIAN_CFLAGS) \
diff --git a/sim/ppc/configure b/sim/ppc/configure
index d552628d5d2..260aa54cd20 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -671,10 +671,8 @@ INSTALL_PROGRAM
 WERROR_CFLAGS
 WARN_CFLAGS
 sim_xor_endian
-sim_stdcall
 sim_smp
 sim_reserved_bits
-sim_regparm
 sim_packages
 sim_inline
 sim_hw
@@ -752,10 +750,8 @@ enable_sim_model_issue
 enable_sim_monitor
 enable_sim_opcode
 enable_sim_packages
-enable_sim_regparm
 enable_sim_reserved_bits
 enable_sim_smp
-enable_sim_stdcall
 enable_sim_stdio
 enable_sim_switch
 enable_sim_timebase
@@ -1417,10 +1413,8 @@ Optional Features:
   --enable-sim-monitor=mon		Specify whether to enable monitoring events.
   --enable-sim-opcode=which		Override default opcode lookup.
   --enable-sim-packages=list		Specify the packages to be included in the build.
-  --enable-sim-regparm=nr-parm		Pass parameters in registers instead of on the stack - x86/GCC specific.
   --enable-sim-reserved-bits		Specify whether to check reserved bits in instruction.
   --enable-sim-smp=n			Specify number of processors to configure for.
-  --enable-sim-stdcall=type		Use an alternative function call/return mechanism - x86/GCC specific.
   --enable-sim-stdio			Specify whether to use stdio for console input/output.
   --enable-sim-switch			Use a switch instead of a table for instruction call.
   --enable-sim-timebase			Specify whether the PPC timebase is supported.
@@ -4091,14 +4085,6 @@ sim_inline="-DDEFAULT_INLINE=0"
 
 
 
-
-
-
-
-
-
-
-
 # intl sister-directory configuration rules.
 #
 
@@ -6439,22 +6425,6 @@ fi
 fi
 
 
-# Check whether --enable-sim-regparm was given.
-if test "${enable_sim_regparm+set}" = set; then :
-  enableval=$enable_sim_regparm; 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";;
-  *)   as_fn_error "\"Unknown value $enableval for --enable-sim-regparm\"" "$LINENO" 5; sim_regparm="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_regparm" != x""; then
-  echo "Setting regparm flags = $sim_regparm" 6>&1
-fi
-else
-  sim_regparm=""
-fi
-
-
 # Check whether --enable-sim-reserved-bits was given.
 if test "${enable_sim_reserved_bits+set}" = set; then :
   enableval=$enable_sim_reserved_bits; case "${enableval}" in
@@ -6488,22 +6458,6 @@ fi
 fi
 
 
-# Check whether --enable-sim-stdcall was given.
-if test "${enable_sim_stdcall+set}" = set; then :
-  enableval=$enable_sim_stdcall; case "${enableval}" in
-  no)		sim_stdcall="" ;;
-  std*)		sim_stdcall="-DWITH_STDCALL=1";;
-  yes)		sim_stdcall="-DWITH_STDCALL=1";;
-  *)   as_fn_error "\"Unknown value $enableval for --enable-sim-stdcall\"" "$LINENO" 5; 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
-else
-  sim_stdcall=""
-fi
-
-
 # Check whether --enable-sim-stdio was given.
 if test "${enable_sim_stdio+set}" = set; then :
   enableval=$enable_sim_stdio; case "${enableval}" in
@@ -7900,8 +7854,6 @@ fi
 
 
 
-
-
 ac_config_files="$ac_config_files Makefile"
 
 ac_config_commands="$ac_config_commands default"
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 0b6f849bfc6..8ac9fd04677 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -506,19 +506,6 @@ if test x"$silent" != x"yes"; then
 fi])dnl
 
 
-AC_ARG_ENABLE(sim-regparm,
-[  --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_ARG_ENABLE(sim-reserved-bits,
 [  --enable-sim-reserved-bits		Specify whether to check reserved bits in instruction.],
 [case "${enableval}" in
@@ -546,19 +533,6 @@ if test x"$silent" != x"yes"; then
 fi])dnl
 
 
-AC_ARG_ENABLE(sim-stdcall,
-[  --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_ARG_ENABLE(sim-stdio,
 [  --enable-sim-stdio			Specify whether to use stdio for console input/output.],
 [case "${enableval}" in
@@ -878,8 +852,6 @@ AC_SUBST(sim_pk_src)
 AC_SUBST(sim_pk_obj)
 AC_SUBST(sim_inline)
 AC_SUBST(sim_endian)
-AC_SUBST(sim_regparm)
-AC_SUBST(sim_stdcall)
 AC_SUBST(sim_xor_endian)
 AC_SUBST(sim_hostendian)
 AC_SUBST(sim_smp)
diff --git a/sim/ppc/inline.h b/sim/ppc/inline.h
index 6c4d325f6f0..55de0bbfbed 100644
--- a/sim/ppc/inline.h
+++ b/sim/ppc/inline.h
@@ -316,21 +316,21 @@
 #if defined(_INLINE_C_) && !defined(_SEMANTICS_C_) && (SEMANTICS_INLINE & INCLUDE_MODULE)
 # if (SEMANTICS_INLINE & INLINE_MODULE)
 #  define PSIM_INLINE_SEMANTICS(TYPE) static INLINE TYPE UNUSED
-#  define PSIM_EXTERN_SEMANTICS(TYPE) static TYPE UNUSED REGPARM
+#  define PSIM_EXTERN_SEMANTICS(TYPE) static TYPE UNUSED
 #else
-#  define PSIM_INLINE_SEMANTICS(TYPE) static TYPE UNUSED REGPARM
-#  define PSIM_EXTERN_SEMANTICS(TYPE) static TYPE UNUSED REGPARM
+#  define PSIM_INLINE_SEMANTICS(TYPE) static TYPE UNUSED
+#  define PSIM_EXTERN_SEMANTICS(TYPE) static TYPE UNUSED
 #endif
 #else
-# define PSIM_INLINE_SEMANTICS(TYPE) TYPE REGPARM
-# define PSIM_EXTERN_SEMANTICS(TYPE) TYPE REGPARM
+# define PSIM_INLINE_SEMANTICS(TYPE) TYPE
+# define PSIM_EXTERN_SEMANTICS(TYPE) TYPE
 #endif
 
 #if 0 /* this isn't used */
 #if (SEMANTICS_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_SEMANTICS(TYPE) static INLINE TYPE
 #else
-# define STATIC_INLINE_SEMANTICS(TYPE) static TYPE REGPARM
+# define STATIC_INLINE_SEMANTICS(TYPE) static TYPE
 #endif
 #endif
 
@@ -340,21 +340,21 @@
 #if defined(_INLINE_C_) && !defined(_IDECODE_C_) && (IDECODE_INLINE & INCLUDE_MODULE)
 # if (IDECODE_INLINE & INLINE_MODULE)
 #  define PSIM_INLINE_IDECODE(TYPE) static INLINE TYPE UNUSED
-#  define EXTERN_IDECODE(TYPE) static TYPE UNUSED REGPARM
+#  define EXTERN_IDECODE(TYPE) static TYPE UNUSED
 #else
-#  define PSIM_INLINE_IDECODE(TYPE) static TYPE UNUSED REGPARM
-#  define EXTERN_IDECODE(TYPE) static TYPE UNUSED REGPARM
+#  define PSIM_INLINE_IDECODE(TYPE) static TYPE UNUSED
+#  define EXTERN_IDECODE(TYPE) static TYPE UNUSED
 #endif
 #else
-# define PSIM_INLINE_IDECODE(TYPE) TYPE REGPARM
-# define EXTERN_IDECODE(TYPE) TYPE REGPARM
+# define PSIM_INLINE_IDECODE(TYPE) TYPE
+# define EXTERN_IDECODE(TYPE) TYPE
 #endif
 
 #if 0 /* this isn't used */
 #if (IDECODE_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_IDECODE(TYPE) static INLINE TYPE
 #else
-# define STATIC_INLINE_IDECODE(TYPE) static TYPE REGPARM
+# define STATIC_INLINE_IDECODE(TYPE) static TYPE
 #endif
 #endif
 
@@ -364,21 +364,21 @@
 #if defined(_INLINE_C_) && !defined(_ICACHE_C_) && (ICACHE_INLINE & INCLUDE_MODULE)
 # if (ICACHE_INLINE & INLINE_MODULE)
 #  define PSIM_INLINE_ICACHE(TYPE) static INLINE TYPE UNUSED
-#  define EXTERN_ICACHE(TYPE) static TYPE UNUSED REGPARM
+#  define EXTERN_ICACHE(TYPE) static TYPE UNUSED
 #else
-#  define PSIM_INLINE_ICACHE(TYPE) static TYPE UNUSED REGPARM
-#  define EXTERN_ICACHE(TYPE) static TYPE UNUSED REGPARM
+#  define PSIM_INLINE_ICACHE(TYPE) static TYPE UNUSED
+#  define EXTERN_ICACHE(TYPE) static TYPE UNUSED
 #endif
 #else
-# define PSIM_INLINE_ICACHE(TYPE) TYPE REGPARM
-# define EXTERN_ICACHE(TYPE) TYPE REGPARM
+# define PSIM_INLINE_ICACHE(TYPE) TYPE
+# define EXTERN_ICACHE(TYPE) TYPE
 #endif
 
 #if 0 /* this isn't used */
 #if (ICACHE_INLINE & PSIM_INLINE_LOCALS)
 # define STATIC_INLINE_ICACHE(TYPE) static INLINE TYPE
 #else
-# define STATIC_INLINE_ICACHE(TYPE) static TYPE REGPARM
+# define STATIC_INLINE_ICACHE(TYPE) static TYPE
 #endif
 #endif
 
diff --git a/sim/ppc/options.c b/sim/ppc/options.c
index b8f9f9c12af..169378ef93d 100644
--- a/sim/ppc/options.c
+++ b/sim/ppc/options.c
@@ -137,8 +137,6 @@ print_options (void)
   printf_filtered ("WITH_MODEL_ISSUE         = %d\n", WITH_MODEL_ISSUE);
   printf_filtered ("WITH_RESERVED_BITS       = %d\n", WITH_RESERVED_BITS);
   printf_filtered ("WITH_STDIO               = %d\n", WITH_STDIO);
-  printf_filtered ("WITH_REGPARM             = %d\n", WITH_REGPARM);
-  printf_filtered ("WITH_STDCALL             = %d\n", WITH_STDCALL);
   printf_filtered ("DEFAULT_INLINE           = %s\n", options_inline (DEFAULT_INLINE));
   printf_filtered ("SIM_ENDIAN_INLINE        = %s\n", options_inline (SIM_ENDIAN_INLINE));
   printf_filtered ("BITS_INLINE              = %s\n", options_inline (BITS_INLINE));
diff --git a/sim/ppc/std-config.h b/sim/ppc/std-config.h
index 04ba654fc55..badce3ddd7a 100644
--- a/sim/ppc/std-config.h
+++ b/sim/ppc/std-config.h
@@ -453,40 +453,6 @@ extern int current_stdio;
 #endif
 
 
-/* Your compilers pass parameters in registers reserved word */
-
-#ifndef WITH_REGPARM
-#define WITH_REGPARM                   0
-#endif
-
-/* Your compilers use an alternative calling sequence reserved word */
-
-#ifndef WITH_STDCALL
-#define WITH_STDCALL                   0
-#endif
-
-#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
-
-
-
 /* Default prefix for static functions */
 
 #ifndef STATIC_INLINE