[gcc-6] 97/401: * Remove powerpcspe specific patch, integrated upstream. Closes: #816048.
Ximin Luo
infinity0 at debian.org
Wed Apr 5 15:48:07 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 6eaad32aa8b9ea002e32b13ef548378ef1b5ee65
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Sun Feb 28 21:35:47 2016 +0000
* Remove powerpcspe specific patch, integrated upstream. Closes: #816048.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8705 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 6 ++
debian/patches/fix-powerpcspe.diff | 165 -------------------------------------
debian/rules.patch | 2 -
3 files changed, 6 insertions(+), 167 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 230c584..8a5c8ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gcc-6 (6-20160228-2) UNRELEASED; urgency=medium
+
+ * Remove powerpcspe specific patch, integrated upstream. Addresses: #816048.
+
+ -- Matthias Klose <doko at debian.org> Sun, 28 Feb 2016 22:34:46 +0100
+
gcc-6 (6-20160228-1) experimental; urgency=medium
* GCC 6 snapshot build, taken from the trunk 20160228.
diff --git a/debian/patches/fix-powerpcspe.diff b/debian/patches/fix-powerpcspe.diff
deleted file mode 100644
index 969b18e..0000000
--- a/debian/patches/fix-powerpcspe.diff
+++ /dev/null
@@ -1,165 +0,0 @@
---- a/src/gcc/config/rs6000/rs6000.c 2014-11-28 13:37:46.330028430 +0100
-+++ b/src/gcc/config/rs6000/rs6000.c 2014-11-28 13:39:15.634789216 +0100
-@@ -1703,7 +1703,7 @@ rs6000_hard_regno_nregs_internal (int re
- SCmode so as to pass the value correctly in a pair of
- registers. */
- else if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode
-- && !DECIMAL_FLOAT_MODE_P (mode))
-+ && !DECIMAL_FLOAT_MODE_P (mode) && SPE_SIMD_REGNO_P (regno))
- reg_size = UNITS_PER_FP_WORD;
-
- else
---- a/src/gcc/defaults.h 2014-11-28 13:37:11.173728954 +0100
-+++ b/src/gcc/defaults.h 2014-11-28 13:37:56.326113532 +0100
-@@ -438,6 +438,11 @@
- #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
- #endif
-
-+/* The mapping from dwarf CFA reg number to internal dwarf reg numbers. */
-+#ifndef DWARF_REG_TO_UNWIND_COLUMN
-+#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO)
-+#endif
-+
- /* Map register numbers held in the call frame info that gcc has
- collected using DWARF_FRAME_REGNUM to those that should be output in
- .debug_frame and .eh_frame. */
---- a/src/gcc/dwarf2cfi.c 2014-11-28 13:37:16.549775962 +0100
-+++ b/src/gcc/dwarf2cfi.c 2014-11-28 13:37:56.330113659 +0100
-@@ -252,7 +252,66 @@
- gen_int_mode (size, mode));
- }
-
--/* Generate code to initialize the register size table. */
-+/* Datastructure used by expand_builtin_init_dwarf_reg_sizes and
-+ init_one_dwarf_reg_size to communicate on what has been done by the
-+ latter. */
-+
-+typedef struct
-+{
-+ /* Whether the dwarf return column was initialized. */
-+ bool wrote_return_column;
-+
-+ /* For each hard register REGNO, whether init_one_dwarf_reg_size
-+ was given REGNO to process already. */
-+ bool processed_regno [FIRST_PSEUDO_REGISTER];
-+
-+} init_one_dwarf_reg_state;
-+
-+/* Helper for expand_builtin_init_dwarf_reg_sizes. Generate code to
-+ initialize the dwarf register size table entry corresponding to register
-+ REGNO in REGMODE. TABLE is the table base address, SLOTMODE is the mode to
-+ use for the size entry to initialize, and INIT_STATE is the communication
-+ datastructure conveying what we're doing to our caller. */
-+
-+static
-+void init_one_dwarf_reg_size (int regno, enum machine_mode regmode,
-+ rtx table, enum machine_mode slotmode,
-+ init_one_dwarf_reg_state *init_state)
-+{
-+ const unsigned int dnum = DWARF_FRAME_REGNUM (regno);
-+ const unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
-+ const unsigned int dcol = DWARF_REG_TO_UNWIND_COLUMN (rnum);
-+
-+ const HOST_WIDE_INT slotoffset = dcol * GET_MODE_SIZE (slotmode);
-+ const HOST_WIDE_INT regsize = GET_MODE_SIZE (regmode);
-+
-+ /* No point in redoing things if we have processed this register already.
-+ This could happen with register spans, e.g. when regno is first processed
-+ as a piece of a span, then as a register on its own later on. */
-+
-+ if (init_state->processed_regno[regno])
-+ return;
-+ init_state->processed_regno[regno] = true;
-+
-+ if (rnum >= DWARF_FRAME_REGISTERS)
-+ return;
-+
-+ if (dnum == DWARF_FRAME_RETURN_COLUMN)
-+ {
-+ if (regmode == VOIDmode)
-+ return;
-+ init_state->wrote_return_column = true;
-+ }
-+
-+ if (slotoffset < 0)
-+ return;
-+
-+ emit_move_insn (adjust_address (table, slotmode, slotoffset),
-+ gen_int_mode (regsize, slotmode));
-+}
-+
-+/* Generate code to initialize the dwarf register size table located
-+ at the provided ADDRESS. */
-
- void
- expand_builtin_init_dwarf_reg_sizes (tree address)
-@@ -261,37 +320,35 @@
- enum machine_mode mode = TYPE_MODE (char_type_node);
- rtx addr = expand_normal (address);
- rtx mem = gen_rtx_MEM (BLKmode, addr);
-- bool wrote_return_column = false;
-+
-+ init_one_dwarf_reg_state init_state;
-+
-+ memset ((char *)&init_state, 0, sizeof (init_state));
-
- for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
- {
-- unsigned int dnum = DWARF_FRAME_REGNUM (i);
-- unsigned int rnum = DWARF2_FRAME_REG_OUT (dnum, 1);
-+ enum machine_mode save_mode = reg_raw_mode[i];
-+ rtx span;
-
-- if (rnum < DWARF_FRAME_REGISTERS)
-+ if (HARD_REGNO_CALL_PART_CLOBBERED (i, save_mode))
-+ save_mode = choose_hard_reg_mode (i, 1, true);
-+
-+ span = targetm.dwarf_register_span (gen_rtx_REG (save_mode, i));
-+ if (!span)
-+ init_one_dwarf_reg_size (i, save_mode, mem, mode, &init_state);
-+ else
- {
-- HOST_WIDE_INT offset = rnum * GET_MODE_SIZE (mode);
-- enum machine_mode save_mode = reg_raw_mode[i];
-- HOST_WIDE_INT size;
--
-- if (HARD_REGNO_CALL_PART_CLOBBERED (i, save_mode))
-- save_mode = choose_hard_reg_mode (i, 1, true);
-- if (dnum == DWARF_FRAME_RETURN_COLUMN)
-+ for (int si = 0; si < XVECLEN (span, 0); si++)
- {
-- if (save_mode == VOIDmode)
-- continue;
-- wrote_return_column = true;
-- }
-- size = GET_MODE_SIZE (save_mode);
-- if (offset < 0)
-- continue;
-+ rtx reg = XVECEXP (span, 0, si);
-
-- emit_move_insn (adjust_address (mem, mode, offset),
-- gen_int_mode (size, mode));
-+ init_one_dwarf_reg_size
-+ (REGNO (reg), GET_MODE (reg), mem, mode, &init_state);
-+ }
- }
- }
-
-- if (!wrote_return_column)
-+ if (!init_state.wrote_return_column)
- init_return_column_size (mode, mem, DWARF_FRAME_RETURN_COLUMN);
-
- #ifdef DWARF_ALT_FRAME_RETURN_COLUMN
---- a/src/libgcc/unwind-dw2.c 2014-11-28 13:37:22.765829633 +0100
-+++ b/src/libgcc/unwind-dw2.c 2014-11-28 13:37:56.334113765 +0100
-@@ -55,10 +55,6 @@
- #define PRE_GCC3_DWARF_FRAME_REGISTERS DWARF_FRAME_REGISTERS
- #endif
-
--#ifndef DWARF_REG_TO_UNWIND_COLUMN
--#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO)
--#endif
--
- /* ??? For the public function interfaces, we tend to gcc_assert that the
- column numbers are in range. For the dwarf2 unwind info this does happen,
- although so far in a case that doesn't actually matter.
diff --git a/debian/rules.patch b/debian/rules.patch
index 01b6c19..6ca45a0 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -212,8 +212,6 @@ endif
ifeq ($(DEB_TARGET_ARCH),powerpcspe)
debian_patches += powerpc_remove_many
debian_patches += powerpc_nofprs
- # fix-powerpcspe.diff only partially applied upstream
- debian_patches += fix-powerpcspe
endif
#debian_patches += link-libs
--
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