Patchwork Deal with #ident without

login
register
mail settings
Submitter Steven Bosscher
Date June 20, 2012, 7:08 a.m.
Message ID <CABu31nNOWRUNOh9_9yh33yjiBQ-E3d+jKs0Jfw8ySVEMPGX7YQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/165897/
State New
Headers show

Comments

Steven Bosscher - June 20, 2012, 7:08 a.m.
On Wed, Jun 20, 2012 at 2:21 AM, Hans-Peter Nilsson <hp@bitrange.com> wrote:
> On Tue, 19 Jun 2012, Steven Bosscher wrote:
>> I've now committed this, see r188791.
>
> Breaking cris-elf.  Just try rebuilding cc1:
> ...../gcc/gcc/../libdecnumber/dpd -I../libdecnumber    \
>                /tmp/hpautotest-gcc1/gcc/gcc/config/cris/cris.c -o cris.o
> /tmp/hpautotest-gcc1/gcc/gcc/config/cris/cris.c: In function 'cris_asm_output_ident':
> /tmp/hpautotest-gcc1/gcc/gcc/config/cris/cris.c:2480: error: 'cgraph_state' undeclared (first use in this function)
> /tmp/hpautotest-gcc1/gcc/gcc/config/cris/cris.c:2480: error: (Each undeclared identifier is reported only once
> /tmp/hpautotest-gcc1/gcc/gcc/config/cris/cris.c:2480: error: for each function it appears in.)
> /tmp/hpautotest-gcc1/gcc/gcc/config/cris/cris.c:2480: error: 'CGRAPH_STATE_PARSING' undeclared (first use in this funct\
> ion)
> /tmp/hpautotest-gcc1/gcc/gcc/config/cris/cris.c:2478: warning: unused variable 'buf'
> /tmp/hpautotest-gcc1/gcc/gcc/config/cris/cris.c:2477: warning: unused variable 'size'
> /tmp/hpautotest-gcc1/gcc/gcc/config/cris/cris.c:2476: warning: unused variable 'section_asm_op'
> /tmp/hpautotest-gcc1/gcc/gcc/config/cris/cris.c: In function 'cris_option_override':
> /tmp/hpautotest-gcc1/gcc/gcc/config/cris/cris.c:2538: error: 'flag_no_gcc_ident' undeclared (first use in this function\
> )
> make[2]: *** [cris.o] Error 1

Grr. A merge f*ck-up. This was in my testing tree on the compile farm
but not in the patch I committed:


I'm building a cross to cris-elf now, to be sure, and I'll commit this
ASAP after that.

Sorry for this...

Ciao!
Steven

Patch

Index: config/cris/cris.c
===================================================================
--- config/cris/cris.c	(revision 188808)
+++ config/cris/cris.c	(working copy)
@@ -47,6 +47,7 @@  along with GCC; see the file COPYING3.
 #include "optabs.h"
 #include "df.h"
 #include "opts.h"
+#include "cgraph.h"

 /* Usable when we have an amount to add or subtract, and want the
    optimal size of the insn.  */
@@ -2533,10 +2534,6 @@  cris_asm_output_case_end (FILE *stream,
 static void
 cris_option_override (void)
 {
-  /* We don't want an .ident for gcc.
-     It isn't really clear anymore why not.  */
-  flag_no_gcc_ident = true;
-
   if (cris_max_stackframe_str)
     {
       cris_max_stackframe = atoi (cris_max_stackframe_str);