summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lisp/cmucl')
-rw-r--r--dev-lisp/cmucl/Manifest4
-rw-r--r--dev-lisp/cmucl/cmucl-20e.ebuild97
-rw-r--r--dev-lisp/cmucl/cmucl-21a.ebuild92
-rw-r--r--dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch16
-rw-r--r--dev-lisp/cmucl/files/20e-execstack-fixes.patch118
-rw-r--r--dev-lisp/cmucl/files/21a-build.patch22
-rw-r--r--dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch16
-rw-r--r--dev-lisp/cmucl/files/21a-execstack-fixes.patch118
8 files changed, 0 insertions, 483 deletions
diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index 87e8d72e536e..cd8cafb04080 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -1,6 +1,2 @@
-DIST cmucl-20e-x86-linux.tar.bz2 18861880 BLAKE2B ed7b2dec86305ab2ad78ca5a84f0380044211e7cacf67f297c17c26d0a0a344d53c0404d82c86415dd923b92920cbd873436d925417f3590ac3a4c88d919b231 SHA512 1eee852b2a11733d0fac2c046137ccd099370bf208be71becc03710e832510b288768f557e326b1ce95cba16490413142e607fd71346e20e5f8592b51d86b0fe
-DIST cmucl-21a-x86-linux.tar.bz2 10870693 BLAKE2B a4fb258cef17eaf281ffd1fdff7f5e953b650c45822ed94722e4df5065b41a53cd0a9f481fba9ac38824dab4952bbb6d45e432b37fe73142c2ead1c8a4b17141 SHA512 7f7d327e47b01dcee1cbb05aae826ef7c64d4d192d7d32d1aba51c8839a06d65942fff5d4c7dbccc955e1e233d2065d83d078266327caee07201e9dce59c39ee
DIST cmucl-21c-x86-linux.tar.bz2 11127872 BLAKE2B b9089a40b4a0738f9faccdfddb7b33256a561a07cedc3ef9b3ec7afddbbb9de493c2ffb9af4a8d6b6ce70ef857576870901a6b7a607f52bdaf8a0f53ddd2d07e SHA512 9097220aef612aa3d8367a86a86dc62d86d918190d2688f6e90d415c9f9d881f97f0829e9d310f700b014821d30bf5a15f7a05cdb9201c9deab10a7231e0bcb6
-DIST cmucl-src-20e.tar.bz2 6147575 BLAKE2B a9f31b9a34c513dc88d935e18b9a07854d024d236f1f0294f888c84fd4b781afcd99a3cceac148edd1d1fe6c2dc00c5c8de4069d84b227872e376422275b6984 SHA512 d04f6ac7335572198d37d5df00934edfc82495294446cc5420dada4f2df44009f0983b438d6f10ce5bb02e46fd89df985da5eee3e91a6a75d98e9f86240c0dcc
-DIST cmucl-src-21a.tar.bz2 8195492 BLAKE2B 5ca24e1ee258b52b805ab933e80915da6af022d47f8171327e318edb28d9f87c8901fe10ea48d54b6737a808cb03b08f8d3db41688b347971147b991570752cc SHA512 74b077732030dbc3681aadcf9c802fd5b399362c9653b972063e49eb0a2ad528d02d6dde74107210c94c94dc7e9664472c2d072a6ae6f75e7e8c4cf847987e3b
DIST cmucl-src-21c.tar.bz2 6947775 BLAKE2B 828075c71ddf459d09076199af4a02f2294063bd9ef0beb6d4bcbb473dd0ff8cfdff7faa9416f640e125603301fa37c73a280db597bf4301c22fbe88c4cc2dbb SHA512 98ea0516b71af7c6f92b5f67f6c1545949fcd1dc95e1238a989c1c2858a75e2751e5eb765b29812ad5cc5de015333787dac2a63a9ddea9bb83cfd72fef6794f4
diff --git a/dev-lisp/cmucl/cmucl-20e.ebuild b/dev-lisp/cmucl/cmucl-20e.ebuild
deleted file mode 100644
index 9e122b9a2c9f..000000000000
--- a/dev-lisp/cmucl/cmucl-20e.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs multilib
-
-MY_PV=${PV:0:3}
-
-DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://www.cons.org/cmucl/"
-SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
- http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="X source cpu_flags_x86_sse2"
-
-CDEPEND=">=dev-lisp/asdf-2.33-r3:=
- x11-libs/motif:0"
-DEPEND="${CDEPEND}
- sys-devel/bc"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"
-
-TARGET=linux-4
-
-src_prepare() {
- epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
- epatch "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
-
- cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die
-}
-
-src_compile() {
- local cmufpu cmuopts
-
- if use cpu_flags_x86_sse2; then
- cmufpu=sse2
- else
- cmufpu=x87
- fi
-
- if use X; then
- cmuopts="-f ${cmufpu}"
- else
- cmuopts="-u -f ${cmufpu}"
- fi
-
- local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cmufpu}.core -noinit -nositeinit -batch"
-
- env CC="$(tc-getCC)" bin/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler"
-
- # Compile up the asdf and defsystem modules
- ${TARGET}/lisp/lisp -noinit -nositeinit -batch << EOF || die
-(in-package :cl-user)
-(setf (ext:search-list "target:")
- '("$TARGET/" "src/"))
-(setf (ext:search-list "modules:")
- '("target:contrib/"))
-
-(compile-file "modules:asdf/asdf")
-(compile-file "modules:defsystem/defsystem")
-EOF
-}
-
-src_install() {
- env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \
- bin/make-dist.sh -S -g -G root -O root ${TARGET} ${MY_PV} x86 linux \
- || die "Cannot build installation archive"
- # Necessary otherwise tar will fail
- dodir /usr
- pushd "${D}"/usr > /dev/null
- tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \
- || die "Cannot install main system"
- if use X ; then
- tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.extra.tar.gz \
- || die "Cannot install extra files"
- fi
- if use source; then
- # Necessary otherwise tar will fail
- dodir /usr/share/common-lisp/source/${PN}
- cd "${D}"/usr/share/common-lisp/source/${PN}
- tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
- || die "Cannot install sources"
- fi
- popd > /dev/null
-
- # Install site config file
- sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
- < "${FILESDIR}"/site-init.lisp.in \
- > "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
- || die "Cannot fix site-init.lisp"
- insinto /etc/common-lisp
- doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
-}
diff --git a/dev-lisp/cmucl/cmucl-21a.ebuild b/dev-lisp/cmucl/cmucl-21a.ebuild
deleted file mode 100644
index f3f9b830b735..000000000000
--- a/dev-lisp/cmucl/cmucl-21a.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs multilib
-
-MY_PV=${PV:0:3}
-
-DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://www.cons.org/cmucl/"
-SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
- http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="X source"
-
-CDEPEND=">=dev-lisp/asdf-2.33-r3:=
- x11-libs/motif:0"
-DEPEND="${CDEPEND}
- sys-devel/bc"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"
-
-TARGET=linux-4
-
-src_prepare() {
- epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
- epatch "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
- epatch "${FILESDIR}"/${MY_PV}-build.patch
-
- cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die
-}
-
-src_compile() {
- local cmuopts buildimage
-
- if use X; then
- cmuopts=""
- else
- cmuopts="-u"
- fi
-
- buildimage="bin/lisp -batch"
-
- env CC="$(tc-getCC)" bin/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler"
-
- # Compile up the asdf and defsystem modules
- ${TARGET}/lisp/lisp -noinit -nositeinit -batch << EOF || die
-(in-package :cl-user)
-(setf (ext:search-list "target:")
- '("$TARGET/" "src/"))
-(setf (ext:search-list "modules:")
- '("target:contrib/"))
-
-(compile-file "modules:asdf/asdf")
-(compile-file "modules:defsystem/defsystem")
-EOF
-}
-
-src_install() {
- env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \
- bin/make-dist.sh -S -g -G root -O root ${TARGET} ${MY_PV} x86 linux \
- || die "Cannot build installation archive"
- # Necessary otherwise tar will fail
- dodir /usr
- pushd "${D}"/usr > /dev/null
- tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \
- || die "Cannot install main system"
- if use X ; then
- tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.extra.tar.gz \
- || die "Cannot install extra files"
- fi
- if use source; then
- # Necessary otherwise tar will fail
- dodir /usr/share/common-lisp/source/${PN}
- cd "${D}"/usr/share/common-lisp/source/${PN}
- tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
- || die "Cannot install sources"
- fi
- popd > /dev/null
-
- # Install site config file
- sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
- < "${FILESDIR}"/site-init.lisp.in \
- > "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
- || die "Cannot fix site-init.lisp"
- insinto /etc/common-lisp
- doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
-}
diff --git a/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch
deleted file mode 100644
index 8fc9278af87d..000000000000
--- a/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp
---- cmucl.orig/src/code/misc.lisp 2011-10-25 05:31:39.000000000 +0200
-+++ cmucl/src/code/misc.lisp 2012-01-31 21:46:49.441273068 +0100
-@@ -187,8 +187,10 @@
-
- (defun lisp-implementation-version ()
- "Returns a string describing the implementation version."
-- (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
-- #+unicode _" Unicode" #-unicode ""))
-+ (format nil "~X~A~A"
-+ c:byte-fasl-file-version
-+ #+unicode "-unicode" #-unicode ""
-+ *lisp-implementation-version*))
-
- (defun machine-instance ()
- "Returns a string giving the name of the local machine."
diff --git a/dev-lisp/cmucl/files/20e-execstack-fixes.patch b/dev-lisp/cmucl/files/20e-execstack-fixes.patch
deleted file mode 100644
index 034848d64a26..000000000000
--- a/dev-lisp/cmucl/files/20e-execstack-fixes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S
---- work.old/src/lisp/alpha-assem.S 2003-03-06 11:13:09.000000000 -0300
-+++ work/src/lisp/alpha-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -297,3 +297,7 @@
- function_end_breakpoint_end:
-
-
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S
---- work.old/src/lisp/amd64-assem.S 2004-07-27 19:03:53.000000000 -0300
-+++ work/src/lisp/amd64-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -1051,3 +1051,7 @@
- .end
-
- #endif /* LINKAGE_TABLE */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c
---- work.old/src/lisp/backtrace.c 2009-06-11 13:04:01.000000000 -0300
-+++ work/src/lisp/backtrace.c 2010-05-10 00:06:22.000000000 -0300
-@@ -3,6 +3,8 @@
- * Simple backtrace facility. More or less from Rob's lisp version.
- */
-
-+#include "os-common.h"
-+
- #include <stdio.h>
- #include <signal.h>
- #include "lisp.h"
-diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S
---- work.old/src/lisp/hppa-assem.S 2002-08-23 14:05:35.000000000 -0300
-+++ work/src/lisp/hppa-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -460,3 +460,7 @@
-
- .export function_end_breakpoint_end
- function_end_breakpoint_end
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S
---- work.old/src/lisp/linux-stubs.S 2005-08-17 00:40:16.000000000 -0300
-+++ work/src/lisp/linux-stubs.S 2010-05-10 00:06:34.000000000 -0300
-@@ -995,3 +995,7 @@
- /* doe(yperr_string) */
- /* doe(ypprot_err) */
- #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c
---- work.old/src/lisp/lisp.c 2009-07-13 16:41:54.000000000 -0300
-+++ work/src/lisp/lisp.c 2010-05-10 00:05:55.000000000 -0300
-@@ -5,6 +5,9 @@
- *
- */
-
-+#include "os-common.h"
-+#include <time.h>
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <limits.h>
-diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S
---- work.old/src/lisp/mips-assem.S 2002-08-23 14:01:02.000000000 -0300
-+++ work/src/lisp/mips-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -402,3 +402,7 @@
- move v0, a1
- j _restore_state
- .end save_state
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h
---- work.old/src/lisp/os-common.h 1969-12-31 21:00:00.000000000 -0300
-+++ work/src/lisp/os-common.h 2010-05-10 00:06:22.000000000 -0300
-@@ -0,0 +1 @@
-+char* convert_lisp_string(char *c_string, void *lisp_string, int len);
-diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S
---- work.old/src/lisp/ppc-assem.S 2006-02-25 01:35:58.000000000 -0300
-+++ work/src/lisp/ppc-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -721,3 +721,7 @@
- SET_SIZE(fpu_restore)
-
- #endif
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S
---- work.old/src/lisp/sparc-assem.S 2003-10-23 23:57:00.000000000 -0300
-+++ work/src/lisp/sparc-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -837,3 +837,7 @@
- * End:
- */
-
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S
---- work.old/src/lisp/x86-assem.S 2008-12-24 02:36:40.000000000 -0200
-+++ work/src/lisp/x86-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -798,3 +798,7 @@
- ENDFUNC(undefined_foreign_symbol_trap)
-
- #endif /* LINKAGE_TABLE */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/dev-lisp/cmucl/files/21a-build.patch b/dev-lisp/cmucl/files/21a-build.patch
deleted file mode 100644
index 464234109b32..000000000000
--- a/dev-lisp/cmucl/files/21a-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -r -U2 21a.orig/bin/build.sh 21a/bin/build.sh
---- 21a.orig/bin/build.sh 2015-05-19 07:42:40.000000000 +0600
-+++ 21a/bin/build.sh 2016-04-03 20:54:08.597016537 +0600
-@@ -40,5 +40,5 @@
- ENABLE4="yes"
-
--version=20f
-+version=21a
- SRCDIR=src
- BINDIR=bin
-@@ -145,10 +145,9 @@
- $TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; }
-
-- $TARGET/lisp/lisp -batch -noinit -nositeinit $FPU_MODE < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit $FPU_MODE"; exit 1; }
-+ $TARGET/lisp/lisp -batch -noinit -nositeinit < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit"; exit 1; }
- return 0;
- fi
- }
-
--FPU_MODE=
- BUILDWORLD="$TOOLDIR/build-world.sh"
- BUILD_POT="yes"
diff --git a/dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch
deleted file mode 100644
index 8fc9278af87d..000000000000
--- a/dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp
---- cmucl.orig/src/code/misc.lisp 2011-10-25 05:31:39.000000000 +0200
-+++ cmucl/src/code/misc.lisp 2012-01-31 21:46:49.441273068 +0100
-@@ -187,8 +187,10 @@
-
- (defun lisp-implementation-version ()
- "Returns a string describing the implementation version."
-- (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
-- #+unicode _" Unicode" #-unicode ""))
-+ (format nil "~X~A~A"
-+ c:byte-fasl-file-version
-+ #+unicode "-unicode" #-unicode ""
-+ *lisp-implementation-version*))
-
- (defun machine-instance ()
- "Returns a string giving the name of the local machine."
diff --git a/dev-lisp/cmucl/files/21a-execstack-fixes.patch b/dev-lisp/cmucl/files/21a-execstack-fixes.patch
deleted file mode 100644
index 034848d64a26..000000000000
--- a/dev-lisp/cmucl/files/21a-execstack-fixes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S
---- work.old/src/lisp/alpha-assem.S 2003-03-06 11:13:09.000000000 -0300
-+++ work/src/lisp/alpha-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -297,3 +297,7 @@
- function_end_breakpoint_end:
-
-
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S
---- work.old/src/lisp/amd64-assem.S 2004-07-27 19:03:53.000000000 -0300
-+++ work/src/lisp/amd64-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -1051,3 +1051,7 @@
- .end
-
- #endif /* LINKAGE_TABLE */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c
---- work.old/src/lisp/backtrace.c 2009-06-11 13:04:01.000000000 -0300
-+++ work/src/lisp/backtrace.c 2010-05-10 00:06:22.000000000 -0300
-@@ -3,6 +3,8 @@
- * Simple backtrace facility. More or less from Rob's lisp version.
- */
-
-+#include "os-common.h"
-+
- #include <stdio.h>
- #include <signal.h>
- #include "lisp.h"
-diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S
---- work.old/src/lisp/hppa-assem.S 2002-08-23 14:05:35.000000000 -0300
-+++ work/src/lisp/hppa-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -460,3 +460,7 @@
-
- .export function_end_breakpoint_end
- function_end_breakpoint_end
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S
---- work.old/src/lisp/linux-stubs.S 2005-08-17 00:40:16.000000000 -0300
-+++ work/src/lisp/linux-stubs.S 2010-05-10 00:06:34.000000000 -0300
-@@ -995,3 +995,7 @@
- /* doe(yperr_string) */
- /* doe(ypprot_err) */
- #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c
---- work.old/src/lisp/lisp.c 2009-07-13 16:41:54.000000000 -0300
-+++ work/src/lisp/lisp.c 2010-05-10 00:05:55.000000000 -0300
-@@ -5,6 +5,9 @@
- *
- */
-
-+#include "os-common.h"
-+#include <time.h>
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <limits.h>
-diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S
---- work.old/src/lisp/mips-assem.S 2002-08-23 14:01:02.000000000 -0300
-+++ work/src/lisp/mips-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -402,3 +402,7 @@
- move v0, a1
- j _restore_state
- .end save_state
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h
---- work.old/src/lisp/os-common.h 1969-12-31 21:00:00.000000000 -0300
-+++ work/src/lisp/os-common.h 2010-05-10 00:06:22.000000000 -0300
-@@ -0,0 +1 @@
-+char* convert_lisp_string(char *c_string, void *lisp_string, int len);
-diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S
---- work.old/src/lisp/ppc-assem.S 2006-02-25 01:35:58.000000000 -0300
-+++ work/src/lisp/ppc-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -721,3 +721,7 @@
- SET_SIZE(fpu_restore)
-
- #endif
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S
---- work.old/src/lisp/sparc-assem.S 2003-10-23 23:57:00.000000000 -0300
-+++ work/src/lisp/sparc-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -837,3 +837,7 @@
- * End:
- */
-
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S
---- work.old/src/lisp/x86-assem.S 2008-12-24 02:36:40.000000000 -0200
-+++ work/src/lisp/x86-assem.S 2010-05-10 00:06:34.000000000 -0300
-@@ -798,3 +798,7 @@
- ENDFUNC(undefined_foreign_symbol_trap)
-
- #endif /* LINKAGE_TABLE */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif