From: Andreas Tobler <andreast@gcc.gnu.org>
Date: Mon, 30 Sep 2019 07:54:52 +0000 (+0200)
Subject: config.gcc: Use the secure-plt on FreeBSD 13 and upwards for 32-bit PowerPC.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=15bbad92434a184a0baac0c93c7111e6e7fcd9c2;p=gcc.git

config.gcc: Use the secure-plt on FreeBSD 13 and upwards for 32-bit PowerPC.

2019-09-30  Andreas Tobler  <andreast@gcc.gnu.org>

	* config.gcc: Use the secure-plt on FreeBSD 13 and upwards for
	32-bit PowerPC.
	Define TARGET_FREEBSD32_SECURE_PLT for 64-bit PowerPC.
	* config/rs6000/t-freebsd64: Make use of the above define and build
	the 32-bit libraries with secure-plt.

From-SVN: r276295
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c93ea904c08..099d1b9a89f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-09-30  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	* config.gcc: Use the secure-plt on FreeBSD 13 and upwards for
+	32-bit PowerPC.
+	Define TARGET_FREEBSD32_SECURE_PLT for 64-bit PowerPC.
+	* config/rs6000/t-freebsd64: Make use of the above define and build
+	the 32-bit libraries with secure-plt.
+
 2019-09-30  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/91931
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 69d0a024d85..481bc9586a7 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2687,8 +2687,14 @@ powerpc*-*-freebsd*)
 	    	tm_file="${tm_file} rs6000/default64.h rs6000/freebsd64.h"
 		tmake_file="${tmake_file} rs6000/t-freebsd64"
 		extra_options="${extra_options} rs6000/linux64.opt"
+		if test $fbsd_major -ge 13; then
+		    tm_defines="${tm_defines} TARGET_FREEBSD32_SECURE_PLT=1"
+		fi
 		;;
 	     *)
+		if test $fbsd_major -ge 13; then
+		    tm_file="rs6000/secureplt.h ${tm_file}"
+		fi
 	        tm_file="${tm_file} rs6000/freebsd.h"
 		;;
 	esac
diff --git a/gcc/config/rs6000/t-freebsd64 b/gcc/config/rs6000/t-freebsd64
index 3f44bfefb14..dd0d5bb8ee2 100644
--- a/gcc/config/rs6000/t-freebsd64
+++ b/gcc/config/rs6000/t-freebsd64
@@ -27,3 +27,6 @@ MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
 MULTILIB_EXCEPTIONS     =
 MULTILIB_OSDIRNAMES	= ../lib32
 
+SECURE_PLT = $(if $(filter TARGET_FREEBSD32_SECURE_PLT=1, $(tm_defines)),msecure-plt)
+
+MULTILIB_EXTRA_OPTS += $(SECURE_PLT)