summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2015-07-29 16:09:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 07:34:06 +0100
commita1f78e411e71c8eda19033bce9ba9f2ee7c02b58 (patch)
tree09cef1fa4d54f4105da88f0754643d676f57c3bb /meta
parent8f12739542ea2afa77b307546ff17e45456c5c76 (diff)
downloadpoky-a1f78e411e71c8eda19033bce9ba9f2ee7c02b58.tar.gz
guile: Add earlyclobber constraint to the SMULL outputs.
backport a patch to fix issue: {standard input}: Assembler messages: {standard input}:16966: rdhi, rdlo and rm must all be different (From OE-Core rev: a8767bff39730e4905c55942109d69aae5867fe1) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch43
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.11.bb1
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch b/meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch
new file mode 100644
index 0000000000..e50059a7e6
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch
@@ -0,0 +1,43 @@
1From a85c78ea1393985fdb6e6678dea19135c553d341 Mon Sep 17 00:00:00 2001
2From: Mark H Weaver <mhw@netris.org>
3Date: Fri, 19 Sep 2014 21:18:09 -0400
4Subject: [PATCH] VM: ASM_MUL for ARM: Add earlyclobber constraint to the SMULL
5 outputs.
6
7Reported by Rob Browning <rlb@defaultvalue.org>.
8
9* libguile/vm-i-scheme.c (ASM_MUL)[ARM]: Add earlyclobber (&) constraint
10 to the SMULL output registers.
11
12Author: Mark H Weaver <mhw@netris.org>
13
14Upstream-Status: Backport
15
16Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
17---
18 libguile/vm-i-scheme.c | 5 ++---
19 1 file changed, 2 insertions(+), 3 deletions(-)
20
21diff --git a/libguile/vm-i-scheme.c b/libguile/vm-i-scheme.c
22index 587aa95..162efab 100644
23--- a/libguile/vm-i-scheme.c
24+++ b/libguile/vm-i-scheme.c
25@@ -1,5 +1,4 @@
26-/* Copyright (C) 2001, 2009, 2010, 2011, 2012, 2013,
27- * 2014 Free Software Foundation, Inc.
28+/* Copyright (C) 2001, 2009-2014 Free Software Foundation, Inc.
29 *
30 * This library is free software; you can redistribute it and/or
31 * modify it under the terms of the GNU Lesser General Public License
32@@ -363,7 +362,7 @@ VM_DEFINE_FUNCTION (149, ge, "ge?", 2)
33 { \
34 scm_t_signed_bits rlo, rhi; \
35 asm ("smull %0, %1, %2, %3\n" \
36- : "=r" (rlo), "=r" (rhi) \
37+ : "=&r" (rlo), "=&r" (rhi) \
38 : "r" (SCM_UNPACK (x) - scm_tc2_int), \
39 "r" (SCM_I_INUM (y))); \
40 if (SCM_LIKELY (SCM_SRS (rlo, 31) == rhi)) \
41--
422.3.5
43
diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.11.bb
index 621fa0f52b..ea9017bdd9 100644
--- a/meta/recipes-devtools/guile/guile_2.0.11.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.11.bb
@@ -22,6 +22,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
22 file://arm_aarch64.patch \ 22 file://arm_aarch64.patch \
23 file://workaround-ice-ssa-corruption.patch \ 23 file://workaround-ice-ssa-corruption.patch \
24 file://libguile-Makefile.am-hook.patch \ 24 file://libguile-Makefile.am-hook.patch \
25 file://libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch \
25 " 26 "
26 27
27# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch 28# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch