Patchwork [avr,committed] Fix PR target/56445

login
register
mail settings
Submitter Georg-Johann Lay
Date Feb. 28, 2013, 9:22 a.m.
Message ID <512F21BC.6020007@gjlay.de>
Download mbox | patch
Permalink /patch/223841/
State New
Headers show

Comments

Georg-Johann Lay - Feb. 28, 2013, 9:22 a.m.
http://gcc.gnu.org/r196332

This is obvious fix for problem with empty macro parameter.
Instead of an empty parameter, 'n' is used.

Johann


	PR target/56445
	* config/avr/avr.c (avr_init_builtins): Use 'n' instead of empty
	macro parameters with: FX_FTYPE_FX, FX_FTYPE_FX_INT, INT_FTYPE_FX,
	INTX_FTYPE_FX, FX_FTYPE_INTX.
	* config/avr/builtins.def: Adjust respective DEF_BUILTIN.

Patch

Index: config/avr/builtins.def
===================================================================
--- config/avr/builtins.def	(revision 196331)
+++ config/avr/builtins.def	(revision 196332)
@@ -62,78 +62,78 @@  DEF_BUILTIN (FLASH_SEGMENT, 1, char_ftyp
 /* 7.18a.6.2 The fixed-point absolute value functions. */
 
 DEF_BUILTIN (ABSHR,   1, hr_ftype_hr,   ssabsqq2, "__ssabs_1")
-DEF_BUILTIN (ABSR,    1, r_ftype_r,     ssabshq2, "__ssabs_2")
+DEF_BUILTIN (ABSR,    1, nr_ftype_nr,   ssabshq2, "__ssabs_2")
 DEF_BUILTIN (ABSLR,   1, lr_ftype_lr,   ssabssq2, "__ssabs_4")
 DEF_BUILTIN (ABSLLR, -1, llr_ftype_llr, nothing,  "__ssabsdq2") // GCC extension
 
 DEF_BUILTIN (ABSHK,   1, hk_ftype_hk,   ssabsha2, "__ssabs_2")
-DEF_BUILTIN (ABSK,    1, k_ftype_k,     ssabssa2, "__ssabs_4")
+DEF_BUILTIN (ABSK,    1, nk_ftype_nk,   ssabssa2, "__ssabs_4")
 DEF_BUILTIN (ABSLK,  -1, lk_ftype_lk,   nothing,  "__ssabsda2")
 DEF_BUILTIN (ABSLLK, -1, llk_ftype_llk, nothing,  "__ssabsta2") // GCC extension
 
 /* 7.18a.6.3 The fixed-point round functions. */
 
 DEF_BUILTIN (ROUNDHR,    2, hr_ftype_hr_int,     roundqq3,  "__roundhr")
-DEF_BUILTIN (ROUNDR,     2, r_ftype_r_int,       roundhq3,  "__roundr")
+DEF_BUILTIN (ROUNDR,     2, nr_ftype_nr_int,     roundhq3,  "__roundr")
 DEF_BUILTIN (ROUNDLR,    2, lr_ftype_lr_int,     roundsq3,  "__roundlr")
 DEF_BUILTIN (ROUNDLLR,  -1, llr_ftype_llr_int,   nothing,   "__rounddq3") // GCC extension
 
 DEF_BUILTIN (ROUNDUHR,   2, uhr_ftype_uhr_int,   rounduqq3, "__rounduhr")
-DEF_BUILTIN (ROUNDUR,    2, ur_ftype_ur_int,     rounduhq3, "__roundur")
+DEF_BUILTIN (ROUNDUR,    2, unr_ftype_unr_int,   rounduhq3, "__roundur")
 DEF_BUILTIN (ROUNDULR,   2, ulr_ftype_ulr_int,   roundusq3, "__roundulr")
 DEF_BUILTIN (ROUNDULLR, -1, ullr_ftype_ullr_int, nothing,   "__roundudq3") // GCC extension
 
 DEF_BUILTIN (ROUNDHK,    2, hk_ftype_hk_int,     roundha3,  "__roundhk")
-DEF_BUILTIN (ROUNDK,     2, k_ftype_k_int,       roundsa3,  "__roundk")
+DEF_BUILTIN (ROUNDK,     2, nk_ftype_nk_int,     roundsa3,  "__roundk")
 DEF_BUILTIN (ROUNDLK,   -1, lk_ftype_lk_int,     nothing,   "__roundda3")
 DEF_BUILTIN (ROUNDLLK,  -1, llk_ftype_llk_int,   nothing,   "__roundta3") // GCC extension
 
 DEF_BUILTIN (ROUNDUHK,   2, uhk_ftype_uhk_int,   rounduha3, "__rounduhk")
-DEF_BUILTIN (ROUNDUK,    2, uk_ftype_uk_int,     roundusa3, "__rounduk")
+DEF_BUILTIN (ROUNDUK,    2, unk_ftype_unk_int,   roundusa3, "__rounduk")
 DEF_BUILTIN (ROUNDULK,  -1, ulk_ftype_ulk_int,   nothing,   "__rounduda3")
 DEF_BUILTIN (ROUNDULLK, -1, ullk_ftype_ullk_int, nothing,   "__rounduta3") // GCC extension
 
 /* 7.18a.6.4 The fixed-point bit countls functions. */
 
 DEF_BUILTIN (COUNTLSHR,   -1, int_ftype_hr,   nothing, "__countlsqi2")
-DEF_BUILTIN (COUNTLSR,    -1, int_ftype_r,    nothing, "__countlshi2")
+DEF_BUILTIN (COUNTLSR,    -1, int_ftype_nr,   nothing, "__countlshi2")
 DEF_BUILTIN (COUNTLSLR,   -1, int_ftype_lr,   nothing, "__countlssi2")
 DEF_BUILTIN (COUNTLSLLR,  -1, int_ftype_llr,  nothing, "__countlsdi2") // GCC extension
 
 DEF_BUILTIN (COUNTLSUHR,  -1, int_ftype_uhr,  nothing, "__countlsuqi2")
-DEF_BUILTIN (COUNTLSUR,   -1, int_ftype_ur,   nothing, "__countlsuhi2")
+DEF_BUILTIN (COUNTLSUR,   -1, int_ftype_unr,  nothing, "__countlsuhi2")
 DEF_BUILTIN (COUNTLSULR,  -1, int_ftype_ulr,  nothing, "__countlsusi2")
 DEF_BUILTIN (COUNTLSULLR, -1, int_ftype_ullr, nothing, "__countlsudi2") // GCC extension
 
 DEF_BUILTIN (COUNTLSHK,   -1, int_ftype_hk,   nothing, "__countlshi2")
-DEF_BUILTIN (COUNTLSK,    -1, int_ftype_k,    nothing, "__countlssi2")
+DEF_BUILTIN (COUNTLSK,    -1, int_ftype_nk,   nothing, "__countlssi2")
 DEF_BUILTIN (COUNTLSLK,   -1, int_ftype_lk,   nothing, "__countlsdi2")
 DEF_BUILTIN (COUNTLSLLK,  -1, int_ftype_llk,  nothing, "__countlsdi2") // GCC extension
 
 DEF_BUILTIN (COUNTLSUHK,  -1, int_ftype_uhk,  nothing, "__countlsuhi2")
-DEF_BUILTIN (COUNTLSUK,   -1, int_ftype_uk,   nothing, "__countlsusi2")
+DEF_BUILTIN (COUNTLSUK,   -1, int_ftype_unk,  nothing, "__countlsusi2")
 DEF_BUILTIN (COUNTLSULK,  -1, int_ftype_ulk,  nothing, "__countlsudi2")
 DEF_BUILTIN (COUNTLSULLK, -1, int_ftype_ullk, nothing, "__countlsudi2") // GCC extension
 
 /* 7.18a.6.5 The bitwise fixed-point to integer conversion functions. */
 
 DEF_BUILTIN (BITSHR,   -1,   inthr_ftype_hr,   nothing, "__ret")
-DEF_BUILTIN (BITSR,    -1,    intr_ftype_r,    nothing, "__ret")
+DEF_BUILTIN (BITSR,    -1,   intnr_ftype_nr,   nothing, "__ret")
 DEF_BUILTIN (BITSLR,   -1,   intlr_ftype_lr,   nothing, "__ret")
 DEF_BUILTIN (BITSLLR,  -1,  intllr_ftype_llr,  nothing, "__ret") // GCC extension
 
 DEF_BUILTIN (BITSUHR,  -1,  intuhr_ftype_uhr,  nothing, "__ret")
-DEF_BUILTIN (BITSUR,   -1,   intur_ftype_ur,   nothing, "__ret")
+DEF_BUILTIN (BITSUR,   -1,  intunr_ftype_unr,  nothing, "__ret")
 DEF_BUILTIN (BITSULR,  -1,  intulr_ftype_ulr,  nothing, "__ret")
 DEF_BUILTIN (BITSULLR, -1, intullr_ftype_ullr, nothing, "__ret") // GCC extension
 
 DEF_BUILTIN (BITSHK,   -1,   inthk_ftype_hk,   nothing, "__ret")
-DEF_BUILTIN (BITSK,    -1,    intk_ftype_k,    nothing, "__ret")
+DEF_BUILTIN (BITSK,    -1,   intnk_ftype_nk,   nothing, "__ret")
 DEF_BUILTIN (BITSLK,   -1,   intlk_ftype_lk,   nothing, "__ret")
 DEF_BUILTIN (BITSLLK,  -1,  intllk_ftype_llk,  nothing, "__ret") // GCC extension
 
 DEF_BUILTIN (BITSUHK,  -1,  intuhk_ftype_uhk,  nothing, "__ret")
-DEF_BUILTIN (BITSUK,   -1,   intuk_ftype_uk,   nothing, "__ret")
+DEF_BUILTIN (BITSUK,   -1,  intunk_ftype_unk,  nothing, "__ret")
 DEF_BUILTIN (BITSULK,  -1,  intulk_ftype_ulk,  nothing, "__ret")
 DEF_BUILTIN (BITSULLK, -1, intullk_ftype_ullk, nothing, "__ret") // GCC extension
 
@@ -141,22 +141,22 @@  DEF_BUILTIN (BITSULLK, -1, intullk_ftype
 /* 7.18a.6.6 The bitwise integer to fixed-point conversion functions. */
 
 DEF_BUILTIN (  HRBITS, -1,   hr_ftype_inthr,   nothing, "__ret")
-DEF_BUILTIN (   RBITS, -1,    r_ftype_intr,    nothing, "__ret")
+DEF_BUILTIN (   RBITS, -1,   nr_ftype_intnr,   nothing, "__ret")
 DEF_BUILTIN (  LRBITS, -1,   lr_ftype_intlr,   nothing, "__ret")
 DEF_BUILTIN ( LLRBITS, -1,  llr_ftype_intllr,  nothing, "__ret") // GCC extension
 
 DEF_BUILTIN ( UHRBITS, -1,  uhr_ftype_intuhr,  nothing, "__ret")
-DEF_BUILTIN (  URBITS, -1,   ur_ftype_intur,   nothing, "__ret")
+DEF_BUILTIN (  URBITS, -1,  unr_ftype_intunr,  nothing, "__ret")
 DEF_BUILTIN ( ULRBITS, -1,  ulr_ftype_intulr,  nothing, "__ret")
 DEF_BUILTIN (ULLRBITS, -1, ullr_ftype_intullr, nothing, "__ret") // GCC extension
 
 DEF_BUILTIN (  HKBITS, -1,   hk_ftype_inthk,   nothing, "__ret")
-DEF_BUILTIN (   KBITS, -1,    k_ftype_intk,    nothing, "__ret")
+DEF_BUILTIN (   KBITS, -1,   nk_ftype_intnk,   nothing, "__ret")
 DEF_BUILTIN (  LKBITS, -1,   lk_ftype_intlk,   nothing, "__ret")
 DEF_BUILTIN ( LLKBITS, -1,  llk_ftype_intllk,  nothing, "__ret") // GCC extension
 
 DEF_BUILTIN ( UHKBITS, -1,  uhk_ftype_intuhk,  nothing, "__ret")
-DEF_BUILTIN (  UKBITS, -1,   uk_ftype_intuk,   nothing, "__ret")
+DEF_BUILTIN (  UKBITS, -1,  unk_ftype_intunk,  nothing, "__ret")
 DEF_BUILTIN ( ULKBITS, -1,  ulk_ftype_intulk,  nothing, "__ret")
 DEF_BUILTIN (ULLKBITS, -1, ullk_ftype_intullk, nothing, "__ret") // GCC extension
 
Index: config/avr/avr.c
===================================================================
--- config/avr/avr.c	(revision 196331)
+++ config/avr/avr.c	(revision 196332)
@@ -11525,22 +11525,22 @@  avr_init_builtins (void)
     = build_function_type_list (node_##fx##k, ITYP (node_##fx##k), NULL)
 
   tree node_hr = short_fract_type_node;
-  tree node_r = fract_type_node;
+  tree node_nr = fract_type_node;
   tree node_lr = long_fract_type_node;
   tree node_llr = long_long_fract_type_node;
 
   tree node_uhr = unsigned_short_fract_type_node;
-  tree node_ur = unsigned_fract_type_node;
+  tree node_unr = unsigned_fract_type_node;
   tree node_ulr = unsigned_long_fract_type_node;
   tree node_ullr = unsigned_long_long_fract_type_node;
 
   tree node_hk = short_accum_type_node;
-  tree node_k = accum_type_node;
+  tree node_nk = accum_type_node;
   tree node_lk = long_accum_type_node;
   tree node_llk = long_long_accum_type_node;
 
   tree node_uhk = unsigned_short_accum_type_node;
-  tree node_uk = unsigned_accum_type_node;
+  tree node_unk = unsigned_accum_type_node;
   tree node_ulk = unsigned_long_accum_type_node;
   tree node_ullk = unsigned_long_long_accum_type_node;
 
@@ -11548,55 +11548,55 @@  avr_init_builtins (void)
   /* For absfx builtins.  */
 
   FX_FTYPE_FX (h);
-  FX_FTYPE_FX ();
+  FX_FTYPE_FX (n);
   FX_FTYPE_FX (l);
   FX_FTYPE_FX (ll);
 
   /* For roundfx builtins.  */
 
   FX_FTYPE_FX_INT (h);
-  FX_FTYPE_FX_INT ();
+  FX_FTYPE_FX_INT (n);
   FX_FTYPE_FX_INT (l);
   FX_FTYPE_FX_INT (ll);
 
   FX_FTYPE_FX_INT (uh);
-  FX_FTYPE_FX_INT (u);
+  FX_FTYPE_FX_INT (un);
   FX_FTYPE_FX_INT (ul);
   FX_FTYPE_FX_INT (ull);
 
   /* For countlsfx builtins.  */
 
   INT_FTYPE_FX (h);
-  INT_FTYPE_FX ();
+  INT_FTYPE_FX (n);
   INT_FTYPE_FX (l);
   INT_FTYPE_FX (ll);
 
   INT_FTYPE_FX (uh);
-  INT_FTYPE_FX (u);
+  INT_FTYPE_FX (un);
   INT_FTYPE_FX (ul);
   INT_FTYPE_FX (ull);
 
   /* For bitsfx builtins.  */
 
   INTX_FTYPE_FX (h);
-  INTX_FTYPE_FX ();
+  INTX_FTYPE_FX (n);
   INTX_FTYPE_FX (l);
   INTX_FTYPE_FX (ll);
 
   INTX_FTYPE_FX (uh);
-  INTX_FTYPE_FX (u);
+  INTX_FTYPE_FX (un);
   INTX_FTYPE_FX (ul);
   INTX_FTYPE_FX (ull);
 
   /* For fxbits builtins.  */
 
   FX_FTYPE_INTX (h);
-  FX_FTYPE_INTX ();
+  FX_FTYPE_INTX (n);
   FX_FTYPE_INTX (l);
   FX_FTYPE_INTX (ll);
 
   FX_FTYPE_INTX (uh);
-  FX_FTYPE_INTX (u);
+  FX_FTYPE_INTX (un);
   FX_FTYPE_INTX (ul);
   FX_FTYPE_INTX (ull);