From: ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 26 Nov 2015 11:17:20 +0000 (+0000)
Subject: Back out latest change.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6eb7f9aa53cf7317bdf7726568b4645eab5f1f9e;p=thirdparty%2Fgcc.git

Back out latest change.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230935 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d7df276aa1a2..331b81dfba78 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,9 +1,3 @@
-2015-11-25  Eric Botcazou  <ebotcazou@adacore.com>
-
-	* 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  <charlet@adacore.com>
 
 	* lib-xref-spark_specific.adb
diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb
index 0d190eb1a311..67b07b23e3cf 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;