[committed] Two trivial backports to gcc-8-branch

[Richard Sandiford]

Patches to fix two typos introduced between GCC 7 and GCC 8.

Tested on aarch64-linux-gnu, aarch64_be-elf and x86_64-linux-gnu.
Committed as obvious for the first and preapproved (but also obvious)
for the second.

Richard


Fix POLY_INT_CST/CONST_POLY_INT typo (PR 89631)

2019-04-29  Richard Sandiford  <richard.sandif...@arm.com>

gcc/
	Backport from mainline:
	2019-03-08  Richard Sandiford  <richard.sandif...@arm.com>

	PR debug/89631
	* dwarf2cfi.c (dwarf2out_frame_debug_expr): Use CONST_POLY_INT
	instead of POLY_INT_CST.

Index: gcc/dwarf2cfi.c
===================================================================
--- gcc/dwarf2cfi.c	2019-04-29 08:40:40.145347607 +0100
+++ gcc/dwarf2cfi.c	2019-04-29 08:52:36.886939005 +0100
@@ -1762,7 +1762,7 @@ dwarf2out_frame_debug_expr (rtx expr)
 
 	  /* Rule 6 */
 	case CONST_INT:
-	case POLY_INT_CST:
+	case CONST_POLY_INT:
 	  cur_trace->cfa_temp.reg = dwf_regno (dest);
 	  cur_trace->cfa_temp.offset = rtx_to_poly_int64 (src);
 	  break;

Fix aarch64_evpc_tbl guard (PR 85910)

2018-04-29  Richard Sandiford  <richard.sandif...@arm.com>

gcc/
	Backport from mainline:
	2018-08-23  Richard Sandiford  <richard.sandif...@arm.com>

	PR target/85910
	* config/aarch64/aarch64.c (aarch64_expand_vec_perm_const_1): Fix
	aarch64_evpc_tbl guard.

Index: gcc/config/aarch64/aarch64.c
===================================================================
--- gcc/config/aarch64/aarch64.c	2019-04-29 08:40:42.293340377 +0100
+++ gcc/config/aarch64/aarch64.c	2019-04-29 08:52:42.774919246 +0100
@@ -15623,7 +15623,7 @@ aarch64_expand_vec_perm_const_1 (struct
 	return true;
       if (d->vec_flags == VEC_SVE_DATA)
 	return aarch64_evpc_sve_tbl (d);
-      else if (d->vec_flags == VEC_SVE_DATA)
+      else if (d->vec_flags == VEC_ADVSIMD)
 	return aarch64_evpc_tbl (d);
     }
   return false;