summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2008-12-17 09:54:10 +0000
committerUlrich Müller <ulm@gentoo.org>2008-12-17 09:54:10 +0000
commit8a5f56ef437d7965e8a9f17186e10ad9943aa733 (patch)
tree3bd5fc0940d2ebf60f853efc646743c18b346b9a /app-editors/emacs
parentAdd ~amd64 (#250770) (diff)
downloadgentoo-2-8a5f56ef437d7965e8a9f17186e10ad9943aa733.tar.gz
gentoo-2-8a5f56ef437d7965e8a9f17186e10ad9943aa733.tar.bz2
gentoo-2-8a5f56ef437d7965e8a9f17186e10ad9943aa733.zip
New patch for sparc-fbsd, bug 159584.
(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r4 i686)
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/ChangeLog6
-rw-r--r--app-editors/emacs/files/emacs-22.3-freebsd-sparc.patch18
2 files changed, 17 insertions, 7 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index b4c15ffe4cf2..df4cdb8a16af 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.288 2008/11/29 20:38:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.289 2008/12/17 09:54:09 ulm Exp $
+
+ 17 Dec 2008; Ulrich Mueller <ulm@gentoo.org>
+ files/emacs-22.3-freebsd-sparc.patch:
+ New patch for sparc-fbsd, bug 159584.
*emacs-22.3-r1 (29 Nov 2008)
diff --git a/app-editors/emacs/files/emacs-22.3-freebsd-sparc.patch b/app-editors/emacs/files/emacs-22.3-freebsd-sparc.patch
index 85ff3a088784..de206e7e0658 100644
--- a/app-editors/emacs/files/emacs-22.3-freebsd-sparc.patch
+++ b/app-editors/emacs/files/emacs-22.3-freebsd-sparc.patch
@@ -1,11 +1,17 @@
---- emacs-orig/src/alloc.c 2008-07-09 19:33:18.000000000 +0200
-+++ emacs/src/alloc.c 2008-07-09 19:39:48.000000000 +0200
-@@ -4487,7 +4487,7 @@
- /* Fixme: Code in the Boehm GC suggests flushing (with `flushrs') is
+http://bugs.gentoo.org/159584
+Patch taken from FreeBSD ports, by Giorgos Keramidas <keramida@freebsd.org>
+
+--- emacs-orig/src/alloc.c
++++ emacs/src/alloc.c
+@@ -4573,7 +4573,11 @@
needed on ia64 too. See mach_dep.c, where it also says inline
assembler doesn't work with relevant proprietary compilers. */
--#ifdef __sparc__
-+#if defined(__sparc__) && !defined(__FreeBSD__)
+ #ifdef __sparc__
++#ifdef __sparc64__
++ asm ("flushw");
++#else
asm ("ta 3");
++#endif
#endif
+ /* Save registers that we need to see on the stack. We need to see