[gentoo-commits] gentoo-x86 commit in dev-util/plan9port/files: plan9port-noexecstack.patch plan9port-9660srv-errno.patch

[gentoo-commits] gentoo-x86 commit in dev-util/plan9port/files: plan9port-noexecstack.patch plan9port-9660srv-errno.patch

[Anthony G. Basile (blueness)]

blueness    13/01/04 04:03:59

  Added:                plan9port-noexecstack.patch
                        plan9port-9660srv-errno.patch
  Log:
  Reintroduced to tree
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

Revision  Changes    Path
1.1                  dev-util/plan9port/files/plan9port-noexecstack.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/plan9port/files/plan9port-noexecstack.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/plan9port/files/plan9port-noexecstack.patch?rev=1.1&content-type=text/plain

Index: plan9port-noexecstack.patch
===================================================================
Remove unneeded executable stack

Assembly routines in libthread and libmp use an executable stack by
default. This is not needed and can be removed using --noexecstack.

The plan9port 9a wrapper wrapper needs to be modified to pass flags to the
underlying assembler first though..

Patch by Andy Spencer

  http://code.swtch.com/plan9port/issue/76/
--- a/bin/9a
+++ b/bin/9a
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-if [ $# != 1 ]; then
-	echo 'usage: 9a file.s' 1>&2
-	exit 1
-fi
-
 test -f $PLAN9/config && . $PLAN9/config
 
 aflags=""
@@ -17,5 +12,16 @@ Darwin-*x86_64*)
 	;;
 esac
 
-out=`echo $1 | sed 's/\.s$//;s/$/.o/'`
-exec as $aflags -o $out $1
+for arg; do
+	case $arg in
+	-*)
+		opts="$opts $arg"
+		;;
+	*.s)
+		src=$arg
+		dst=$(echo $arg | sed 's/\.s/\.o/')
+		;;
+	esac
+done
+
+exec as $aflags $opts -o $dst $src
--- a/src/mkhdr
+++ b/src/mkhdr
@@ -30,7 +30,7 @@ AR=9ar
 INSTALL=install
 CFLAGS=
 LDFLAGS=
-AFLAGS=
+AFLAGS=--noexecstack
 CLEANFILES=
 NUKEFILES=
 YACC=9 yacc



1.1                  dev-util/plan9port/files/plan9port-9660srv-errno.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/plan9port/files/plan9port-9660srv-errno.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/plan9port/files/plan9port-9660srv-errno.patch?rev=1.1&content-type=text/plain

Index: plan9port-9660srv-errno.patch
===================================================================
Defining int errno; resuls in the following error on amd64:

  ld: errno: TLS definition in /lib64/libc.so.6 section .tbss mismatches
  non-TLS reference in main.o

Patch by Alex Efros:

  http://code.swtch.com/plan9port/issue/39/
--- plan9/src/cmd/9660srv/main.c
+++ plan9.new/src/cmd/9660srv/main.c
@@ -38,7 +38,7 @@
 uchar mdata[Maxiosize];
 char fdata[Maxfdata];
 uchar statbuf[STATMAX];
-int errno;
+#include <errno.h>
 
 
 extern Xfsub	*xsublist[];