diff options
author | Timo Teräs <timo.teras@iki.fi> | 2015-08-28 08:08:57 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2015-08-28 08:27:59 +0000 |
commit | ad76680320da987e08545018d476c8dbd4060441 (patch) | |
tree | 226067fc2d1c356c95fb4d181aafbbc6e853ec6f /main/guile/0009-VM-Allow-the-C-compiler-to-choose-FP_REG-on-ARM.patch | |
parent | 90faba1d9dd647e1f5751208ad4d766872a043b1 (diff) | |
download | aports-ad76680320da987e08545018d476c8dbd4060441.tar.bz2 aports-ad76680320da987e08545018d476c8dbd4060441.tar.xz |
main/guile: cherry-pick patches from debian/upstream
fixes arm build among other issues
Diffstat (limited to 'main/guile/0009-VM-Allow-the-C-compiler-to-choose-FP_REG-on-ARM.patch')
-rw-r--r-- | main/guile/0009-VM-Allow-the-C-compiler-to-choose-FP_REG-on-ARM.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/main/guile/0009-VM-Allow-the-C-compiler-to-choose-FP_REG-on-ARM.patch b/main/guile/0009-VM-Allow-the-C-compiler-to-choose-FP_REG-on-ARM.patch new file mode 100644 index 0000000000..103b334558 --- /dev/null +++ b/main/guile/0009-VM-Allow-the-C-compiler-to-choose-FP_REG-on-ARM.patch @@ -0,0 +1,37 @@ +From 1ebf3ef7b8318865dc85f5a18be59b6f8e23949f Mon Sep 17 00:00:00 2001 +From: Mark H Weaver <mhw@netris.org> +Date: Sat, 20 Sep 2014 03:59:51 -0400 +Subject: VM: Allow the C compiler to choose FP_REG on ARM. + +Reported by Rob Browning <rlb@defaultvalue.org>. + +* libguile/vm-engine.h (IP_REG)[__arm__]: Remove explicit register + choice ("r7") for FP_REG, which was reported to cause compilation + failures on ARM. + +Origin: http://git.savannah.gnu.org/cgit/guile.git/commit/?id=bed025bd2569b1c033f24d7d9e660e39ebf65cac +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763115 +Added-by: Rob Browning <rlb@defaultvalue.org> +--- + libguile/vm-engine.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libguile/vm-engine.h b/libguile/vm-engine.h +index 28cab40..178828c 100644 +--- a/libguile/vm-engine.h ++++ b/libguile/vm-engine.h +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2001, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. ++/* Copyright (C) 2001, 2009-2012, 2014 Free Software Foundation, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License +@@ -81,7 +81,7 @@ + #ifdef __arm__ + #define IP_REG asm("r9") + #define SP_REG asm("r8") +-#define FP_REG asm("r7") ++#define FP_REG + #endif + #endif + |