Hi,

On 2020/3/9 下午10:32, Segher Boessenkool wrote:
Hi!

On Mon, Mar 09, 2020 at 01:58:01PM +0800, binbin wrote:
2020-03-09  Bin Bin Lv  <s...@linux.ibm.com>

        * config/rs6000/rs6000-internal.h (altivec_builtin_mask_for_load,
        builtin_mode_to_type[MAX_MACHINE_MODE][2]): Remove the declaration.

Just write "builtin_mode_to_type", nothing []?  Writing down the
dimensions here doesn't add anything, just is a bit noisy: you normally
put just the name here.

OK, modified.  Thanks.


        * config/rs6000/rs6000.c (altivec_builtin_mask_for_load,
        builtin_mode_to_type[MAX_MACHINE_MODE][2]): Remove the GTY(())
        declaration and add the definition.

The definitions were already there, so lose the second part of this?

OK, removed.  Thanks.


diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 1697186..724085b 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -2490,6 +2490,8 @@ extern GTY(()) tree rs6000_builtin_types[RS6000_BTI_MAX];
  extern GTY(()) tree rs6000_builtin_decls[RS6000_BUILTIN_COUNT];
#ifndef USED_FOR_TARGET
+extern GTY(()) tree builtin_mode_to_type[MAX_MACHINE_MODE][2];
+extern GTY(()) tree altivec_builtin_mask_for_load;

Add a newline here please?

OK, added a newline.  Thanks.


  /* A C structure for machine-specific, per-function data.
     This is added to the cfun structure.  */
  typedef struct GTY(()) machine_function

Okay for trunk with those tweaks.  Thanks!


Segher

gcc/ChangeLog

2020-03-10  Bin Bin Lv  <s...@linux.ibm.com>

        * config/rs6000/rs6000-internal.h (altivec_builtin_mask_for_load,
        builtin_mode_to_type): Remove the declaration.
        * config/rs6000/rs6000.h (altivec_builtin_mask_for_load,
        builtin_mode_to_type): Add an extern GTY(()) declaration.
        * config/rs6000/rs6000.c (altivec_builtin_mask_for_load,
        builtin_mode_to_type): Remove the GTY(()) declaration.
---
 gcc/config/rs6000/rs6000-internal.h | 2 --
 gcc/config/rs6000/rs6000.c          | 4 ++--
 gcc/config/rs6000/rs6000.h          | 3 +++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gcc/config/rs6000/rs6000-internal.h 
b/gcc/config/rs6000/rs6000-internal.h
index a23e956..d331b9e 100644
--- a/gcc/config/rs6000/rs6000-internal.h
+++ b/gcc/config/rs6000/rs6000-internal.h
@@ -187,7 +187,5 @@ extern bool rs6000_passes_long_double;
 extern bool rs6000_passes_vector;
 extern bool rs6000_returns_struct;
 extern bool cpu_builtin_p;
-extern GTY(()) tree builtin_mode_to_type[MAX_MACHINE_MODE][2];
-extern GTY(()) tree altivec_builtin_mask_for_load;
 
 #endif
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 9910b27..0faf44b 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -99,7 +99,7 @@
 #endif
 
 /* Support targetm.vectorize.builtin_mask_for_load.  */
-GTY(()) tree altivec_builtin_mask_for_load;
+tree altivec_builtin_mask_for_load;
 
 #ifdef USING_ELFOS_H
 /* Counter for labels which are to be placed in .fixup.  */
@@ -196,7 +196,7 @@ enum reg_class rs6000_constraints[RS6000_CONSTRAINT_MAX];
 int rs6000_vector_align[NUM_MACHINE_MODES];
 
 /* Map selected modes to types for builtins.  */
-GTY(()) tree builtin_mode_to_type[MAX_MACHINE_MODE][2];
+tree builtin_mode_to_type[MAX_MACHINE_MODE][2];
 
 /* What modes to automatically generate reciprocal divide estimate (fre) and
    reciprocal sqrt (frsqrte) for.  */
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 1697186..79b3dd6 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -2490,6 +2490,9 @@ extern GTY(()) tree rs6000_builtin_types[RS6000_BTI_MAX];
 extern GTY(()) tree rs6000_builtin_decls[RS6000_BUILTIN_COUNT];
 
 #ifndef USED_FOR_TARGET
+extern GTY(()) tree builtin_mode_to_type[MAX_MACHINE_MODE][2];
+extern GTY(()) tree altivec_builtin_mask_for_load;
+
 /* A C structure for machine-specific, per-function data.
    This is added to the cfun structure.  */
 typedef struct GTY(()) machine_function
-- 
1.8.3.1

Reply via email to