aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog10
-rw-r--r--gcc/config/mips/mips-protos.h1
-rw-r--r--gcc/config/mips/mips.c11
-rw-r--r--gcc/config/mips/mips.h4
4 files changed, 18 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a0ff15a..b498e0a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-22 Anatoly Sokolov <aesok@post.ru>
+
+ * config/mips/mips.c (mips_override_options): Rename to...
+ (mips_option_override): ...this. Make static.
+ (TARGET_OPTION_OVERRIDE): Define.
+ (mips_in_small_data_p): Update comment.
+ * config/mips/mips.h (OVERRIDE_OPTIONS): Remove.
+ (FIXED_REGISTERS): Update comment.
+ * config/mips/mips-protos.h (mips_override_options): Remove.
+
2010-08-21 Olivier Hainque <hainque@adacore.com>
* config/rs6000/vxworks.h (TARGET_OS_CPP_BUILTINS): Define __PPC__.
diff --git a/gcc/config/mips/mips-protos.h b/gcc/config/mips/mips-protos.h
index 71b59fe..6302c3a 100644
--- a/gcc/config/mips/mips-protos.h
+++ b/gcc/config/mips/mips-protos.h
@@ -253,7 +253,6 @@ extern bool mips_expand_ext_as_unaligned_load (rtx, rtx, HOST_WIDE_INT,
extern bool mips_expand_ins_as_unaligned_store (rtx, rtx, HOST_WIDE_INT,
HOST_WIDE_INT);
extern bool mips_mem_fits_mode_p (enum machine_mode mode, rtx x);
-extern void mips_override_options (void);
extern void mips_conditional_register_usage (void);
extern void mips_order_regs_for_local_alloc (void);
extern HOST_WIDE_INT mips_debugger_offset (rtx, HOST_WIDE_INT);
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 2473219..e3df236 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -7773,7 +7773,7 @@ mips_in_small_data_p (const_tree decl)
/* We don't yet generate small-data references for -mabicalls
or VxWorks RTP code. See the related -G handling in
- mips_override_options. */
+ mips_option_override. */
if (TARGET_ABICALLS || TARGET_VXWORKS_RTP)
return false;
@@ -15469,10 +15469,10 @@ mips_handle_option (size_t code, const char *arg, int value)
}
}
-/* Implement OVERRIDE_OPTIONS. */
+/* Implement TARGET_OPTION_OVERRIDE. */
-void
-mips_override_options (void)
+static void
+mips_option_override (void)
{
int i, start, regno, mode;
@@ -16344,6 +16344,9 @@ void mips_function_profiler (FILE *file)
#undef TARGET_ASM_ALIGNED_DI_OP
#define TARGET_ASM_ALIGNED_DI_OP "\t.dword\t"
+#undef TARGET_OPTION_OVERRIDE
+#define TARGET_OPTION_OVERRIDE mips_option_override
+
#undef TARGET_LEGITIMIZE_ADDRESS
#define TARGET_LEGITIMIZE_ADDRESS mips_legitimize_address
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index e30d03e..c5519b0 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -1073,8 +1073,6 @@ enum mips_code_readable_setting {
#define SWITCH_TAKES_ARG(CHAR) \
(DEFAULT_SWITCH_TAKES_ARG (CHAR) || (CHAR) == 'G')
-#define OVERRIDE_OPTIONS mips_override_options ()
-
#define CONDITIONAL_REGISTER_USAGE mips_conditional_register_usage ()
/* Show we can debug even without a frame pointer. */
@@ -1521,7 +1519,7 @@ enum mips_code_readable_setting {
Regarding coprocessor registers: without evidence to the contrary,
it's best to assume that each coprocessor register has a unique
- use. This can be overridden, in, e.g., mips_override_options or
+ use. This can be overridden, in, e.g., mips_option_override or
CONDITIONAL_REGISTER_USAGE should the assumption be inappropriate
for a particular target. */