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

Switch ports gcc to PIE on i386.

Browse Source 
ok sthen@
This commit is contained in:
pascal 2014-01-12 22:16:02 +00:00
parent bfb23599a2
commit 001e0489ab
8 changed files with 68 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/g77/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.26 2014/01/12 14:58:30 naddy Exp $
# $OpenBSD: Makefile,v 1.27 2014/01/12 22:16:02 pascal Exp $
V = 3.3.6
PKGNAME = g77-$V
REVISION = 4
REVISION = 5
EPOCH = 1
DISTFILES = g77-openbsd-3.3.6.tgz

16
lang/g77/patches/patch-gcc_config_gcc
View File

@ -1,7 +1,15 @@
$OpenBSD: patch-gcc_config_gcc,v 1.4 2013/08/09 08:52:03 miod Exp $
--- gcc/config.gcc.orig Sun Feb 24 15:51:55 2013
+++ gcc/config.gcc Thu Aug 8 21:57:37 2013
@@ -2780,10 +2780,13 @@ vax-*-netbsd*)
$OpenBSD: patch-gcc_config_gcc,v 1.5 2014/01/12 22:16:02 pascal Exp $
--- gcc/config.gcc.orig Sun Feb 24 16:51:55 2013
+++ gcc/config.gcc Sat Dec 28 18:51:48 2013
@@ -1174,6 +1174,7 @@ i[34567]86-*-openbsd2* | i[34567]86-*-openbsd3.[0123])
use_collect2=yes
;;
i[34567]86-*-openbsd*)
+ tm_defines="${tm_defines} PIE_DEFAULT=1"
# needed to unconfuse gdb
tmake_file="t-libc-ok t-openbsd i386/t-openbsd"
tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h elfos.h"
@@ -2780,10 +2781,13 @@ vax-*-netbsd*)
use_collect2=yes
;;
vax-*-openbsd*)

16
lang/gcc/4.6/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2014/01/12 14:58:30 naddy Exp $
# $OpenBSD: Makefile,v 1.68 2014/01/12 22:16:02 pascal Exp $
ONLY_FOR_ARCHS = alpha amd64 hppa i386 powerpc sparc64
DPB_PROPERTIES = parallel
@ -24,14 +24,14 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION}
PKGNAME-go = gccgo-${FULL_PKGVERSION}
PKGSPEC-main = gcc->=4.6,<4.7
REVISION-main = 5
REVISION-c++ = 2
REVISION-main = 6
REVISION-c++ = 3
#REVISION-estdc =
REVISION-f95 = 2
REVISION-java = 2
REVISION-objc = 1
REVISION-ada = 4
REVISION-go = 2
REVISION-f95 = 3
REVISION-java = 3
REVISION-objc = 2
REVISION-ada = 5
REVISION-go = 3
SHARED_LIBS = estdc++ 14.0 \
gfortran 3.0 \

21
lang/gcc/4.6/patches/patch-gcc_config_gcc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_config_gcc,v 1.7 2013/06/07 07:54:23 pascal Exp $
$OpenBSD: patch-gcc_config_gcc,v 1.8 2014/01/12 22:16:02 pascal Exp $
--- gcc/config.gcc.orig Wed Mar 6 18:40:07 2013
+++ gcc/config.gcc Sat Apr 13 16:20:31 2013
+++ gcc/config.gcc Sat Dec 28 18:58:28 2013
@@ -668,6 +668,14 @@ case ${target} in
*-*-openbsd2.*|*-*-openbsd3.[012])
tm_defines="${tm_defines} HAS_LIBC_R=1" ;;
@ -35,7 +35,14 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 2013/06/07 07:54:23 pascal Exp $
hppa[12]*-*-hpux10*)
case ${target} in
hppa1.1-*-* | hppa2*-*-*)
@@ -1254,6 +1266,12 @@ i[34567]86-*-openbsd*)
@@ -1248,12 +1260,19 @@ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
use_collect2=yes
;;
i[34567]86-*-openbsd*)
+ tm_defines="${tm_defines} PIE_DEFAULT=1"
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h i386/openbsdelf.h"
extra_options="${extra_options} openbsd.opt"
gas=yes
gnu_ld=yes
;;
@ -48,7 +55,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 2013/06/07 07:54:23 pascal Exp $
i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
# Intel 80386's running GNU/*
# with ELF format using glibc 2
@@ -1914,14 +1932,15 @@ mips*-*-linux*) # Linux MIPS, either endian.
@@ -1914,14 +1933,15 @@ mips*-*-linux*) # Linux MIPS, either endian.
test x$with_llsc != x || with_llsc=yes
;;
mips*-*-openbsd*)
@ -69,7 +76,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 2013/06/07 07:54:23 pascal Exp $
esac
;;
mips*-sde-elf*)
@@ -2061,10 +2080,11 @@ picochip-*)
@@ -2061,10 +2081,11 @@ picochip-*)
tmake_file="picochip/t-picochip t-pnt16-warn"
;;
# port not yet contributed
@ -85,7 +92,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 2013/06/07 07:54:23 pascal Exp $
powerpc-*-darwin*)
extra_options="${extra_options} rs6000/darwin.opt"
extra_parts="crt2.o"
@@ -2665,6 +2685,7 @@ sparc64-*-netbsd*)
@@ -2665,6 +2686,7 @@ sparc64-*-netbsd*)
tmake_file="${tmake_file} sparc/t-netbsd64"
;;
sparc64-*-openbsd*)
@ -93,7 +100,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.7 2013/06/07 07:54:23 pascal Exp $
tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp64-elf.h"
tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h sparc/openbsd64.h"
extra_options="${extra_options} openbsd.opt"
@@ -2826,6 +2847,12 @@ case ${target} in
@@ -2826,6 +2848,12 @@ case ${target} in
else
arch=i386
fi

14
lang/gcc/4.8/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2014/01/12 14:58:30 naddy Exp $
# $OpenBSD: Makefile,v 1.26 2014/01/12 22:16:02 pascal Exp $
ONLY_FOR_ARCHS = alpha amd64 i386 powerpc sparc64
DPB_PROPERTIES = parallel
@ -28,13 +28,13 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION}
#PKGNAME-go = gccgo-${FULL_PKGVERSION}
PKGSPEC-main = gcc->=4.8,<4.9
REVISION-main = 0
REVISION-c++ = 0
REVISION-main = 1
REVISION-c++ = 1
#REVISION-estdc =
REVISION-f95 = 0
REVISION-java = 0
REVISION-objc = 0
REVISION-ada = 0
REVISION-f95 = 1
REVISION-java = 1
REVISION-objc = 1
REVISION-ada = 1
#REVISION-go =
SHARED_LIBS = estdc++ 16.0 \

20
lang/gcc/4.8/patches/patch-gcc_config_gcc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_config_gcc,v 1.2 2013/12/02 22:34:55 pascal Exp $
$OpenBSD: patch-gcc_config_gcc,v 1.3 2014/01/12 22:16:02 pascal Exp $
--- gcc/config.gcc.orig Thu Oct 3 02:47:24 2013
+++ gcc/config.gcc Wed Oct 16 18:56:48 2013
+++ gcc/config.gcc Sat Dec 28 19:04:43 2013
@@ -712,6 +712,14 @@ case ${target} in
default_use_cxa_atexit=yes
;;
@ -33,7 +33,15 @@ $OpenBSD: patch-gcc_config_gcc,v 1.2 2013/12/02 22:34:55 pascal Exp $
tm_file="${tm_file} dbxelf.h elfos.h openbsd.h openbsd-stdint.h openbsd-libpthread.h \
pa/pa-openbsd.h pa/pa32-regs.h pa/pa32-openbsd.h"
tmake_file="${tmake_file} pa/t-openbsd"
@@ -1252,6 +1261,7 @@ i[34567]86-*-openbsd*)
@@ -1245,6 +1254,7 @@ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
use_collect2=yes
;;
i[34567]86-*-openbsd*)
+ tm_defines="${tm_defines} PIE_DEFAULT=1"
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h i386/openbsdelf.h"
extra_options="${extra_options} openbsd.opt"
@@ -1252,6 +1262,7 @@ i[34567]86-*-openbsd*)
gnu_ld=yes
;;
x86_64-*-openbsd*)
@ -41,7 +49,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.2 2013/12/02 22:34:55 pascal Exp $
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h i386/x86-64.h i386/openbsdelf.h"
extra_options="${extra_options} openbsd.opt"
@@ -1973,11 +1983,12 @@ picochip-*)
@@ -1973,11 +1984,12 @@ picochip-*)
use_gcc_stdint=wrap
tmake_file="picochip/t-picochip t-pnt16-warn"
;;
@ -59,7 +67,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.2 2013/12/02 22:34:55 pascal Exp $
powerpc-*-darwin*)
extra_options="${extra_options} rs6000/darwin.opt"
case ${target} in
@@ -2524,6 +2535,7 @@ sparc64-*-netbsd*)
@@ -2524,6 +2536,7 @@ sparc64-*-netbsd*)
tmake_file="${tmake_file} sparc/t-sparc sparc/t-netbsd64"
;;
sparc64-*-openbsd*)
@ -67,7 +75,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.2 2013/12/02 22:34:55 pascal Exp $
tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp64-elf.h"
tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h sparc/openbsd64.h"
extra_options="${extra_options} openbsd.opt"
@@ -2710,6 +2722,12 @@ case ${target} in
@@ -2710,6 +2723,12 @@ case ${target} in
else
arch=i386
fi

4
lang/gfortran/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2014/01/12 14:58:30 naddy Exp $
# $OpenBSD: Makefile,v 1.24 2014/01/12 22:16:02 pascal Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
BROKEN-powerpc = Segmentation fault during build
@ -14,7 +14,7 @@ PKGNAME-main = gfortran-$V
PKGNAME-lib = libgfortran-$V
SHARED_LIBS = gfortran 2.0
REVISION = 9
REVISION = 10
CATEGORIES = lang math

16
lang/gfortran/patches/patch-gcc_config_gcc
View File

@ -1,5 +1,5 @@
--- gcc/config.gcc.orig Sat Feb 3 06:25:20 2007
+++ gcc/config.gcc Wed Aug 21 22:34:19 2013
+++ gcc/config.gcc Sat Dec 28 18:50:38 2013
@@ -552,6 +552,11 @@ case ${target} in
*-*-openbsd2.*|*-*-openbsd3.[012])
tm_defines="${tm_defines} HAS_LIBC_R=1" ;;
@ -38,9 +38,11 @@
arm*-*-linux*) # ARM GNU/Linux with ELF
tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
tmake_file="${tmake_file} t-linux arm/t-arm"
@@ -1080,10 +1089,16 @@ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
@@ -1079,11 +1088,18 @@ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
use_collect2=yes
;;
i[34567]86-*-openbsd*)
+ tm_defines="${tm_defines} PIE_DEFAULT=1"
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
- tm_file="${tm_file} openbsd.h i386/openbsdelf.h"
+ tm_file="${tm_file} openbsd.h openbsd-libpthread.h i386/openbsdelf.h"
@ -56,7 +58,7 @@
i[34567]86-*-coff*)
tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h"
use_fixproto=yes
@@ -1474,7 +1489,7 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
@@ -1474,7 +1490,7 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
m68k*-*-openbsd*)
# needed to unconfuse gdb
tm_defines="${tm_defines} OBSD_OLD_GAS TARGET_DEFAULT=(MASK_68020|MASK_68881|MASK_BITFIELD)"
@ -65,7 +67,7 @@
tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
# we need collect2 until our bug is fixed...
use_collect2=yes
@@ -1562,9 +1577,9 @@ mips*-*-linux*) # Linux MIPS, either endian.
@@ -1562,9 +1578,9 @@ mips*-*-linux*) # Linux MIPS, either endian.
esac
;;
mips*-*-openbsd*)
@ -77,7 +79,7 @@
case ${target} in
mips*el-*-openbsd*)
tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";;
@@ -1682,11 +1697,11 @@ pdp11-*-bsd)
@@ -1682,11 +1698,11 @@ pdp11-*-bsd)
pdp11-*-*)
use_fixproto=yes
;;
@ -94,7 +96,7 @@
powerpc64-*-linux*)
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
test x$with_cpu != x || cpu_is_64bit=yes
@@ -2150,7 +2165,8 @@ sparc-*-netbsdelf*)
@@ -2150,7 +2166,8 @@ sparc-*-netbsdelf*)
extra_options="${extra_options} sparc/long-double-switch.opt"
;;
sparc64-*-openbsd*)
@ -104,7 +106,7 @@
extra_options="${extra_options} sparc/little-endian.opt"
gas=yes gnu_ld=yes
with_cpu=ultrasparc
@@ -2395,7 +2411,7 @@ vax-*-netbsd*)
@@ -2395,7 +2412,7 @@ vax-*-netbsd*)
use_collect2=yes
;;
vax-*-openbsd*)