summaryrefslogtreecommitdiff
path: root/debian/patches/ada-link-shlib.diff
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-05-02 16:38:51 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-05-02 16:38:51 +0000
commite5de2b3fd1c5c2e496c5fb8bdc448291e25c7350 (patch)
treebe0b8d8f0acdbcfbd3f644cd2a3c44e4a510a866 /debian/patches/ada-link-shlib.diff
parent7b1b3391e9207600a8a114c75480c90bd7cf740b (diff)
downloadgcc-49-e5de2b3fd1c5c2e496c5fb8bdc448291e25c7350.tar.gz
* Update gnat patches not to use tabs and too long lines.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7335 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/patches/ada-link-shlib.diff')
-rw-r--r--debian/patches/ada-link-shlib.diff10
1 files changed, 7 insertions, 3 deletions
diff --git a/debian/patches/ada-link-shlib.diff b/debian/patches/ada-link-shlib.diff
index a3e61d3..3dfed28 100644
--- a/debian/patches/ada-link-shlib.diff
+++ b/debian/patches/ada-link-shlib.diff
@@ -1,6 +1,8 @@
# DP: In gnatlink, pass the options and libraries after objects to the
# DP: linker to avoid link failures with --as-needed. Closes: #680292.
+Index: b/src/gcc/ada/mlib-tgt-specific-linux.adb
+===================================================================
--- a/src/gcc/ada/mlib-tgt-specific-linux.adb
+++ b/src/gcc/ada/mlib-tgt-specific-linux.adb
@@ -81,19 +81,54 @@
@@ -60,12 +62,13 @@
else
declare
-@@ -111,18 +146,18 @@
+@@ -111,18 +146,20 @@
Utl.Gcc
(Output_File => Lib_Version,
Objects => Ofiles,
- Options => Options & Version_Arg,
-+ Options => N_Options (N_Options'First .. Options_Last) & Version_Arg,
++ Options => N_Options (N_Options'First .. Options_Last)
++ & Version_Arg,
Driver_Name => Driver_Name,
- Options_2 => No_Argument_List);
+ Options_2 => Real_Options_2 (1 .. Real_Options_2_Last));
@@ -76,7 +79,8 @@
(Output_File => Lib_Dir & Directory_Separator & Lib_Version,
Objects => Ofiles,
- Options => Options & Version_Arg,
-+ Options => N_Options (N_Options'First .. Options_Last) & Version_Arg,
++ Options => N_Options (N_Options'First .. Options_Last)
++ & Version_Arg,
Driver_Name => Driver_Name,
- Options_2 => No_Argument_List);
+ Options_2 => Real_Options_2 (1 .. Real_Options_2_Last));