Re: [BUILDROBOT][PATCH] ppc{,64}-linux broken (IPA C++ refactoring 4/N)

[Martin Liška]

On 08/25/2014 05:29 PM, Jan-Benedict Glaw wrote:
Hi!
Your recent change left one cgraph_state in place in the rs6000
backend, resulting in (see
http://toolchain.lug-owl.de/buildbot/show_build_details.php?id=346638
and
http://toolchain.lug-owl.de/buildbot/show_build_details.php?id=346630):

g++ -c   -g -O2 -DIN_GCC  -DCROSS_DIRECTORY_STRUCTURE  -fno-exceptions 
-fno-rtti -fasynchronous-unwind-tables -W -Wall -Wwrite-strings -Wcast-qual 
-Wmissing-format-attribute -Woverloaded-virtual -pedantic -Wno-long-long 
-Wno-variadic-macros -Wno-overlength-strings -fno-common  -DHAVE_CONFIG_H -I. 
-I. -I/home/jbglaw/repos/gcc/gcc -I/home/jbglaw/repos/gcc/gcc/. 
-I/home/jbglaw/repos/gcc/gcc/../include 
-I/home/jbglaw/repos/gcc/gcc/../libcpp/include  
-I/home/jbglaw/repos/gcc/gcc/../libdecnumber 
-I/home/jbglaw/repos/gcc/gcc/../libdecnumber/dpd -I../libdecnumber 
-I/home/jbglaw/repos/gcc/gcc/../libbacktrace    -o rs6000.o -MT rs6000.o -MMD 
-MP -MF ./.deps/rs6000.TPo /home/jbglaw/repos/gcc/gcc/config/rs6000/rs6000.c
/home/jbglaw/repos/gcc/gcc/config/rs6000/rs6000.c: In function ‘bool 
call_ABI_of_interest(tree_node*)’:
/home/jbglaw/repos/gcc/gcc/config/rs6000/rs6000.c:9057: error: ‘cgraph_state’ 
was not declared in this scope
/home/jbglaw/repos/gcc/gcc/config/rs6000/rs6000.c:9057: error: 
‘CGRAPH_STATE_EXPANSION’ was not declared in this scope
/home/jbglaw/repos/gcc/gcc/config/rs6000/rs6000.c: In function ‘tree_node* 
rs6000_handle_longcall_attribute(tree_node**, tree_node*, tree_node*, int, 
bool*)’:
/home/jbglaw/repos/gcc/gcc/config/rs6000/rs6000.c:28517: warning: unknown 
conversion type character ‘E’ in format
/home/jbglaw/repos/gcc/gcc/config/rs6000/rs6000.c:28517: warning: too many 
arguments for format
/home/jbglaw/repos/gcc/gcc/config/rs6000/rs6000.c: In function ‘tree_node* 
rs6000_handle_struct_attribute(tree_node**, tree_node*, tree_node*, int, 
bool*)’:
/home/jbglaw/repos/gcc/gcc/config/rs6000/rs6000.c:28590: warning: unknown 
conversion type character ‘E’ in format
/home/jbglaw/repos/gcc/gcc/config/rs6000/rs6000.c:28590: warning: too many 
arguments for format
/home/jbglaw/repos/gcc/gcc/config/rs6000/rs6000.c:28600: warning: unknown 
conversion type character ‘E’ in format
/home/jbglaw/repos/gcc/gcc/config/rs6000/rs6000.c:28600: warning: too many 
arguments for format
make[1]: *** [rs6000.o] Error 1

Hello Jan-Benedict,
   thank you for the fallout fix. Even though I tested all back-ends, I 
am unable to build a cross-compiler:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61974.

Thanks,
Martin




This should fix it, ok to apply?


2014-08.25  Jan-Benedict Glaw  <jbg...@lug-owl.de>

        * config/rs6000/rs6000.c (rs6000_return_in_msb): Fix fallout from
        cgraph_state conversion.
  
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 00fa070..225f21e 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -9054,7 +9054,7 @@ rs6000_return_in_msb (const_tree valtype)
  static bool
  call_ABI_of_interest (tree fndecl)
  {
-  if (cgraph_state == CGRAPH_STATE_EXPANSION)
+  if (symtab->state == EXPANSION)
      {
        struct cgraph_node *c_node;