cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make gcc 4.[67] use __guard_local instead of __guard. From Brad.

Browse Source 
ok matthew@
This commit is contained in:
pascal 2012-09-03 13:24:58 +00:00
parent bc15304e18
commit f080554be1
4 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lang/gcc/4.6/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.34 2012/09/01 00:00:32 pascal Exp $
# $OpenBSD: Makefile,v 1.35 2012/09/03 13:24:58 pascal Exp $
ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64
@ -19,14 +19,14 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION}
PKGNAME-go = gccgo-${FULL_PKGVERSION}
PKGSPEC-main = gcc->=4.6,<4.7
REVISION-main = 10
REVISION-c++ = 10
REVISION-main = 11
REVISION-c++ = 11
REVISION-estdc = 9
REVISION-f95 = 10
REVISION-java = 10
REVISION-objc = 10
REVISION-ada = 10
REVISION-go = 10
REVISION-f95 = 11
REVISION-java = 11
REVISION-objc = 11
REVISION-ada = 11
REVISION-go = 11
SHARED_LIBS = estdc++ 14.0 \
gfortran 3.0 \

19
lang/gcc/4.6/patches/patch-gcc_targhooks_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_targhooks_c,v 1.1 2012/02/16 21:30:15 pascal Exp $
--- gcc/targhooks.c.orig Fri Jan 14 16:02:20 2011
+++ gcc/targhooks.c Sat Feb 11 08:52:32 2012
$OpenBSD: patch-gcc_targhooks_c,v 1.2 2012/09/03 13:24:58 pascal Exp $
--- gcc/targhooks.c.orig Fri Jan 14 10:02:20 2011
+++ gcc/targhooks.c Fri Aug 31 22:02:06 2012
@@ -56,6 +56,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "expr.h"
@ -14,11 +14,20 @@ $OpenBSD: patch-gcc_targhooks_c,v 1.1 2012/02/16 21:30:15 pascal Exp $
t = build_decl (UNKNOWN_LOCATION,
- VAR_DECL, get_identifier ("__stack_chk_guard"),
+ VAR_DECL, get_identifier ("__guard"),
+ VAR_DECL, get_identifier ("__guard_local"),
ptr_type_node);
TREE_STATIC (t) = 1;
TREE_PUBLIC (t) = 1;
@@ -678,67 +679,68 @@ default_stack_protect_guard (void)
@@ -666,6 +667,8 @@ default_stack_protect_guard (void)
TREE_THIS_VOLATILE (t) = 1;
DECL_ARTIFICIAL (t) = 1;
DECL_IGNORED_P (t) = 1;
+ DECL_VISIBILITY (t) = VISIBILITY_HIDDEN;
+ DECL_VISIBILITY_SPECIFIED (t) = 1;
/* Do not share RTL as the declaration is visible outside of
current function. */
@@ -678,67 +681,68 @@ default_stack_protect_guard (void)
return t;
}

12
lang/gcc/4.7/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2012/09/01 00:00:32 pascal Exp $
# $OpenBSD: Makefile,v 1.15 2012/09/03 13:24:58 pascal Exp $
ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64
@ -21,12 +21,12 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION}
#PKGNAME-go = gccgo-${FULL_PKGVERSION}
PKGSPEC-main = gcc->=4.7,<4.8
REVISION-main = 3
REVISION-c++ = 3
REVISION-main = 4
REVISION-c++ = 4
REVISION-estdc = 3
REVISION-f95 = 3
REVISION-objc = 3
REVISION-ada = 3
REVISION-f95 = 4
REVISION-objc = 4
REVISION-ada = 4
SHARED_LIBS = estdc++ 15.0 \
gfortran 4.0 \

19
lang/gcc/4.7/patches/patch-gcc_targhooks_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_targhooks_c,v 1.1.1.1 2012/04/23 15:56:41 pascal Exp $
--- gcc/targhooks.c.orig Fri Feb 10 17:38:37 2012
+++ gcc/targhooks.c Mon Apr 2 20:23:41 2012
$OpenBSD: patch-gcc_targhooks_c,v 1.2 2012/09/03 13:24:58 pascal Exp $
--- gcc/targhooks.c.orig Fri Feb 10 11:38:37 2012
+++ gcc/targhooks.c Fri Aug 31 22:05:49 2012
@@ -56,6 +56,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "expr.h"
@ -14,11 +14,20 @@ $OpenBSD: patch-gcc_targhooks_c,v 1.1.1.1 2012/04/23 15:56:41 pascal Exp $
t = build_decl (UNKNOWN_LOCATION,
- VAR_DECL, get_identifier ("__stack_chk_guard"),
+ VAR_DECL, get_identifier ("__guard"),
+ VAR_DECL, get_identifier ("__guard_local"),
ptr_type_node);
TREE_STATIC (t) = 1;
TREE_PUBLIC (t) = 1;
@@ -657,67 +658,68 @@ default_stack_protect_guard (void)
@@ -645,6 +646,8 @@ default_stack_protect_guard (void)
TREE_THIS_VOLATILE (t) = 1;
DECL_ARTIFICIAL (t) = 1;
DECL_IGNORED_P (t) = 1;
+ DECL_VISIBILITY (t) = VISIBILITY_HIDDEN;
+ DECL_VISIBILITY_SPECIFIED (t) = 1;
/* Do not share RTL as the declaration is visible outside of
current function. */
@@ -657,67 +660,68 @@ default_stack_protect_guard (void)
return t;
}