diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-02 16:38:51 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-02 16:38:51 +0000 |
| commit | e5de2b3fd1c5c2e496c5fb8bdc448291e25c7350 (patch) | |
| tree | be0b8d8f0acdbcfbd3f644cd2a3c44e4a510a866 | |
| parent | 7b1b3391e9207600a8a114c75480c90bd7cf740b (diff) | |
| download | gcc-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
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/ada-default-project-path.diff | 5 | ||||
| -rw-r--r-- | debian/patches/ada-link-shlib.diff | 10 |
3 files changed, 11 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index b40fe0f..d863c87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ gcc-4.9 (4.9.0-2) UNRELEASED; urgency=medium cross compiler. Install hppa64 alternatives. Addresses: #745967. * Fix the as and ld symlinks for the hppa64 cross compiler. * Add the gnat backport for AArch64. + * Update gnat patches not to use tabs and too long lines. -- Matthias Klose <doko@debian.org> Fri, 02 May 2014 13:51:28 +0200 diff --git a/debian/patches/ada-default-project-path.diff b/debian/patches/ada-default-project-path.diff index ccf6379..cc91e7d 100644 --- a/debian/patches/ada-default-project-path.diff +++ b/debian/patches/ada-default-project-path.diff @@ -44,7 +44,7 @@ Index: b/src/gcc/ada/prj-env.adb Add_Default_Dir : Boolean := True; First : Positive; Last : Positive; -@@ -2084,74 +2084,8 @@ +@@ -2084,74 +2084,9 @@ -- Set the initial value of Current_Project_Path @@ -117,7 +117,8 @@ Index: b/src/gcc/ada/prj-env.adb - Free (Prefix); - end; + if Add_Default_Dir and Sdefault.Project_Dir_Prefix /= null then -+ Add_Str_To_Name_Buffer (Path_Separator & Sdefault.Project_Dir_Prefix.all); ++ Add_Str_To_Name_Buffer (Path_Separator ++ & Sdefault.Project_Dir_Prefix.all); end if; Self.Path := new String'(Name_Buffer (1 .. Name_Len)); 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)); |