[gcc-7] 239/354: - fix build for the linaro branch

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit d63b43250eb8ae4fa87664aa25d78f9b825fafb1
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Jun 29 16:03:05 2017 +0000

     - fix build for the linaro branch
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9561 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/gcc-linaro-revert-r249596.diff | 38 +++++++++++++++++++++++++++
 debian/rules.patch                            |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/gcc-linaro-revert-r249596.diff b/debian/patches/gcc-linaro-revert-r249596.diff
new file mode 100644
index 0000000..73f5517
--- /dev/null
+++ b/debian/patches/gcc-linaro-revert-r249596.diff
@@ -0,0 +1,38 @@
+Index: gcc/testsuite/gcc.target/arm/fpscr.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/arm/fpscr.c	(revision 249596)
++++ a/src/gcc/testsuite/gcc.target/arm/fpscr.c	(nonexistent)
+@@ -1,16 +0,0 @@
+-/* Test the fpscr builtins.  */
+-
+-/* { dg-do compile } */
+-/* { dg-require-effective-target arm_fp_ok } */
+-/* { dg-skip-if "need fp instructions" { *-*-* } { "-mfloat-abi=soft" } { "" } } */
+-/* { dg-add-options arm_fp } */
+-
+-void
+-test_fpscr ()
+-{
+-  volatile unsigned int status = __builtin_arm_get_fpscr ();
+-  __builtin_arm_set_fpscr (status);
+-}
+-
+-/* { dg-final { scan-assembler "mrc\tp10, 7, r\[0-9\]+, cr1, cr0, 0" } } */
+-/* { dg-final { scan-assembler "mcr\tp10, 7, r\[0-9\]+, cr1, cr0, 0" } } */
+Index: gcc/config/arm/arm-builtins.c
+===================================================================
+--- a/src/gcc/config/arm/arm-builtins.c	(revision 249596)
++++ a/src/gcc/config/arm/arm-builtins.c	(revision 249586)
+@@ -1893,10 +1893,10 @@
+ 	= build_function_type_list (unsigned_type_node, NULL);
+ 
+       arm_builtin_decls[ARM_BUILTIN_GET_FPSCR]
+-	= add_builtin_function ("__builtin_arm_get_fpscr", ftype_get_fpscr,
++	= add_builtin_function ("__builtin_arm_ldfscr", ftype_get_fpscr,
+ 				ARM_BUILTIN_GET_FPSCR, BUILT_IN_MD, NULL, NULL_TREE);
+       arm_builtin_decls[ARM_BUILTIN_SET_FPSCR]
+-	= add_builtin_function ("__builtin_arm_set_fpscr", ftype_set_fpscr,
++	= add_builtin_function ("__builtin_arm_stfscr", ftype_set_fpscr,
+ 				ARM_BUILTIN_SET_FPSCR, BUILT_IN_MD, NULL, NULL_TREE);
+     }
+ 
diff --git a/debian/rules.patch b/debian/rules.patch
index 503565e..3d5031a 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -14,6 +14,7 @@ series_file	?= $(patchdir)/series
 
 debian_patches = \
 	svn-updates \
+	$(if $(with_linaro_branch),gcc-linaro-revert-r249596) \
 	$(if $(with_linaro_branch),gcc-linaro) \
 	$(if $(with_linaro_branch),gcc-linaro-no-macros) \
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git