[gcc-6] 15/401: * Update ada-m68k patch.

Ximin Luo infinity0 at debian.org
Wed Apr 5 15:47:56 UTC 2017


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 355163cf91382ecb298ef2e31cd9fd3e3a710c6b
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sun Dec 13 12:23:03 2015 +0000

      * Update ada-m68k patch.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8506 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog             |  1 +
 debian/patches/ada-m68k.diff | 29 +++++++++++++++--------------
 debian/rules.patch           |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 05b86cb..5c52622 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gcc-6 (6-20151211-2) UNRELEASED; urgency=medium
 
   * Update the ada-kfreebsd patch.
   * Fix cross-building without having the common cross libraries installed.
+  * Update ada-m68k patch.
 
  -- Matthias Klose <doko at debian.org>  Sun, 13 Dec 2015 12:20:23 +0100
 
diff --git a/debian/patches/ada-m68k.diff b/debian/patches/ada-m68k.diff
index 50dadfd..4ae2b53 100644
--- a/debian/patches/ada-m68k.diff
+++ b/debian/patches/ada-m68k.diff
@@ -15,11 +15,11 @@ 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
-@@ -2062,6 +2062,35 @@ ifeq ($(strip $(filter-out aarch64% linu
+@@ -2084,6 +2084,35 @@ ifeq ($(strip $(filter-out hppa% linux%,
    LIBRARY_VERSION := $(LIB_VERSION)
  endif
  
-+# m68k Linux
++# M68K Linux
 +ifeq ($(strip $(filter-out m68k% linux%,$(arch) $(osys))),)
 +  LIBGNAT_TARGET_PAIRS = \
 +  a-intnam.ads<a-intnam-linux.ads \
@@ -32,7 +32,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
 +  s-taprop.adb<s-taprop-linux.adb \
 +  s-tasinf.ads<s-tasinf-linux.ads \
 +  s-tasinf.adb<s-tasinf-linux.adb \
-+  s-taspri.ads<s-taspri-posix-noaltstack.ads \
++  s-taspri.ads<s-taspri-posix.ads \
 +  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
 +  system.ads<system-linux-m68k.ads
 +
@@ -48,9 +48,9 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
 +  LIBRARY_VERSION := $(LIB_VERSION)
 +endif
 +
- # Sparc Linux
- ifeq ($(strip $(filter-out sparc% linux%,$(target_cpu) $(target_os))),)
-   LIBGNAT_TARGET_PAIRS_COMMON = \
+ # SH4 Linux
+ ifeq ($(strip $(filter-out sh4% linux%,$(target_cpu) $(target_os))),)
+   LIBGNAT_TARGET_PAIRS = \
 Index: b/src/gcc/ada/s-memory.adb
 ===================================================================
 --- a/src/gcc/ada/s-memory.adb
@@ -102,7 +102,7 @@ Index: b/src/gcc/ada/system-linux-m68k.ads
 ===================================================================
 --- /dev/null
 +++ b/src/gcc/ada/system-linux-m68k.ads
-@@ -0,0 +1,153 @@
+@@ -0,0 +1,154 @@
 +------------------------------------------------------------------------------
 +--                                                                          --
 +--                        GNAT RUN-TIME COMPONENTS                          --
@@ -110,9 +110,9 @@ Index: b/src/gcc/ada/system-linux-m68k.ads
 +--                               S Y S T E M                                --
 +--                                                                          --
 +--                                 S p e c                                  --
-+--                         (GNU-Linux/M68K Version)                         --
++--                         (GNU/Linux/m68k Version)                         --
 +--                                                                          --
-+--          Copyright (C) 1992-2009, Free Software Foundation, Inc.         --
++--          Copyright (C) 2014, Free Software Foundation, Inc.              --
 +--                                                                          --
 +-- This specification is derived from the Ada Reference Manual for use with --
 +-- GNAT. The copyright notice above, and the license provisions that follow --
@@ -196,6 +196,8 @@ Index: b/src/gcc/ada/system-linux-m68k.ads
 +
 +   --  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
@@ -229,7 +231,7 @@ Index: b/src/gcc/ada/system-linux-m68k.ads
 +   --  of the individual switch values.
 +
 +   Backend_Divide_Checks     : constant Boolean := False;
-+   Backend_Overflow_Checks   : constant Boolean := True;
++   Backend_Overflow_Checks   : constant Boolean := False;
 +   Command_Line_Args         : constant Boolean := True;
 +   Configurable_Run_Time     : constant Boolean := False;
 +   Denorm                    : constant Boolean := True;
@@ -240,19 +242,18 @@ Index: b/src/gcc/ada/system-linux-m68k.ads
 +   Machine_Overflows         : constant Boolean := False;
 +   Machine_Rounds            : constant Boolean := True;
 +   Preallocated_Stacks       : constant Boolean := False;
-+   Signed_Zeros              : constant Boolean := False;
++   Signed_Zeros              : constant Boolean := True;
 +   Stack_Check_Default       : constant Boolean := False;
 +   Stack_Check_Probes        : constant Boolean := False;
 +   Stack_Check_Limits        : constant Boolean := False;
-+   Support_64_Bit_Divides    : constant Boolean := True;
 +   Support_Aggregates        : constant Boolean := True;
++   Support_Atomic_Primitives : constant Boolean := True;
 +   Support_Composite_Assign  : constant Boolean := True;
 +   Support_Composite_Compare : constant Boolean := True;
 +   Support_Long_Shifts       : constant Boolean := True;
-+   Always_Compatible_Rep     : constant Boolean := True;
++   Always_Compatible_Rep     : constant Boolean := False;
 +   Suppress_Standard_Library : constant Boolean := False;
 +   Use_Ada_Main_Program_Name : constant Boolean := False;
 +   ZCX_By_Default            : constant Boolean := True;
-+   GCC_ZCX_Support           : constant Boolean := True;
 +
 +end System;
diff --git a/debian/rules.patch b/debian/rules.patch
index d173e10..3039f08 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -304,8 +304,8 @@ debian_patches += go-testsuite
 debian_patches += ada-749574
 debian_patches += ada-mips
 debian_patches += ada-bootstrap-compare
+debian_patches += ada-m68k
 ifeq ($(DEB_TARGET_ARCH),m68k)
-  debian_patches += ada-m68k
   ifeq ($(with_ada),yes)
     debian_patches += m68k-revert-pr45144
   endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git



More information about the Reproducible-commits mailing list