From 182a9973035b6a6c40a28320e19bbf13c6e19fd8 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 26 Nov 2015 11:17:20 +0000 Subject: [PATCH] Back out latest change. From-SVN: r230935 --- gcc/ada/ChangeLog | 6 ------ gcc/ada/gnatlink.adb | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d7df276aa1a..331b81dfba7 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,9 +1,3 @@ -2015-11-25 Eric Botcazou - - * gnatlink.adb (Gnatlink): Do not reinstate -fsjlj for the linker - from the switches saved in the ALI file but from the exception - settings. - 2015-11-25 Arnaud Charlet * lib-xref-spark_specific.adb diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb index 0d190eb1a31..67b07b23e3c 100644 --- a/gcc/ada/gnatlink.adb +++ b/gcc/ada/gnatlink.adb @@ -1588,16 +1588,6 @@ begin end if; end; end loop; - - -- Pass -fsjlj to the linker with back-end SJLJ exceptions - - if not ALIs.Table (A).Frontend_Exceptions - and then not ALIs.Table (A).Zero_Cost_Exceptions - then - Linker_Options.Increment_Last; - Linker_Options.Table - (Linker_Options.Last) := new String'("-fsjlj"); - end if; end if; end; end if; -- 2.30.2