[AArch64] Set TREE_TARGET_GLOBALS in aarch64_set_current_function when new tree is...

	PR target/69245
	* config/aarch64/aarch64.c (aarch64_set_current_function):
	Save/restore target globals when switching to
	target_option_default_node.

	* gcc.target/aarch64/pr69245_1.c: New test.

From-SVN: r233745

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 916c381529a8daafe114b62055488fac114806d8..a34883eb2e8988ab35fc9669a4c20b872462d5bb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2016-02-26  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       PR target/69245
+       * config/aarch64/aarch64.c (aarch64_set_current_function):
+       Save/restore target globals when switching to
+       target_option_default_node.
+
 2016-02-26  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        PR target/69613

diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 30d6f4176b8a03533780a260216297e547af8938..3519c7bf3abd5c6016f21930b209f067ac6adc09 100644 (file)
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -8576,7 +8576,7 @@ aarch64_set_current_function (tree fndecl)
       if (old_tree == new_tree)
        ;
 
-      else if (new_tree && new_tree != target_option_default_node)
+      else if (new_tree)
        {
          cl_target_option_restore (&global_options,
                                    TREE_TARGET_OPTION (new_tree));

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d5b890ddc1fd4bb3fdbd11d4ae4de219e9803662..99e0f2ff1d6344c0d92a100dd4ad84202b7132f1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-26  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       PR target/69245
+       * gcc.target/aarch64/pr69245_1.c: New test.
+
 2016-02-26  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        PR target/69613

diff --git a/gcc/testsuite/gcc.target/aarch64/pr69245_1.c b/gcc/testsuite/gcc.target/aarch64/pr69245_1.c
new file mode 100644 (file)
index 0000000..dcc542b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/pr69245_1.c
@@ -0,0 +1,18 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -march=armv8-a+fp -fomit-frame-pointer" } */
+
+#pragma GCC target "arch=armv8-a+nofp"
+long a;
+static void
+fn1 ()
+{
+}
+
+#pragma GCC target "arch=armv8-a+fp"
+float
+fn2 (float a)
+{
+  return a + 2.0;
+}
+
+/* { dg-final { scan-assembler-not "__addsf3" } } */