Back out latest change.

From-SVN: r230935

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index d7df276aa1a2ee77a5823b81eee0d5661aae0928..331b81dfba78e49cf86d3d65f28b25f647aff4ce 100644 (file)
--- 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 0d190eb1a31111849febb75d6dc4f2c9195f2d3e..67b07b23e3cff61474717620ff3a68ac04094e41 100644 (file)
--- 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;