Switch GCC in ports to PIE by default on powerpc.

This commit is contained in:
pascal 2014-03-23 17:30:19 +00:00
parent 8f4233bbd5
commit 5d3f42f1b1
6 changed files with 33 additions and 23 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.28 2014/03/19 13:53:29 jasper Exp $
# $OpenBSD: Makefile,v 1.29 2014/03/23 17:30:19 pascal Exp $
V = 3.3.6
PKGNAME = g77-$V
REVISION = 5
REVISION = 6
EPOCH = 1
DISTFILES = g77-openbsd-3.3.6.tgz

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_config_gcc,v 1.5 2014/01/12 22:16:02 pascal Exp $
$OpenBSD: patch-gcc_config_gcc,v 1.6 2014/03/23 17:30:20 pascal Exp $
--- gcc/config.gcc.orig Sun Feb 24 16:51:55 2013
+++ gcc/config.gcc Sat Dec 28 18:51:48 2013
+++ gcc/config.gcc Sun Mar 23 17:44:53 2014
@@ -1174,6 +1174,7 @@ i[34567]86-*-openbsd2* | i[34567]86-*-openbsd3.[0123])
use_collect2=yes
;;
@ -9,7 +9,15 @@ $OpenBSD: patch-gcc_config_gcc,v 1.5 2014/01/12 22:16:02 pascal Exp $
# 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*)
@@ -2069,6 +2070,7 @@ romp-*-openbsd*)
# Nothing special
;;
powerpc-*-openbsd*)
+ tm_defines="${tm_defines} PIE_DEFAULT=2"
tm_file="rs6000/rs6000.h rs6000/openbsd1.h dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h openbsd.h ${tm_file}"
tmake_file="${tmake_file} rs6000/t-ppcos rs6000/t-openbsd"
tm_file="${tm_file} exec-stack.h"
@@ -2780,10 +2782,13 @@ vax-*-netbsd*)
use_collect2=yes
;;
vax-*-openbsd*)

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2014/02/07 01:31:40 tobiasu Exp $
# $OpenBSD: Makefile,v 1.29 2014/03/23 17:30:19 pascal Exp $
ONLY_FOR_ARCHS = alpha amd64 i386 powerpc sparc64
DPB_PROPERTIES = parallel
@ -28,12 +28,12 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION}
#PKGNAME-go = gccgo-${FULL_PKGVERSION}
PKGSPEC-main = gcc->=4.8,<4.9
REVISION-main = 2
REVISION-c++ = 2
REVISION-main = 3
REVISION-c++ = 3
#REVISION-estdc =
REVISION-f95 = 2
REVISION-java = 2
REVISION-objc = 2
REVISION-f95 = 3
REVISION-java = 3
REVISION-objc = 3
REVISION-ada = 3
#REVISION-go =

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_config_gcc,v 1.4 2014/01/15 20:18:36 brad Exp $
--- gcc/config.gcc.orig Wed Oct 2 20:47:24 2013
+++ gcc/config.gcc Sun Jan 12 19:39:53 2014
$OpenBSD: patch-gcc_config_gcc,v 1.5 2014/03/23 17:30:19 pascal Exp $
--- gcc/config.gcc.orig Thu Oct 3 02:47:24 2013
+++ gcc/config.gcc Sun Mar 23 18:03:05 2014
@@ -712,6 +712,14 @@ case ${target} in
default_use_cxa_atexit=yes
;;
@ -49,7 +49,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.4 2014/01/15 20:18:36 brad 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 +1984,11 @@ picochip-*)
@@ -1973,11 +1984,12 @@ picochip-*)
use_gcc_stdint=wrap
tmake_file="picochip/t-picochip t-pnt16-warn"
;;
@ -59,6 +59,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.4 2014/01/15 20:18:36 brad Exp $
-# extra_headers=
-# ;;
+powerpc-*-openbsd*)
+ tm_defines="${tm_defines} PIE_DEFAULT=2"
+ tm_file="${tm_file} dbxelf.h elfos.h openbsd.h openbsd-libpthread.h freebsd-spec.h rs6000/sysv4.h rs6000/openbsd.h"
+ tmake_file="${tmake_file} rs6000/t-openbsd"
+ extra_options="${extra_options} rs6000/sysv4.opt openbsd.opt"
@ -66,7 +67,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.4 2014/01/15 20:18:36 brad 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*)
@ -74,7 +75,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.4 2014/01/15 20:18:36 brad 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

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2014/01/18 20:56:53 pascal Exp $
# $OpenBSD: Makefile,v 1.26 2014/03/23 17:30:19 pascal Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
SYSV = 4.2.1
@ -13,7 +13,7 @@ PKGNAME-main = gfortran-$V
PKGNAME-lib = libgfortran-$V
SHARED_LIBS = gfortran 2.0
REVISION = 10
REVISION = 11
CATEGORIES = lang math

View File

@ -1,5 +1,5 @@
--- gcc/config.gcc.orig Sat Feb 3 06:25:20 2007
+++ gcc/config.gcc Sat Dec 28 18:50:38 2013
+++ gcc/config.gcc Sun Mar 23 17:56:17 2014
@@ -552,6 +552,11 @@ case ${target} in
*-*-openbsd2.*|*-*-openbsd3.[012])
tm_defines="${tm_defines} HAS_LIBC_R=1" ;;
@ -79,7 +79,7 @@
case ${target} in
mips*el-*-openbsd*)
tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";;
@@ -1682,11 +1698,11 @@ pdp11-*-bsd)
@@ -1682,11 +1698,12 @@ pdp11-*-bsd)
pdp11-*-*)
use_fixproto=yes
;;
@ -89,6 +89,7 @@
-# extra_headers=
-# ;;
+powerpc-*-openbsd*)
+ tm_defines="${tm_defines} PIE_DEFAULT=2"
+ tm_file="${tm_file} dbxelf.h elfos.h openbsd.h openbsd-libpthread.h freebsd-spec.h rs6000/sysv4.h rs6000/openbsd.h"
+ tmake_file="${tmake_file} rs6000/t-openbsd"
+ extra_options="${extra_options} rs6000/sysv4.opt"
@ -96,7 +97,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 +2166,8 @@ sparc-*-netbsdelf*)
@@ -2150,7 +2167,8 @@ sparc-*-netbsdelf*)
extra_options="${extra_options} sparc/long-double-switch.opt"
;;
sparc64-*-openbsd*)
@ -106,7 +107,7 @@
extra_options="${extra_options} sparc/little-endian.opt"
gas=yes gnu_ld=yes
with_cpu=ultrasparc
@@ -2395,7 +2412,7 @@ vax-*-netbsd*)
@@ -2395,7 +2413,7 @@ vax-*-netbsd*)
use_collect2=yes
;;
vax-*-openbsd*)