Fix backport of PR71607: no longer use TARGET_USE_BLOCKS_FOR_CONSTANT_PARM/embedded-6-branch-2016q4

gcc/ChangeLog.arm:
2016-12-14  Andre Vieira  <andre.simoesdiasvieira@arm.com>

	* config/arm/arm.c (TARGET_USE_BLOCKS_FOR_CONSTANT_P): Remove.
	(arm_use_blocks_for_constant_p): Remove.

gcc/testsuite/ChangeLog.arm:
2016-12-14  Andre Vieira  <andre.simoesdiasvieira@arm.com>

	* gcc.target/arm/thumb2-slow-flash-data-3.c: Add extra scan.
	* gcc.target/arm/thumb2-slow-flash-data-5.c: Likewise.



git-svn-id: https://gcc.gnu.org/svn/gcc/branches/ARM/embedded-6-branch@243658 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 13 insertions, 15 deletions

diff --git a/gcc/ChangeLog.arm b/gcc/ChangeLog.arm
index f911773962c..50d0719a0a4 100644
--- a/gcc/ChangeLog.arm
+++ b/gcc/ChangeLog.arm
@@ -1,3 +1,8 @@
+2016-12-14  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+	* config/arm/arm.c (TARGET_USE_BLOCKS_FOR_CONSTANT_P): Remove.
+	(arm_use_blocks_for_constant_p): Remove.
+
 2016-12-13  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
         * config/arm/arm-cores.def (cortex-m23): Add FL2_CMSE flag.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 323019896ac..a76c950c53d 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -308,7 +308,6 @@ static section *arm_function_section (tree, enum node_frequency, bool, bool);
 static bool arm_asm_elf_flags_numeric (unsigned int flags, unsigned int *num);
 static unsigned int arm_elf_section_type_flags (tree decl, const char *name,
 						int reloc);
-static bool arm_use_blocks_for_constant_p (machine_mode var, const_rtx x);
 
 
 /* Table of machine attributes.  */
@@ -759,9 +758,6 @@ static const struct attribute_spec arm_attribute_table[] =
 #undef TARGET_SECTION_TYPE_FLAGS
 #define TARGET_SECTION_TYPE_FLAGS arm_elf_section_type_flags
 
-#undef TARGET_USE_BLOCKS_FOR_CONSTANT_P
-#define TARGET_USE_BLOCKS_FOR_CONSTANT_P arm_use_blocks_for_constant_p
-
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 /* Obstack for minipool constant handling.  */
@@ -31605,15 +31601,4 @@ bool arm_coproc_ldc_stc_legitimate_address (rtx op)
     }
   return false;
 }
-
-/* Implements the TARGET_USE_BLOCKS_FOR_CONSTANT_P hook.
-
-   If we have disabled the generation of constants inside a literal pool, then
-   this function returns false.  Otherwise, return true.  */
-
-static bool
-arm_use_blocks_for_constant_p (machine_mode /* var */, const_rtx /* x */)
-{
-  return !arm_disable_literal_pool;
-}
 #include "gt-arm.h"
diff --git a/gcc/testsuite/ChangeLog.arm b/gcc/testsuite/ChangeLog.arm
index 1db83963633..0a4dc1e8eba 100644
--- a/gcc/testsuite/ChangeLog.arm
+++ b/gcc/testsuite/ChangeLog.arm
@@ -1,5 +1,10 @@
 2016-12-14  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
+	* gcc.target/arm/thumb2-slow-flash-data-3.c: Add extra scan.
+	* gcc.target/arm/thumb2-slow-flash-data-5.c: Likewise.
+
+2016-12-14  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
 	* gcc.target/arm/cmse/mainline/hard/cmse-13.c: Fix testsuite.
 	* gcc.target/arm/cmse/mainline/hard/cmse-7.c: Likewise.
 	* gcc.target/arm/cmse/mainline/hard/cmse-8.c: Likewise.
diff --git a/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-3.c b/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-3.c
index d25ba87413c..f4c17c9fa85 100644
--- a/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-3.c
+++ b/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-3.c
@@ -22,3 +22,5 @@ fn3 ()
   a[1] = b;
   fn1 (a);
 }
+
+/* { dg-final { scan-assembler-not "\\.(float|l\\?double|\d?byte|short|int|long|quad|word)\\s+\[^.\]" } } */
diff --git a/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-5.c b/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-5.c
index 7d1b2384738..9cc2539b31d 100644
--- a/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-5.c
+++ b/gcc/testsuite/gcc.target/arm/thumb2-slow-flash-data-5.c
@@ -12,3 +12,4 @@ foo (void)
 }
 
 /* { dg-final { scan-assembler-not "#1\\.0e\\+0" } } */
+/* { dg-final { scan-assembler-not "\\.(float|l\\?double|\d?byte|short|int|long|quad|word)\\s+\[^.\]" } } */