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]

m68k assembler options


When I revamped the m68k assembler option handling a while back, I made it quite picky about using multiple different -mcpu or -march options. Unfortunately that's now bitten me on the bum, so I'd like to remove it, in line with other architectures (IIUC).

ok?

nathan
--
Nathan Sidwell    ::   http://www.codesourcery.com   ::         CodeSourcery

2008-07-03  Nathan Sidwell  <nathan@codesourcery.com>

	* config/tc-m68k.c (m68k_set_cpu, m68k_set_arch): Don't complain
	about overriding an earlier setting.

Index: config/tc-m68k.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-m68k.c,v
retrieving revision 1.102
diff -c -3 -p -r1.102 tc-m68k.c
*** config/tc-m68k.c	28 Mar 2008 09:51:13 -0000	1.102
--- config/tc-m68k.c	3 Jul 2008 12:22:10 -0000
*************** m68k_lookup_cpu (const char *arg, const 
*** 7229,7235 ****
    return 0;
  }
  
! /* Set the cpu, issuing errors if it is unrecognized, or invalid */
  
  static int
  m68k_set_cpu (char const *name, int allow_m, int silent)
--- 7229,7235 ----
    return 0;
  }
  
! /* Set the cpu, issuing errors if it is unrecognized.  */
  
  static int
  m68k_set_cpu (char const *name, int allow_m, int silent)
*************** m68k_set_cpu (char const *name, int allo
*** 7244,7261 ****
  	as_bad (_("cpu `%s' unrecognized"), name);
        return 0;
      }
-       
-   if (selected_cpu && selected_cpu != cpu)
-     {
-       as_bad (_("already selected `%s' processor"),
- 	      selected_cpu->name);
-       return 0;
-     }
    selected_cpu = cpu;
    return 1;
  }
  
! /* Set the architecture, issuing errors if it is unrecognized, or invalid */
  
  static int
  m68k_set_arch (char const *name, int allow_m, int silent)
--- 7244,7254 ----
  	as_bad (_("cpu `%s' unrecognized"), name);
        return 0;
      }
    selected_cpu = cpu;
    return 1;
  }
  
! /* Set the architecture, issuing errors if it is unrecognized.  */
  
  static int
  m68k_set_arch (char const *name, int allow_m, int silent)
*************** m68k_set_arch (char const *name, int all
*** 7270,7283 ****
  	as_bad (_("architecture `%s' unrecognized"), name);
        return 0;
      }
-       
-   if (selected_arch && selected_arch != arch)
-     {
-       as_bad (_("already selected `%s' architecture"),
- 	      selected_arch->name);
-       return 0;
-     }
-   
    selected_arch = arch;
    return 1;
  }
--- 7263,7268 ----

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