Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[John Paul Adrian Glaubitz]

On 12/22/2016 12:36 PM, John Paul Adrian Glaubitz wrote:
> Could you please remove the ada-m68k.diff patch from the gcc-7
> source package now. It's existence still breaks the build, it has
> been merged upstream now as already discussed.
> 
> Ada is currently is disabled on gcc-6 and gcc-7 anyway, so gcc-7
> should build fine with the patch removed unless there are other
> Ada-unrelated issues.

I just did that. gcc-7 built fine on m68k and I just uploaded it.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[John Paul Adrian Glaubitz]

Hi Matthias!

On 12/05/2016 12:42 PM, John Paul Adrian Glaubitz wrote:
>> gcc upstream just merged the patch after I had to modify it [1].
>>
>>
>>> [1] https://gcc.gnu.org/viewcvs/gcc?view=revision=243247
> 
> Ah, there is no gcc-7 branch yet. So we actually won't need this
> patch but just an updated gcc snapshot for the next upload :).
> 
> The patch can then be dropped from the Debian package.

Could you please remove the ada-m68k.diff patch from the gcc-7
source package now. It's existence still breaks the build, it has
been merged upstream now as already discussed.

Ada is currently is disabled on gcc-6 and gcc-7 anyway, so gcc-7
should build fine with the patch removed unless there are other
Ada-unrelated issues.

It would be good to see the gcc-7 builds on m68k go further than the
patch-apply stage, so I can investigate into remaining issues later.

Thanks,
Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[John Paul Adrian Glaubitz]

On 12/04/2016 06:33 PM, John Paul Adrian Glaubitz wrote:
> OK, attaching the updated patch which applies cleanly.

gcc upstream just merged the patch after I had to modify it [1].

Attaching the updated version.

Thanks,
Adrian

> [1] https://gcc.gnu.org/viewcvs/gcc?view=revision=243247

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
>From a781b869f0307566f58d372f6b1b28dd260dcf17 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz 
Date: Mon, 5 Dec 2016 12:17:09 +0100
Subject: [PATCH] 2011-10-12  Mikael Pettersson  

PR ada/48835
* gcc-interface/Makefile.in: Add support for m68k-linux.
* system-linux-m68k.ads: New file based on system-linux-ppc.ads
and system-vxworks-m68k.ads.

2016-12-05 John Paul Adrian Glaubitz 

* Update for gcc-7.
---
 gcc/ada/gcc-interface/Makefile.in |  29 +++
 gcc/ada/system-linux-m68k.ads | 155 ++
 2 files changed, 184 insertions(+)
 create mode 100644 gcc/ada/system-linux-m68k.ads

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index ec8aa076cbb..98889c0f30f 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -2049,6 +2049,35 @@ ifeq ($(strip $(filter-out hppa% linux%,$(target_cpu) $(target_os))),)
   LIBRARY_VERSION := $(LIB_VERSION)
 endif
 
+# M68K Linux
+ifeq ($(strip $(filter-out m68k% linux%,$(target_cpu) $(target_os))),)
+  LIBGNAT_TARGET_PAIRS = \
+  a-intnam.adshttp://www.gnu.org/licenses/>.  --
+--  --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.  --
+--  --
+--
+
+package System is
+   pragma Pure;
+   --  Note that we take advantage of the implementation permission to make
+   --  this unit Pure instead of Preelaborable; see RM 13.7.1(15). In Ada
+   --  2005, this is Pure in any case (AI-362).
+
+   type Name is (SYSTEM_NAME_GNAT);
+   System_Name : constant Name := SYSTEM_NAME_GNAT;
+
+   --  System-Dependent Named Numbers
+
+   Min_Int   : constant := Long_Long_Integer'First;
+   Max_Int   : constant := Long_Long_Integer'Last;
+
+   Max_Binary_Modulus: constant := 2 ** Long_Long_Integer'Size;
+   Max_Nonbinary_Modulus : constant := 2 ** Integer'Size - 1;
+
+   Max_Base_Digits   : constant := Long_Long_Float'Digits;
+   Max_Digits: constant := Long_Long_Float'Digits;
+
+   Max_Mantissa  : constant := 63;
+   Fine_Delta: constant := 2.0 ** (-Max_Mantissa);
+
+   Tick  : constant := 0.000_001;
+
+   --  Storage-related Declarations
+
+   type Address is private;
+   pragma Preelaborable_Initialization (Address);
+   Null_Address : constant Address;
+
+   Storage_Unit : constant := 8;
+   Word_Size: constant := 32;
+   Memory_Size  : constant := 2 ** 32;
+
+   --  Address comparison
+
+   function "<"  (Left, Right : Address) return Boolean;
+   function "<=" (Left, Right : Address) return Boolean;
+   function ">"  (Left, Right : Address) return Boolean;
+   function ">=" (Left, Right : Address) return Boolean;
+   function "="  (Left, Right : Address) return Boolean;
+
+   pragma Import (Intrinsic, "<");
+   pragma Import (Intrinsic, "<=");
+   pragma Import (Intrinsic, ">");
+   pragma Import (Intrinsic, ">=");
+   pragma Import (Intrinsic, "=");
+
+   --  Other System-Dependent Declarations
+
+   type Bit_Order is (High_Order_First, Low_Order_First);
+   Default_Bit_Order : constant Bit_Order := High_Order_First;
+   pragma Warnings (Off, Default_Bit_Order); -- kill constant condition warning
+
+   --  Priority-related Declarations (RM D.1)
+
+   --  Is the following actually true for GNU/Linux/m68k?
+   --
+   --  0 .. 98 corresponds to the system priority range 1 .. 99.
+   --
+   --  If the scheduling policy is SCHED_FIFO or SCHED_RR the runtime makes use
+   --  of the entire range provided by the system.
+   --
+   --  If the scheduling policy is SCHED_OTHER the only valid system priority
+   --  is 1 and other values are simply ignored.
+
+   Max_Priority   : constant Positive := 97;
+   Max_Interrupt_Priority : constant Positive := 98;
+
+   subtype Any_Priority   is Integer  range  0 .. 98;
+   subtype Priority   is Any_Priority range  0 .. 97;
+   subtype Interrupt_Priority is Any_Priority range 98 .. 98;
+
+   Default_Priority : constant Priority := 48;
+
+private
+
+   type Address is 

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[John Paul Adrian Glaubitz]

On 12/05/2016 12:32 PM, John Paul Adrian Glaubitz wrote:
> On 12/04/2016 06:33 PM, John Paul Adrian Glaubitz wrote:
>> OK, attaching the updated patch which applies cleanly.
> 
> gcc upstream just merged the patch after I had to modify it [1].
> 
> 
>> [1] https://gcc.gnu.org/viewcvs/gcc?view=revision=243247

Ah, there is no gcc-7 branch yet. So we actually won't need this
patch but just an updated gcc snapshot for the next upload :).

The patch can then be dropped from the Debian package.

Thanks,

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[John Paul Adrian Glaubitz]

On 12/04/2016 06:26 PM, Andreas Schwab wrote:
> On Dez 04 2016, John Paul Adrian Glaubitz  
> wrote:
> 
>> So I assume we can strip the patch from the changes in s-memory.adb and
>> s-memory.ads?
> 
> Yes.

OK, attaching the updated patch which applies cleanly.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
gcc/ada/

2011-10-12  Mikael Pettersson  

	PR ada/48835
	* gcc-interface/Makefile.in: Add support for m68k-linux.
	* system-linux-m68k.ads: New file based on system-linux-ppc.ads
	and system-vxworks-m68k.ads.
	* s-memory.adb (Gnat_Malloc): New wrapper around Alloc, returning
	the memory address as a pointer not an integer.
	Add Gnat_Malloc -> __gnat_malloc export.
	* s-memory.ads: Remove Alloc -> __gnat_malloc export.

Index: b/src/gcc/ada/gcc-interface/Makefile.in
===
--- a/src/gcc/ada/gcc-interface/Makefile.in
+++ b/src/gcc/ada/gcc-interface/Makefile.in
@@ -2084,6 +2084,35 @@ ifeq ($(strip $(filter-out hppa% linux%,
   LIBRARY_VERSION := $(LIB_VERSION)
 endif
 
+# M68K Linux
+ifeq ($(strip $(filter-out m68k% linux%,$(arch) $(osys))),)
+  LIBGNAT_TARGET_PAIRS = \
+  a-intnam.adshttp://www.gnu.org/licenses/>.  --
+--  --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.  --
+--  --
+--
+
+package System is
+   pragma Pure;
+   --  Note that we take advantage of the implementation permission to make
+   --  this unit Pure instead of Preelaborable; see RM 13.7.1(15). In Ada
+   --  2005, this is Pure in any case (AI-362).
+
+   type Name is (SYSTEM_NAME_GNAT);
+   System_Name : constant Name := SYSTEM_NAME_GNAT;
+
+   --  System-Dependent Named Numbers
+
+   Min_Int   : constant := Long_Long_Integer'First;
+   Max_Int   : constant := Long_Long_Integer'Last;
+
+   Max_Binary_Modulus: constant := 2 ** Long_Long_Integer'Size;
+   Max_Nonbinary_Modulus : constant := 2 ** Integer'Size - 1;
+
+   Max_Base_Digits   : constant := Long_Long_Float'Digits;
+   Max_Digits: constant := Long_Long_Float'Digits;
+
+   Max_Mantissa  : constant := 63;
+   Fine_Delta: constant := 2.0 ** (-Max_Mantissa);
+
+   Tick  : constant := 0.000_001;
+
+   --  Storage-related Declarations
+
+   type Address is private;
+   pragma Preelaborable_Initialization (Address);
+   Null_Address : constant Address;
+
+   Storage_Unit : constant := 8;
+   Word_Size: constant := 32;
+   Memory_Size  : constant := 2 ** 32;
+
+   --  Address comparison
+
+   function "<"  (Left, Right : Address) return Boolean;
+   function "<=" (Left, Right : Address) return Boolean;
+   function ">"  (Left, Right : Address) return Boolean;
+   function ">=" (Left, Right : Address) return Boolean;
+   function "="  (Left, Right : Address) return Boolean;
+
+   pragma Import (Intrinsic, "<");
+   pragma Import (Intrinsic, "<=");
+   pragma Import (Intrinsic, ">");
+   pragma Import (Intrinsic, ">=");
+   pragma Import (Intrinsic, "=");
+
+   --  Other System-Dependent Declarations
+
+   type Bit_Order is (High_Order_First, Low_Order_First);
+   Default_Bit_Order : constant Bit_Order := High_Order_First;
+   pragma Warnings (Off, Default_Bit_Order); -- kill constant condition warning
+
+   --  Priority-related Declarations (RM D.1)
+
+   --  Is the following actually true for GNU/Linux/m68k?
+   --
+   --  0 .. 98 corresponds to the system priority range 1 .. 99.
+   --
+   --  If the scheduling policy is SCHED_FIFO or SCHED_RR the runtime makes use
+   --  of the entire range provided by the system.
+   --
+   --  If the scheduling policy is SCHED_OTHER the only valid system priority
+   --  is 1 and other values are simply ignored.
+
+   Max_Priority   : constant Positive := 97;
+   Max_Interrupt_Priority : constant Positive := 98;
+
+   subtype Any_Priority   is Integer  range  0 .. 98;
+   subtype Priority   is Any_Priority range  0 .. 97;
+   subtype Interrupt_Priority is Any_Priority range 98 .. 98;
+
+   Default_Priority : constant Priority := 48;
+
+private
+
+   type Address is mod Memory_Size;
+   Null_Address : constant Address := 0;
+
+   --
+   -- System Implementation Parameters --
+   --
+
+   --  These parameters provide information about the target that is used
+   --  by the compiler. They are in the private part of System, where 

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[Andreas Schwab]

On Dez 04 2016, John Paul Adrian Glaubitz  wrote:

> So I assume we can strip the patch from the changes in s-memory.adb and
> s-memory.ads?

Yes.

Andreas.

-- 
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[John Paul Adrian Glaubitz]

On 12/04/2016 04:43 PM, John Paul Adrian Glaubitz wrote:
> However, I'm by no means an Ada expert to be able to tell whether we still 
> need
> Ada.Unchecked_Conversion anymore. I have glimpsed over PR48835 and I'm not 
> sure
> whether this confirms this in any way.

Ah, I assume you were talking about comment #58 [1], sorry, I missed that.
It seems that the conversion issue no longer exists, am I correct?

So I assume we can strip the patch from the changes in s-memory.adb and
s-memory.ads? It seems from my elementary understanding of Ada, this
was just a work-around for the the m68k-typical register separation
(address and data) and they've now fixed the issue properly so the
workaround is no longer required.

If that's true, I assume we just need src/gcc/ada/s-memory.ads as well
as the changes to src/gcc/ada/gcc-interface/Makefile.in.

Adrian

> [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48835#c58

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[John Paul Adrian Glaubitz]

On 12/04/2016 02:38 PM, Andreas Schwab wrote:
> On Dez 04 2016, John Paul Adrian Glaubitz  
> wrote:
> 
>> @Andreas: Are you sure the patch is no longer necessary?
> 
> I didn't say that.

Ok, this was a misunderstanding then as you meant earlier that "this" is no
longer necessary. But I assume you were talking about the single hunk in line
47 that does no longer apply and not the whole patch, correct?

Removing this hunk below from the patch, makes it apply without issues:

--- a/src/gcc/ada/s-memory.adb
+++ b/src/gcc/ada/s-memory.adb
@@ -47,6 +47,7 @@ with Ada.Exceptions;
with System.Soft_Links;
with System.Parameters;
with System.CRTL;
+with Ada.Unchecked_Conversion;

package body System.Memory is


However, I'm by no means an Ada expert to be able to tell whether we still need
Ada.Unchecked_Conversion anymore. I have glimpsed over PR48835 and I'm not sure
whether this confirms this in any way.

I'm attaching the updated ada-m68k.diff in any case.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
gcc/ada/

2011-10-12  Mikael Pettersson  

	PR ada/48835
	* gcc-interface/Makefile.in: Add support for m68k-linux.
	* system-linux-m68k.ads: New file based on system-linux-ppc.ads
	and system-vxworks-m68k.ads.
	* s-memory.adb (Gnat_Malloc): New wrapper around Alloc, returning
	the memory address as a pointer not an integer.
	Add Gnat_Malloc -> __gnat_malloc export.
	* s-memory.ads: Remove Alloc -> __gnat_malloc export.

Index: b/src/gcc/ada/gcc-interface/Makefile.in
===
--- a/src/gcc/ada/gcc-interface/Makefile.in
+++ b/src/gcc/ada/gcc-interface/Makefile.in
@@ -2084,6 +2084,35 @@ ifeq ($(strip $(filter-out hppa% linux%,
   LIBRARY_VERSION := $(LIB_VERSION)
 endif
 
+# M68K Linux
+ifeq ($(strip $(filter-out m68k% linux%,$(arch) $(osys))),)
+  LIBGNAT_TARGET_PAIRS = \
+  a-intnam.adshttp://www.gnu.org/licenses/>.  --
+--  --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.  --
+--  --
+--
+
+package System is
+   pragma Pure;
+   --  Note that we take advantage of the implementation permission to make
+   --  this unit Pure instead of Preelaborable; see RM 13.7.1(15). In Ada
+   --  2005, this is Pure in any case (AI-362).
+
+   type Name is (SYSTEM_NAME_GNAT);
+   System_Name : constant Name := SYSTEM_NAME_GNAT;
+
+   --  System-Dependent Named Numbers
+
+   Min_Int   : constant := Long_Long_Integer'First;
+   Max_Int   : constant := Long_Long_Integer'Last;
+
+   Max_Binary_Modulus: constant := 2 ** Long_Long_Integer'Size;
+   Max_Nonbinary_Modulus : constant := 2 ** Integer'Size - 1;
+
+   Max_Base_Digits   : constant := Long_Long_Float'Digits;
+   Max_Digits: constant := Long_Long_Float'Digits;
+
+   Max_Mantissa  : constant := 63;
+   Fine_Delta: constant := 2.0 ** (-Max_Mantissa);
+
+   Tick  : constant := 0.000_001;
+
+   --  Storage-related Declarations
+
+   type Address is private;
+   pragma Preelaborable_Initialization (Address);
+   Null_Address : constant Address;
+
+   Storage_Unit : constant := 8;
+   Word_Size: constant := 32;
+   Memory_Size  : constant := 2 ** 32;
+
+   --  Address comparison
+
+   function "<"  (Left, Right : Address) return Boolean;
+   function "<=" (Left, Right : Address) return Boolean;
+   function ">"  (Left, Right : Address) return Boolean;
+   function ">=" (Left, Right : Address) return Boolean;
+   function "="  (Left, Right : Address) return Boolean;
+
+   pragma Import (Intrinsic, "<");
+   pragma Import (Intrinsic, "<=");
+   pragma Import (Intrinsic, ">");
+   pragma Import (Intrinsic, ">=");
+   pragma Import (Intrinsic, "=");
+
+   --  Other System-Dependent Declarations
+
+   type Bit_Order is (High_Order_First, Low_Order_First);
+   Default_Bit_Order : constant Bit_Order := High_Order_First;
+   pragma Warnings (Off, Default_Bit_Order); -- kill constant condition warning
+
+   --  Priority-related Declarations (RM D.1)
+
+   --  Is the following actually true for GNU/Linux/m68k?
+   --
+   --  0 .. 98 corresponds to the system priority range 1 .. 99.
+   --
+   --  If the scheduling policy is SCHED_FIFO or SCHED_RR the runtime makes use
+   --  of the entire range provided by the system.
+   --
+   --  If the scheduling policy is SCHED_OTHER the only valid system priority
+   --  is 1 and other values are simply ignored.
+
+   Max_Priority  

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[Andreas Schwab]

On Dez 04 2016, John Paul Adrian Glaubitz  wrote:

> @Andreas: Are you sure the patch is no longer necessary?

I didn't say that.

Andreas.

-- 
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[John Paul Adrian Glaubitz]

On 12/04/2016 01:11 PM, John Paul Adrian Glaubitz wrote:
> Dropping ada-m68k.diff fixes this particular issue for me. 
> m68k-revert-pr45144.patch
> is currently not applied because we have disabled Ada on m68k by adding it to
> ada_no_cpus in debian/rules.defs because of #814221 [1].

Hmm, so I just had a look at the current gcc-7 sources as well as gcc git and it
seems this particular patch which adds support for m68k-linux is not in, I see
support for VXWorks only:

glaubitz@ikarus:~/m68k/gcc-7-7-20161201/gcc-20161201/gcc/ada$ ls -l *m68k*
-rw-r--r-- 1 glaubitz glaubitz 3533 Dec  9  2014 s-vxwork-m68k.ads
-rw-r--r-- 1 glaubitz glaubitz 7829 Apr 26  2016 system-vxworks-m68k.ads
glaubitz@ikarus:~/m68k/gcc-7-7-20161201/gcc-20161201/gcc/ada$

@Andreas: Are you sure the patch is no longer necessary?

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[John Paul Adrian Glaubitz]

Hi Matthias!

On 12/03/2016 11:56 PM, Matthias Klose wrote:
> Adrian, I would appreciate if you could look at a package first before calling
> for actions, and then ask a complete question. We also have the
> m68k-revert-pr45144 patch in the build which apparently needs some decision.

Dropping ada-m68k.diff fixes this particular issue for me. 
m68k-revert-pr45144.patch
is currently not applied because we have disabled Ada on m68k by adding it to
ada_no_cpus in debian/rules.defs because of #814221 [1].

I think it makes sense to discuss m68k-revert-pr45144.patch in #814221 and treat
this particular patch as a separate issue.

Adrian

> [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=814221

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[Matthias Klose]

On 03.12.2016 22:04, John Paul Adrian Glaubitz wrote:
> On 12/03/2016 10:02 PM, Andreas Schwab wrote:
>>> patching file src/gcc/ada/s-memory.adb
>>> Hunk #1 FAILED at 47.
>>> Hunk #2 succeeded at 113 (offset 13 lines).
>>> 1 out of 2 hunks FAILED -- rejects in file src/gcc/ada/s-memory.adb
>>> patching file src/gcc/ada/s-memory.ads
>>
>> According to PR48835, this is no longer necessary.
> 
> Ah, thanks for letting us know. I was already suspecting that, but I didn't
> have the time yet to verify it.
> 
> @Matthias:
> 
> Do you agree that we can drop this particular patch then?

Adrian, I would appreciate if you could look at a package first before calling
for actions, and then ask a complete question. We also have the
m68k-revert-pr45144 patch in the build which apparently needs some decision.

Thanks, Matthias

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[Andreas Schwab]

On Dez 03 2016, John Paul Adrian Glaubitz  wrote:

> patching file src/gcc/ada/s-memory.adb
> Hunk #1 FAILED at 47.
> Hunk #2 succeeded at 113 (offset 13 lines).
> 1 out of 2 hunks FAILED -- rejects in file src/gcc/ada/s-memory.adb
> patching file src/gcc/ada/s-memory.ads

According to PR48835, this is no longer necessary.

Andreas.

-- 
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[John Paul Adrian Glaubitz]

On 12/03/2016 10:02 PM, Andreas Schwab wrote:
>> patching file src/gcc/ada/s-memory.adb
>> Hunk #1 FAILED at 47.
>> Hunk #2 succeeded at 113 (offset 13 lines).
>> 1 out of 2 hunks FAILED -- rejects in file src/gcc/ada/s-memory.adb
>> patching file src/gcc/ada/s-memory.ads
> 
> According to PR48835, this is no longer necessary.

Ah, thanks for letting us know. I was already suspecting that, but I didn't
have the time yet to verify it.

@Matthias:

Do you agree that we can drop this particular patch then?

Thanks,
Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[Matthias Klose]

Control: tags -1 moreinfo help

sure, please update it.  It can't be applied unconditionally because it breaks
the build on other architectures.

On 03.12.2016 21:30, John Paul Adrian Glaubitz wrote:
> Source: gcc-7
> Version: 7-20161201-1
> Severity: normal
> User: debian-...@lists.debian.org
> Usertags: m68k
> 
> Hi!
> 
> gcc-7 currently fails to build from source because one of the patches
> shipped in the source package don't apply properly [1]:
> 
> Applying patch ada-m68k.diff
> patching file src/gcc/ada/gcc-interface/Makefile.in
> Hunk #1 succeeded at 2058 (offset -26 lines).
> patching file src/gcc/ada/s-memory.adb
> Hunk #1 FAILED at 47.
> Hunk #2 succeeded at 113 (offset 13 lines).
> 1 out of 2 hunks FAILED -- rejects in file src/gcc/ada/s-memory.adb
> patching file src/gcc/ada/s-memory.ads
> patching file src/gcc/ada/system-linux-m68k.ads
> Patch ada-m68k.diff does not apply (enforce with -f)
> debian/rules.patch:311: recipe for target 'stamps/02-patch-stamp' failed
> make: *** [stamps/02-patch-stamp] Error 1
> dpkg-buildpackage: error: debian/rules build-arch gave error exit status 2

Bug#846872: gcc-7: FTBFS on m68k - fails to apply ada-m68k.diff patch

[John Paul Adrian Glaubitz]

Source: gcc-7
Version: 7-20161201-1
Severity: normal
User: debian-...@lists.debian.org
Usertags: m68k

Hi!

gcc-7 currently fails to build from source because one of the patches
shipped in the source package don't apply properly [1]:

Applying patch ada-m68k.diff
patching file src/gcc/ada/gcc-interface/Makefile.in
Hunk #1 succeeded at 2058 (offset -26 lines).
patching file src/gcc/ada/s-memory.adb
Hunk #1 FAILED at 47.
Hunk #2 succeeded at 113 (offset 13 lines).
1 out of 2 hunks FAILED -- rejects in file src/gcc/ada/s-memory.adb
patching file src/gcc/ada/s-memory.ads
patching file src/gcc/ada/system-linux-m68k.ads
Patch ada-m68k.diff does not apply (enforce with -f)
debian/rules.patch:311: recipe for target 'stamps/02-patch-stamp' failed
make: *** [stamps/02-patch-stamp] Error 1
dpkg-buildpackage: error: debian/rules build-arch gave error exit status 2

Thanks,
Adrian

> [1] 
> https://buildd.debian.org/status/fetch.php?pkg=gcc-7=m68k=7-20161201-1=1480796787

--
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaub...@debian.org
`. `'   Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
  `-GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913