This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: RFC: New approach to --with-cpu
On Wed, Jul 31, 2002 at 02:54:07PM +0100, Richard Sandiford wrote:
> Daniel Jacobowitz <drow@mvista.com> writes:
> > if the user configures --with-cpu=<blah>, and then runs the compiler
> > with -mips3, what _should_ happen and what _will_ happen? The result
> > will be both -march= and -mips3 being specified on the command line;
> > will the -mips3 be ignored or have some effect?
>
> Well, -march overrides -mipsN (N != 16). gcc will accept -mipsN
> alongside a MIPS N -march (e.g. -march=r4000 -mips3) otherwise you'll
> get an error.
>
> I guess what should happen depends on what you want --with-cpu to mean.
> If it gives a default argument for -march, then the original patch is
> OK, and an incompatible -mipsN would be an error. If (more generally)
> you want --with-cpu to specify a default architecture, then I guess
> -mips3 should override the default.
Well, the best I can do given the -mipsN situation... how does this
revision look to you? Configure only sets TARGET_DEFAULT_OPTION_CPU,
and the backend can do with it as it pleases.
--
Daniel Jacobowitz Carnegie Mellon University
MontaVista Software Debian GNU/Linux Developer
2002-07-31 Daniel Jacobowitz <drow@mvista.com>
* Makefile.in (DRIVER_DEFINES): Add @target_default_options@
* configure.in: Add @target_default_options@. Document --with-cpu
and --with-float.
* config.gcc: Reorganize $with_cpu logic. Set
target_default_options according to the default CPU, $with_cpu,
and $with_float.
* config/mips/mips.h (TARGET_HANDLE_DEFAULT_CPU)
(TARGET_HANDLE_DEFAULT_FLOAT): New macros.
* config/pa/pa.h (TARGET_HANDLE_DEFAULT_CPU): New macro.
* gcc.c (default_options, add_option, option_present): New
functions.
(process_command): Call default_options.
* doc/install.texi: Update --with-cpu documentation. Mention
--with-float.
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.919
diff -u -p -r1.919 Makefile.in
--- Makefile.in 29 Jul 2002 19:31:23 -0000 1.919
+++ Makefile.in 31 Jul 2002 14:32:04 -0000
@@ -1251,6 +1251,7 @@ c-dump.o : c-dump.c $(CONFIG_H) $(SYSTEM
# Language-independent files.
DRIVER_DEFINES = \
+ @target_default_options@ \
-DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
-DDEFAULT_TARGET_VERSION=\"$(version)\" \
Index: config.gcc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
retrieving revision 1.229
diff -u -p -r1.229 config.gcc
--- config.gcc 29 Jul 2002 22:21:40 -0000 1.229
+++ config.gcc 31 Jul 2002 14:32:06 -0000
@@ -2770,173 +2770,178 @@ case $machine in
;;
esac
-# Distinguish i[34567]86
-# Also, do not run mips-tfile on MIPS if using gas.
-# Process --with-cpu= for PowerPC/rs6000
-target_cpu_default2=
-case $machine in
-i486-*-*)
- target_cpu_default2=TARGET_CPU_DEFAULT_i486
- ;;
-i586-*-*)
- case $target_alias in
- k6_2-*)
- target_cpu_default2=TARGET_CPU_DEFAULT_k6_2
- ;;
- k6_3-*)
- target_cpu_default2=TARGET_CPU_DEFAULT_k6_3
- ;;
- k6-*)
- target_cpu_default2=TARGET_CPU_DEFAULT_k6
- ;;
- pentium_mmx-*)
- target_cpu_default2=TARGET_CPU_DEFAULT_pentium_mmx
- ;;
- *)
- target_cpu_default2=TARGET_CPU_DEFAULT_pentium
- ;;
- esac
- ;;
-i686-*-* | i786-*-*)
- case $target_alias in
- athlon_xp-*|athlon_mp-*|athlon_4-*)
- target_cpu_default2=TARGET_CPU_DEFAULT_athlon_sse
- ;;
- athlon_tbird-*|athlon-*)
- target_cpu_default2=TARGET_CPU_DEFAULT_athlon
- ;;
- pentium2-*)
- target_cpu_default2=TARGET_CPU_DEFAULT_pentium2
- ;;
- pentium3-*)
- target_cpu_default2=TARGET_CPU_DEFAULT_pentium3
- ;;
- pentium4-*)
- target_cpu_default2=TARGET_CPU_DEFAULT_pentium4
- ;;
- *)
- target_cpu_default2=TARGET_CPU_DEFAULT_pentiumpro
+if test x$pass2done = xyes
+then
+ case "x$with_cpu" in
+ xyes | xno)
+ echo "--with-cpu must be passed a value" 1>&2
+ exit 1
;;
esac
- ;;
-x86_64-*-*)
- # We should have hammer chip here, but it does not exist yet and
- # thus it is not supported. Athlon_SSE is probably equivalent feature
- # wise to hammer from our point of view except for 64bit mode.
- target_cpu_default2=TARGET_CPU_DEFAULT_athlon_sse
- ;;
-alpha*-*-*)
- case $machine in
- alphaev6[78]*)
- target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX|MASK_CIX"
- ;;
- alphaev6*)
- target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX"
- ;;
- alphapca56*)
- target_cpu_default2="MASK_CPU_EV5|MASK_BWX|MASK_MAX"
- ;;
- alphaev56*)
- target_cpu_default2="MASK_CPU_EV5|MASK_BWX"
+
+ # If there is no $with_cpu option, try to infer one from ${machine}.
+ if test x$with_cpu = x
+ then
+ case $machine in
+ i486-*-*)
+ with_cpu=i486
+ ;;
+ i586-*-*)
+ case $target_alias in
+ k6_2-*)
+ with_cpu=k6-2
+ ;;
+ k6_3-*)
+ with_cpu=k6-3
+ ;;
+ k6-*)
+ with_cpu=k6
+ ;;
+ pentium_mmx-*)
+ with_cpu=pentium-mmx
+ ;;
+ *)
+ with_cpu=pentium
+ ;;
+ esac
+ ;;
+ i686-*-* | i786-*-*)
+ case $target_alias in
+ athlon_xp-*|athlon_mp-*|athlon_4-*)
+ with_cpu=athlon-4
+ ;;
+ athlon_tbird-*|athlon-*)
+ with_cpu=athlon
+ ;;
+ pentium2-*)
+ with_cpu=pentium2
+ ;;
+ pentium3-*)
+ with_cpu=pentium3
+ ;;
+ pentium4-*)
+ with_cpu=pentium4
+ ;;
+ *)
+ with_cpu=pentiumpro
+ ;;
+ esac
+ ;;
+ x86_64-*-*)
+ # We should have hammer chip here, but it does not
+ # exist yet and thus it is not supported. Athlon_SSE
+ # is probably equivalent feature wise to hammer from
+ # our point of view except for 64bit mode.
+ with_cpu=athlon-sse
+ ;;
+ alpha*-*-*)
+ case $machine in
+ alphaev6[78]*)
+ with_cpu=ev67
+ ;;
+ alphaev6*)
+ with_cpu=ev6
+ ;;
+ alphapca56*)
+ with_cpu=pca56
+ ;;
+ alphaev56*)
+ with_cpu=ev56
+ ;;
+ alphaev5*)
+ with_cpu=ev5
+ ;;
+ esac
;;
- alphaev5*)
- target_cpu_default2="MASK_CPU_EV5"
+ sparc*-*-*)
+ with_cpu="`echo $machine | sed 's/-.*$//'`"
;;
- esac
+ esac
+ fi
- if test x$gas = xyes
- then
- if test "$target_cpu_default2" = ""
+ case "$machine" in
+ alpha*-*-*)
+ if test x$gas = xyes
then
- target_cpu_default2="MASK_GAS"
- else
- target_cpu_default2="${target_cpu_default2}|MASK_GAS"
+ if test "$target_cpu_default2" = ""
+ then
+ target_cpu_default2="MASK_GAS"
+ else
+ target_cpu_default2="${target_cpu_default2}|MASK_GAS"
+ fi
fi
- fi
- ;;
-arm*-*-*)
- case "x$with_cpu" in
- x)
- # The most generic
- target_cpu_default2="TARGET_CPU_generic"
- ;;
-
+ ;;
+ arm*-*-*)
+ # Start with the most generic.
+ target_cpu_default2="TARGET_CPU_generic"
# Distinguish cores, and major variants
# arm7m doesn't exist, but D & I don't affect code
+ case "x$with_cpu" in
xarm[236789] | xarm250 | xarm[67][01]0 \
| xarm7m | xarm7dm | xarm7dmi | xarm[79]tdmi \
| xarm7100 | xarm7500 | xarm7500fe | xarm810 \
| xxscale \
| xstrongarm | xstrongarm110 | xstrongarm1100)
- target_cpu_default2="TARGET_CPU_$with_cpu"
+ # OK
;;
- xyes | xno)
- echo "--with-cpu must be passed a value" 1>&2
+ *)
+ echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
exit 1
;;
-
- *)
- if test x$pass2done = xyes
+ esac
+ ;;
+ hppa*-*-* | parisc*-*-*)
+ if test x$gas = xyes
+ then
+ target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
+ fi
+ case $machine in
+ hppa1* | parisc1*)
+ with_cpu=7100LC
+ ;;
+ esac
+ ;;
+ mips*-*-*)
+ case $machine in
+ mips*-*-ecoff* | mips*-*-elf*)
+ if test x$gas = xyes
then
- echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
- exit 1
+ if test x$gnu_ld = xyes
+ then
+ target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
+ else
+ target_cpu_default2="MASK_GAS"
+ fi
fi
;;
- esac
- ;;
-
-hppa*-*-* | parisc*-*-*)
- if test x$gas = xyes
- then
- target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
- fi
- case $machine in
- hppa1* | parisc1*)
- tm_defines="TARGET_SCHED_DEFAULT=\\\"7100LC\\\""
- ;;
- esac
- ;;
-mips*-*-*)
- case $machine in
- mips*-*-ecoff* | mips*-*-elf*)
- if test x$gas = xyes
- then
- if test x$gnu_ld = xyes
+ mips*-*-*)
+ if test x$gas = xyes
then
- target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
- else
target_cpu_default2="MASK_GAS"
fi
- fi
- ;;
- mips*-*-*)
- if test x$gas = xyes
+ ;;
+ esac
+ case $machine in
+ mips*el-*-*)
+ tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
+ ;;
+ esac
+ if test "x$enable_gofast" = xyes
then
- target_cpu_default2="MASK_GAS"
+ tm_defines="INIT_SUBTARGET_OPTABS=INIT_GOFAST_OPTABS $tm_defines"
+ tm_file="gofast.h $tm_file"
+ tmake_file="mips/t-gofast $tmake_file"
+ else
+ tmake_file="mips/t-mips $tmake_file"
fi
;;
- esac
- case $machine in
- mips*el-*-*)
- tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
- ;;
- esac
- if test "x$enable_gofast" = xyes
- then
- tm_defines="INIT_SUBTARGET_OPTABS=INIT_GOFAST_OPTABS $tm_defines"
- tm_file="gofast.h $tm_file"
- tmake_file="mips/t-gofast $tmake_file"
- else
- tmake_file="mips/t-mips $tmake_file"
- fi
- ;;
-powerpc*-*-* | rs6000-*-*)
- if test x$enable_altivec = xyes
- then
- tm_file="$tm_file rs6000/altivec-defs.h"
- fi
- case "x$with_cpu" in
+ powerpc*-*-* | rs6000-*-*)
+ if test x$enable_altivec = xyes
+ then
+ tm_file="$tm_file rs6000/altivec-defs.h"
+ fi
+ case "x$with_cpu" in
x)
;;
@@ -2951,49 +2956,46 @@ powerpc*-*-* | rs6000-*-*)
target_cpu_default2="\\\"$with_cpu\\\""
;;
- xyes | xno)
- echo "--with-cpu must be passed a value" 1>&2
- exit 1
- ;;
-
*)
- if test x$pass2done = xyes
- then
- echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
- exit 1
- fi
- ;;
- esac
- c_target_objs="${c_target_objs} rs6000-c.o"
- cxx_target_objs="${cxx_target_objs} rs6000-c.o"
- tmake_file="${tmake_file} rs6000/t-rs6000-c-rule"
- ;;
-sparc*-*-*)
- case ".$with_cpu" in
- .)
- target_cpu_default2=TARGET_CPU_"`echo $machine | sed 's/-.*$//'`"
+ echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
+ exit 1
;;
+ esac
+ c_target_objs="${c_target_objs} rs6000-c.o"
+ cxx_target_objs="${cxx_target_objs} rs6000-c.o"
+ tmake_file="${tmake_file} rs6000/t-rs6000-c-rule"
+ ;;
+ sparc*-*-*)
+ case .$with_cpu in
.supersparc | .hypersparc | .ultrasparc | .v7 | .v8 | .v9)
target_cpu_default2="TARGET_CPU_$with_cpu"
;;
*)
- if test x$pass2done = xyes
- then
- echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
- exit 1
- fi
+ echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
+ exit 1
;;
+ esac
+ ;;
esac
- ;;
-esac
-if test "$target_cpu_default2" != ""
-then
- if test "$target_cpu_default" != ""
+ if test x$with_cpu != x
+ then
+ target_default_options="-DTARGET_DEFAULT_OPTION_CPU=$with_cpu"
+ fi
+
+ if test -n "$with_float"
then
- target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
- else
- target_cpu_default=$target_cpu_default2
+ target_default_options="${target_default_options} -DTARGET_DEFAULT_OPTION_FLOAT=\"$with_float\""
+ fi
+
+ if test "$target_cpu_default2" != ""
+ then
+ if test "$target_cpu_default" != ""
+ then
+ target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
+ else
+ target_cpu_default=$target_cpu_default2
+ fi
fi
fi
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.in,v
retrieving revision 1.612
diff -u -p -r1.612 configure.in
--- configure.in 29 Jul 2002 22:07:27 -0000 1.612
+++ configure.in 31 Jul 2002 14:32:15 -0000
@@ -136,6 +136,14 @@ AC_ARG_WITH(elf,
elf="$with_elf",
elf=no)
+# With a particular CPU
+AC_ARG_WITH(cpu,
+[ --with-cpu default to the specified CPU],,)
+
+# Default floating-point setting
+AC_ARG_WITH(float,
+[ --with-float default to the specified type of floating point],,)
+
# Specify the local prefix
local_prefix=
AC_ARG_WITH(local-prefix,
@@ -2694,6 +2702,7 @@ AC_SUBST(target_alias)
AC_SUBST(c_target_objs)
AC_SUBST(cxx_target_objs)
AC_SUBST(target_cpu_default)
+AC_SUBST(target_default_options)
AC_SUBST_FILE(target_overrides)
AC_SUBST_FILE(host_overrides)
Index: gcc.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gcc.c,v
retrieving revision 1.331
diff -u -p -r1.331 gcc.c
--- gcc.c 25 Jul 2002 18:48:42 -0000 1.331
+++ gcc.c 31 Jul 2002 14:32:21 -0000
@@ -990,6 +990,82 @@ static const struct option_map option_ma
};
+static int option_present PARAMS ((int, const char *const *, const char *));
+static void add_option PARAMS ((int *, const char *const **, const char *));
+static void default_options PARAMS ((int *, const char *const **));
+
+static int
+option_present (argc, argv, option)
+ int argc;
+ const char *const *argv;
+ const char *option;
+{
+ int i;
+ int len;
+
+ len = strlen (option);
+
+ for (i = 0; i < argc; i++)
+ if (option[len - 1] == '=')
+ {
+ if (strncmp (argv[i], option, len) == 0)
+ return 1;
+ }
+ else
+ {
+ if (strcmp (argv[i], option) == 0)
+ return 1;
+ }
+
+ return 0;
+}
+
+static void
+add_option (argcp, argvp, option)
+ int *argcp;
+ const char *const **argvp;
+ const char *option;
+{
+ const char **newargv = (const char **) xmalloc ((*argcp + 2) * sizeof (char *));
+ int i;
+
+ newargv[0] = (*argvp)[0];
+ newargv[1] = option;
+ for (i = 1; i < *argcp; i++)
+ newargv[i + 1] = (*argvp)[i];
+ newargv[i + 1] = NULL;
+
+ *argvp = newargv;
+ (*argcp)++;
+}
+
+static void
+default_options (argcp, argvp)
+ int *argcp ATTRIBUTE_UNUSED;
+ const char *const **argvp ATTRIBUTE_UNUSED;
+{
+#ifdef TARGET_DEFAULT_OPTION_CPU
+# ifdef TARGET_HANDLE_DEFAULT_CPU
+ TARGET_HANDLE_DEFAULT_CPU (TARGET_DEFAULT_OPTION_CPU);
+# else
+ if (! option_present (*argcp, *argvp, "-mcpu="))
+ add_option (argcp, argvp, "-mcpu=" XSTRING (TARGET_DEFAULT_OPTION_CPU));
+# endif
+#endif
+
+#ifdef TARGET_DEFAULT_OPTION_FLOAT
+# ifdef TARGET_HANDLE_DEFAULT_CPU
+ TARGET_HANDLE_DEFAULT_FLOAT (TARGET_DEFAULT_OPTION_FLOAT);
+# else
+ /* Add other mutually exclusive floating point options as necessary. */
+ if (! option_present (*argcp, *argvp, "-msoft-float")
+ && ! option_present (*argcp, *argvp, "-mhard-float"))
+ add_option (argcp, argvp, "-m" XSTRING (TARGET_DEFAULT_OPTION_FLOAT) "-float");
+# endif
+#endif
+}
+
+
#ifdef TARGET_OPTION_TRANSLATE_TABLE
static const struct {
const char *const option_found;
@@ -3374,6 +3450,9 @@ process_command (argc, argv)
/* Convert new-style -- options to old-style. */
translate_options (&argc, &argv);
+
+ /* Add any default options. */
+ default_options (&argc, &argv);
/* Do language-specific adjustment/addition of flags. */
lang_specific_driver (&argc, &argv, &added_libraries);
Index: config/mips/mips.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/mips.h,v
retrieving revision 1.205
diff -u -p -r1.205 mips.h
--- config/mips/mips.h 30 Jul 2002 19:08:23 -0000 1.205
+++ config/mips/mips.h 31 Jul 2002 14:32:37 -0000
@@ -737,6 +737,25 @@ extern void sbss_section PARAMS ((void)
N_("Specify cache flush function")}, \
}
+/* This is not quite correct, because -mips16 will override a default
+ architecture. This is an unfortunate consequence of -mips16 being
+ completely orthogonal to the other -mipsN switches, yet sometimes
+ overriding them on the command line. */
+#define TARGET_HANDLE_DEFAULT_CPU(CPU) do { \
+ if (! option_present (*argcp, *argvp, "-march=") \
+ && ! option_present (*argcp, *argvp, "-mips")) \
+ add_option (argcp, argvp, "-march=" XSTRING (CPU)); \
+ if (! option_present (*argcp, *argvp, "-mtune=")) \
+ add_option (argcp, argvp, "-mtune=" XSTRING (CPU)); \
+} while (0)
+
+#define TARGET_HANDLE_DEFAULT_FLOAT(FLOAT) do { \
+ if (! option_present (*argcp, *argvp, "-msoft-float") \
+ && ! option_present (*argcp, *argvp, "-mhard-float") \
+ && ! option_present (*argcp, *argvp, "-msingle-float")) \
+ add_option (argcp, argvp, "-m" XSTRING (FLOAT) "-float"); \
+} while (0)
+
/* This is meant to be redefined in the host dependent files. */
#define SUBTARGET_TARGET_OPTIONS
Index: config/pa/pa.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/pa/pa.h,v
retrieving revision 1.165
diff -u -p -r1.165 pa.h
--- config/pa/pa.h 18 Jul 2002 18:18:26 -0000 1.165
+++ config/pa/pa.h 31 Jul 2002 14:32:39 -0000
@@ -218,6 +218,11 @@ extern int target_flags;
{ "arch=", &pa_arch_string, "Specify architecture for code generation. Values are 1.0, 1.1, and 2.0. 2.0 requires gas snapshot 19990413 or later." }\
}
+#define TARGET_HANDLE_DEFAULT_CPU(CPU) do { \
+ if (! option_present (*argcp, *argvp, "-mschedule=")) \
+ add_option (argcp, argvp, "-mschedule=" XSTRING (CPU)); \
+} while (0)
+
/* Specify the dialect of assembler to use. New mnemonics is dialect one
and the old mnemonics are dialect zero. */
#define ASSEMBLER_DIALECT (TARGET_PA_20 ? 1 : 0)
Index: doc/install.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/doc/install.texi,v
retrieving revision 1.128
diff -u -p -r1.128 install.texi
--- doc/install.texi 30 Jun 2002 19:27:48 -0000 1.128
+++ doc/install.texi 31 Jul 2002 14:32:42 -0000
@@ -672,10 +672,15 @@ Microsoft Win32 API thread support.
@item --with-cpu=@var{cpu}
Specify which cpu variant the
compiler should generate code for by default. This is currently
-only supported on the some ports, specifically arm, powerpc, and
+only supported on some ports, including arm, i386, powerpc, MIPS, PA, and
SPARC@. If configure does not recognize the model name (e.g.@: arm700,
603e, or ultrasparc) you provide, please check the configure script
for a complete list of supported models.
+
+@item --with-float=@var{type}
+Specify the default form of floating point. The normal choices are ``hard''
+and ``soft''. Which (if any) choices are recognized depends on the port;
+for instance, MIPS also recognizes ``single''.
@item --enable-altivec
Specify that the target supports AltiVec vector enhancements. This