This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

RE: [PATCH][MIPS] file_mips_xxx consolidation


Richard Sandiford <rdsandiford@googlemail.com> writes:
> Matthew Fortune <Matthew.Fortune@imgtec.com> writes:
> > Do you want the change to use a new FPR_SIZE macro to follow on
> > from this?
> 
> Yeah, I think it makes sense to do that separately from this patch.
> 
> Just one minor nit:
> 
> > @@ -18027,8 +18024,8 @@ mips_parse_cpu (const char *option, const char
> *cpu_string)
> >        if (ABI_NEEDS_64BIT_REGS (mips_abi))
> >  	return mips_cpu_info_from_isa (ISA_MIPS3);
> >
> > -      if (file_mips_gp32 >= 0)
> > -	return mips_cpu_info_from_isa (file_mips_gp32 ? ISA_MIPS1 :
> ISA_MIPS3);
> > +      if (file_mips_opts.gp32 >= 0)
> > +	return mips_cpu_info_from_isa (file_mips_opts.gp32 ? ISA_MIPS1 :
> ISA_MIPS3);
> >
> >        return mips_cpu_info_from_isa (MIPS_DEFAULT_64BIT
> >  				     ? ISA_MIPS3
> 
> This line is now longer than 80 chars so please break before "?" or ":".
> 
> OK with that change, thanks.

Committed. I'm afraid I had to do a follow-up commit as I tested the wrong
source and missed the interaction with Andrew's mips[32|64]r[35] patch,
sorry.

Regards,
Matthew

gas/
	* config/tc-mips.c (md_parse_option): Update missed file_mips_isa
	references.
---
 gas/ChangeLog        |    5 +++++
 gas/config/tc-mips.c |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 85f90a5..737f047 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
 2014-05-08  Matthew Fortune  <matthew.fortune@imgtec.com>
 
+	* config/tc-mips.c (md_parse_option): Update missed file_mips_isa
+	references.
+
+2014-05-08  Matthew Fortune  <matthew.fortune@imgtec.com>
+
 	* config/tc-mips.c (mips_set_options): Rename fp32 field to fp.
 	Update fp32 == 0 to fp == 64 and fp32 == 1 to fp != 64 throughout.
 	(file_mips_gp32, file_mips_fp32, file_mips_soft_float,
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 6e77273..12e9792 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -13573,11 +13573,11 @@ md_parse_option (int c, char *arg)
       break;
 
     case OPTION_MIPS32R3:
-      file_mips_isa = ISA_MIPS32R3;
+      file_mips_opts.isa = ISA_MIPS32R3;
       break;
 
     case OPTION_MIPS32R5:
-      file_mips_isa = ISA_MIPS32R5;
+      file_mips_opts.isa = ISA_MIPS32R5;
       break;
 
     case OPTION_MIPS64R2:
@@ -13585,11 +13585,11 @@ md_parse_option (int c, char *arg)
       break;
 
     case OPTION_MIPS64R3:
-      file_mips_isa = ISA_MIPS64R3;
+      file_mips_opts.isa = ISA_MIPS64R3;
       break;
 
     case OPTION_MIPS64R5:
-      file_mips_isa = ISA_MIPS64R5;
+      file_mips_opts.isa = ISA_MIPS64R5;
       break;
 
     case OPTION_MIPS64:
-- 
1.7.1


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]