diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index dfcef1d2dbc..2c2b307062e 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2010-06-04 Eric Botcazou + + * gnatlink.adb (gnatlink): Remove support for -fsjlj switch. + * gcc-interface/lang-specs.h: Likewise. + 2010-06-03 H.J. Lu PR c++/44294 diff --git a/gcc/ada/gcc-interface/lang-specs.h b/gcc/ada/gcc-interface/lang-specs.h index e0c1be9e103..7f37ef58611 100644 --- a/gcc/ada/gcc-interface/lang-specs.h +++ b/gcc/ada/gcc-interface/lang-specs.h @@ -6,7 +6,7 @@ * * * C Header File * * * - * Copyright (C) 1992-2009, Free Software Foundation, Inc. * + * Copyright (C) 1992-2010, Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * @@ -38,9 +38,6 @@ %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}} \ %{O*} %{W*} %{w} %{p} %{pg:-p} %{a} %{d*} %{f*}\ %{coverage:-fprofile-arcs -ftest-coverage} " -#if CONFIG_DUAL_EXCEPTIONS - "%{fRTS=sjlj:-fsjlj} " -#endif "%{gnatea:-gnatez} %{g*&m*} " #if defined(TARGET_VXWORKS_RTP) "%{fRTS=rtp:-mrtp} " diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb index 4469c91ec5d..e6eec4f2006 100644 --- a/gcc/ada/gnatlink.adb +++ b/gcc/ada/gnatlink.adb @@ -1648,15 +1648,6 @@ begin Linker_Options.Increment_Last; Linker_Options.Table (Linker_Options.Last) := new String'("-mrtp"); - - -- Pass -fsjlj to the linker if --RTS=sjlj was passed - - elsif Arg'Length > 9 - and then Arg (Arg'First + 6 .. Arg'First + 9) = "sjlj" - then - Linker_Options.Increment_Last; - Linker_Options.Table (Linker_Options.Last) := - new String'("-fsjlj"); end if; end if; end;