kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make this patch be more selective so that this package will work

Browse source 
on NetBSD/alpha versions 1.6 and newer.  Previously, this package only
worked on pre-1.6.  Fixes problems noted in recent bulk builds.
This commit is contained in:
dmcmahill 2003-11-25 22:35:14 +00:00
parent b1bcb06ca8
commit 56b89512f4
3 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/gcc-ssp/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.14 2003/07/22 23:15:32 jmc Exp $
$NetBSD: distinfo,v 1.15 2003/11/25 22:35:14 dmcmahill Exp $
SHA1 (gcc-2.95.3.tar.gz) = 535d27038d161c0e7c2662702e11a48aa97ef622
Size (gcc-2.95.3.tar.gz) = 12911721 bytes
@ -6,7 +6,7 @@ SHA1 (protector-2.95.3-13.tar.gz) = 22e3464d94eb864d1263a87c9158eb5e9311d33b
Size (protector-2.95.3-13.tar.gz) = 20858 bytes
SHA1 (gcc-2.95.3-diff-2002-08-29.gz) = 9e54a31e78070cba3f6840275350bd0cbf20fe84
Size (gcc-2.95.3-diff-2002-08-29.gz) = 564720 bytes
SHA1 (patch-aa) = 1f6daca7e6abe4c29987f1360d2c77e4c344b6d1
SHA1 (patch-aa) = 1d9db3e2fecfd3070abcc930dbe4b37669efb3a7
SHA1 (patch-ab) = 0a9df2c9abb9a3965c085769eb09a6912f894388
SHA1 (patch-ac) = f42b5ab389c3a51991e61cdb7533875003308001
SHA1 (patch-ad) = 2fb8cda55220bd202a4b7948277d00f293718caf

4
lang/gcc/distinfo
View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.20 2003/07/12 08:53:40 jtb Exp $
$NetBSD: distinfo,v 1.21 2003/11/25 22:35:14 dmcmahill Exp $
SHA1 (gcc-2.95.3.tar.gz) = 535d27038d161c0e7c2662702e11a48aa97ef622
Size (gcc-2.95.3.tar.gz) = 12911721 bytes
SHA1 (gcc-2.95.3-diff-2002-08-29.gz) = 9e54a31e78070cba3f6840275350bd0cbf20fe84
Size (gcc-2.95.3-diff-2002-08-29.gz) = 564720 bytes
SHA1 (patch-aa) = 1f6daca7e6abe4c29987f1360d2c77e4c344b6d1
SHA1 (patch-aa) = 1d9db3e2fecfd3070abcc930dbe4b37669efb3a7
SHA1 (patch-ab) = 0a9df2c9abb9a3965c085769eb09a6912f894388
SHA1 (patch-ac) = f42b5ab389c3a51991e61cdb7533875003308001
SHA1 (patch-ad) = 2fb8cda55220bd202a4b7948277d00f293718caf

39
lang/gcc/patches/patch-aa
View file

@ -1,21 +1,42 @@
$NetBSD: patch-aa,v 1.5 2002/08/13 01:58:57 dmcmahill Exp $
$NetBSD: patch-aa,v 1.6 2003/11/25 22:35:14 dmcmahill Exp $
from revision 1.5 of patch-ae:
Hand edit the alpha/netbsd.h patch. -current gcc relies on a new linker script
which only differs in setting the entry point. Let this use the default
linker script for alpha but force the entry point so this will work on older
NetBSD installs for alpha.
NetBSD installs for alpha. For NetBSD-1.6 and newer, we don't need to change
the link spec.
--- ../gcc-2.95.3/gcc/config/alpha/netbsd.h.orig Sun Aug 11 19:38:42 2002
--- ../gcc-2.95.3/gcc/config/alpha/netbsd.h.orig Tue Nov 25 17:51:14 2003
+++ ../gcc-2.95.3/gcc/config/alpha/netbsd.h
@@ -59,7 +59,8 @@ Boston, MA 02111-1307, USA. */
@@ -58,6 +58,8 @@ Boston, MA 02111-1307, USA. */
common to all ELF targets, except for the name of the start function. */
#undef LINK_SPEC
+#include <sys/param.h>
+#if defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106000000
#define LINK_SPEC \
- "-m elf64alpha_nbsd \
"-m elf64alpha_nbsd \
%{O*:-O3} %{!O*:-O1} \
@@ -70,6 +72,21 @@ Boston, MA 02111-1307, USA. */
%{rdynamic:-export-dynamic} \
%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}} \
%{static:-static}}"
+#else
+#define LINK_SPEC \
+ "-m elf64alpha \
+ -e __start \
%{O*:-O3} %{!O*:-O1} \
%{assert*} %{R*} \
%{shared:-shared} \
+ %{O*:-O3} %{!O*:-O1} \
+ %{assert*} %{R*} \
+ %{shared:-shared} \
+ %{!shared: \
+ -dc -dp \
+ %{!nostdlib:%{!r*:%{!e*:-e __start}}} \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+ %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}} \
+ %{static:-static}}"
+#endif
/* Names to predefine in the preprocessor for this target machine.
XXX NetBSD, by convention, shouldn't do __alpha, but lots of applications