--- binutils-msp430-2.22~msp20120406.orig/debian/README.Debian +++ binutils-msp430-2.22~msp20120406/debian/README.Debian @@ -0,0 +1,4 @@ +To make it possible to have different versions of binutils packages +installed for different targets the local and most common documentation have +been removed from the cross packages. If you want these files aswell you'll +have to install the same version of the native package as of this package. --- binutils-msp430-2.22~msp20120406.orig/debian/binutils-msp430.lintian-overrides +++ binutils-msp430-2.22~msp20120406/debian/binutils-msp430.lintian-overrides @@ -0,0 +1,10 @@ +# "So I would be opposed to making such a change in policy for the time being; +# I think cross-compilers should stick with the traditional cross-compiler +# directories and stay away from the multiarch directories until we have more +# practical experience with multiarch under our belts and can make some +# educated decisions about how we want this to all fit together." +# +# See http://lists.debian.org/<20110430200620.GA14355@virgil.dodds.net> + +binutils-msp430: non-standard-dir-in-usr +binutils-msp430: file-in-unusual-dir --- binutils-msp430-2.22~msp20120406.orig/debian/changelog +++ binutils-msp430-2.22~msp20120406/debian/changelog @@ -0,0 +1,82 @@ +binutils-msp430 (2.22~msp20120406-5.1) unstable; urgency=high + + * Non-maintainer upload + * Fix build errors with gcc-6. Closes: #811954 + + -- Christoph Biedl Sun, 08 Jan 2017 20:17:49 +0100 + +binutils-msp430 (2.22~msp20120406-5) unstable; urgency=high + + * Fix FTBFS with gcc-4.9, patching bfd_xxx_set macros + (Closes: #746832) + + -- Luca Bruno Sun, 17 Aug 2014 13:21:34 +0200 + +binutils-msp430 (2.22~msp20120406-4) unstable; urgency=medium + + * Update autotools for arm64 (Closes: #727330) + + -- Luca Bruno Sun, 19 Jan 2014 10:38:27 +0100 + +binutils-msp430 (2.22~msp20120406-3) unstable; urgency=medium + + * Do not build info doc (Closes: #712354) + + -- Luca Bruno Mon, 23 Dec 2013 17:38:14 +0100 + +binutils-msp430 (2.22~msp20120406-2) unstable; urgency=low + + * Upload to unstable + + -- Luca Bruno Fri, 18 May 2012 19:17:33 +0200 + +binutils-msp430 (2.22~msp20120406-1) experimental; urgency=low + + * New upstream release + * Using vanilla sources due to upstream and debian binutils + de-synchronization. + + -- Luca Bruno Thu, 10 May 2012 15:14:44 +0200 + +binutils-msp430 (2.22~msp20110716p5-1) unstable; urgency=low + + * Upstream patch-point + + SF 3379341: non-empty ARCH environment variable results unusable ld + + SF 3386145: gc-sections broken in LTS 20110716 + + SF 3143071: error in addend of relocation entry in output + + SF 3400711: consts placed in RAM instead of ROM with -fdata-sections + + SF 3400750: infomemnobits missing from LTS 20110716 + + -- Luca Bruno Sat, 14 Jan 2012 16:54:13 +0100 + +binutils-msp430 (2.21~msp20110716-1) unstable; urgency=low + + * New upstream release + + -- Luca Bruno Mon, 15 Aug 2011 21:14:44 +0200 + +binutils-msp430 (2.21~msp20110421-2) unstable; urgency=medium + + * Loosen build-dep on binutils, due to high-flux uploads + (Closes: #629752) + + -- Luca Bruno Wed, 08 Jun 2011 18:56:40 +0200 + +binutils-msp430 (2.21~msp20110421-1) unstable; urgency=low + + * Upload to Debian Unstable + * Added proper dependency on msp430mcu + + -- Luca Bruno Sat, 28 May 2011 18:22:36 +0200 + +binutils-msp430 (2.21~msp20110421-0exp1) experimental; urgency=low + + * New experimental snapshot + + -- Luca Bruno Thu, 21 Apr 2011 23:34:14 +0200 + +binutils-msp430 (2.21~msp20110414-1) experimental; urgency=low + + * Initial upload to Debian (Closes: #329631) + + -- Luca Bruno Thu, 14 Apr 2011 20:29:27 +0200 --- binutils-msp430-2.22~msp20120406.orig/debian/compat +++ binutils-msp430-2.22~msp20120406/debian/compat @@ -0,0 +1 @@ +5 --- binutils-msp430-2.22~msp20120406.orig/debian/control +++ binutils-msp430-2.22~msp20120406/debian/control @@ -0,0 +1,20 @@ +Source: binutils-msp430 +Section: devel +Priority: extra +Maintainer: Luca Bruno +Standards-Version: 3.9.3 +Build-Depends: autoconf (>= 2.13), bison, flex, gettext, texinfo, + binutils (>= 2.9.5.0.12), gcc (>= 2.95.2), + debhelper (>= 7), tar (>= 1.13.18), bzip2, + findutils(>= 4.2.31), msp430mcu, + autotools-dev + +Package: binutils-msp430 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, msp430mcu +Suggests: binutils (>= ${source:Version}) +Description: Binary utilities supporting TI's MSP430 targets + The programs in this package are used to manipulate binary and object + files that may have been created for TI's MSP430 architecture. + This package is primarily intended for MSP430 developers and + cross-compilers. --- binutils-msp430-2.22~msp20120406.orig/debian/copyright +++ binutils-msp430-2.22~msp20120406/debian/copyright @@ -0,0 +1,51 @@ +This is the debian package of the GNU assembler, linker, and binary +utilities compiled for cross development for the msp430 processor. +The patchset was created by Luca Bruno from the git +repository of by the mspgcc project, based on the original +binutils source packages. + +msp430 original changes are available through git +http://mspgcc.git.sourceforge.net/git/gitweb-index.cgi + +Original binutils are available via the binutils-source package +or at ftp://ftp.gnu.org/pub/gnu/binutils/ + +mspgcc patches follow binutils original copyright, as declared by +the author clarifying the license of the patch-set: +http://thread.gmane.org/gmane.comp.hardware.texas-instruments.msp430.gcc.user/9161 + +""" +From: Peter Bigot +Subject: copyright on upstream patches +Date: Sun, 30 Jan 2011 18:30:34 -0600 + +In all the excitement of getting the new version out, I forgot I'd been +asked to provide a header on the patch files that apply to the upstream +distributions (binutils, gcc, gdb) explicitly noting that the material +therein was copyright Free Software Foundation and subject to licensing +restrictions of the upstream distribution (presumably GPL). This is +consistent with everything I've been able to find in the source repositories +from CVS onward. +""" + +GNU Binutils is Copyright © 1990-2011, Free Software Foundation, Inc. + +The entire package is distributed under GPL-3+: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- binutils-msp430-2.22~msp20120406.orig/debian/dirs +++ binutils-msp430-2.22~msp20120406/debian/dirs @@ -0,0 +1,6 @@ +usr/bin +usr/lib + + + + --- binutils-msp430-2.22~msp20120406.orig/debian/own-patch/ftbfs-gcc-4.9.patch +++ binutils-msp430-2.22~msp20120406/debian/own-patch/ftbfs-gcc-4.9.patch @@ -0,0 +1,185 @@ +From 27b829ee701e29804216b3803fbaeb629be27491 Mon Sep 17 00:00:00 2001 +From: Nick Clifton +Date: Wed, 29 Jan 2014 13:46:39 +0000 +Subject: [PATCH] Following up on Tom's suggestion I am checking in a patch to replace the various + bfd_xxx_set macros with static inline functions, so that we can avoid compile time + warnings about comma expressions with unused values. + + * bfd-in.h (bfd_set_section_vma): Delete. + (bfd_set_section_alignment): Delete. + (bfd_set_section_userdata): Delete. + (bfd_set_cacheable): Delete. + * bfd.c (bfd_set_cacheable): New static inline function. + * section.c (bfd_set_section_userdata): Likewise. + (bfd_set_section_vma): Likewise. + (bfd_set_section_alignment): Likewise. + * bfd-in2.h: Regenerate. +--- + bfd/bfd-in.h | 5 ----- + bfd/bfd-in2.h | 41 +++++++++++++++++++++++++++++++++++------ + bfd/bfd.c | 8 ++++++++ + bfd/section.c | 26 ++++++++++++++++++++++++++ + 5 files changed, 81 insertions(+), 11 deletions(-) + +diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h +index 3afd71b..c7c5a7d 100644 +--- a/bfd/bfd-in.h ++++ b/bfd/bfd-in.h +@@ -292,9 +292,6 @@ typedef struct bfd_section *sec_ptr; + + #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) + +-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) +-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) +-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) + /* Find the address one past the end of SEC. */ + #define bfd_get_section_limit(bfd, sec) \ + (((bfd)->direction != write_direction && (sec)->rawsize != 0 \ +@@ -517,8 +514,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *); + + #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char) + +-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE) +- + extern bfd_boolean bfd_cache_close + (bfd *abfd); + /* NB: This declaration should match the autogenerated one in libbfd.h. */ +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 71996db..b5aeb40 100644 +--- a/bfd/bfd-in2.h ++++ b/bfd/bfd-in2.h +@@ -299,9 +299,6 @@ typedef struct bfd_section *sec_ptr; + + #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) + +-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) +-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) +-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) + /* Find the address one past the end of SEC. */ + #define bfd_get_section_limit(bfd, sec) \ + (((bfd)->direction != write_direction && (sec)->rawsize != 0 \ +@@ -524,8 +521,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *); + + #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char) + +-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE) +- + extern bfd_boolean bfd_cache_close + (bfd *abfd); + /* NB: This declaration should match the autogenerated one in libbfd.h. */ +@@ -1029,7 +1024,7 @@ bfd *bfd_openr (const char *filename, const char *target); + + bfd *bfd_fdopenr (const char *filename, const char *target, int fd); + +-bfd *bfd_openstreamr (const char *, const char *, void *); ++bfd *bfd_openstreamr (const char * filename, const char * target, void * stream); + + bfd *bfd_openr_iovec (const char *filename, const char *target, + void *(*open_func) (struct bfd *nbfd, +@@ -1596,6 +1591,32 @@ struct relax_table { + int size; + }; + ++/* Note: the following are provided as inline functions rather than macros ++ because not all callers use the return value. A macro implementation ++ would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some ++ compilers will complain about comma expressions that have no effect. */ ++static inline bfd_boolean ++bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val) ++{ ++ ptr->userdata = val; ++ return TRUE; ++} ++ ++static inline bfd_boolean ++bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val) ++{ ++ ptr->vma = ptr->lma = val; ++ ptr->user_set_vma = TRUE; ++ return TRUE; ++} ++ ++static inline bfd_boolean ++bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val) ++{ ++ ptr->alignment_power = val; ++ return TRUE; ++} ++ + /* These sections are global, and are managed by BFD. The application + and target back end are not permitted to change the values in + these sections. */ +@@ -6415,6 +6436,14 @@ struct bfd + unsigned int selective_search : 1; + }; + ++/* See note beside bfd_set_section_userdata. */ ++static inline bfd_boolean ++bfd_set_cacheable (bfd * abfd, bfd_boolean val) ++{ ++ abfd->cacheable = val; ++ return TRUE; ++} ++ + typedef enum bfd_error + { + bfd_error_no_error = 0, +diff --git a/bfd/bfd.c b/bfd/bfd.c +index 8d0580c..2d174f3 100644 +--- a/bfd/bfd.c ++++ b/bfd/bfd.c +@@ -311,6 +311,14 @@ CODE_FRAGMENT + . unsigned int selective_search : 1; + .}; + . ++.{* See note beside bfd_set_section_userdata. *} ++.static inline bfd_boolean ++.bfd_set_cacheable (bfd * abfd, bfd_boolean val) ++.{ ++. abfd->cacheable = val; ++. return TRUE; ++.} ++. + */ + + #include "sysdep.h" +diff --git a/bfd/section.c b/bfd/section.c +index fb19d8c..a661228 100644 +--- a/bfd/section.c ++++ b/bfd/section.c +@@ -542,6 +542,32 @@ CODE_FRAGMENT + . int size; + .}; + . ++.{* Note: the following are provided as inline functions rather than macros ++. because not all callers use the return value. A macro implementation ++. would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some ++. compilers will complain about comma expressions that have no effect. *} ++.static inline bfd_boolean ++.bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val) ++.{ ++. ptr->userdata = val; ++. return TRUE; ++.} ++. ++.static inline bfd_boolean ++.bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val) ++.{ ++. ptr->vma = ptr->lma = val; ++. ptr->user_set_vma = TRUE; ++. return TRUE; ++.} ++. ++.static inline bfd_boolean ++.bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val) ++.{ ++. ptr->alignment_power = val; ++. return TRUE; ++.} ++. + .{* These sections are global, and are managed by BFD. The application + . and target back end are not permitted to change the values in + . these sections. *} +-- +1.7.1 + --- binutils-msp430-2.22~msp20120406.orig/debian/own-patch/ftbfs-gcc-6.patch +++ binutils-msp430-2.22~msp20120406/debian/own-patch/ftbfs-gcc-6.patch @@ -0,0 +1,47 @@ +Subject: Fix build errors with gcc-6. Closes: #811954 +Author: Christoph Biedl + +--- a/binutils/dwarf.c ++++ b/binutils/dwarf.c +@@ -147,7 +147,7 @@ + *length_return = num_read; + + if (sign && (shift < 8 * sizeof (result)) && (byte & 0x40)) +- result |= -1L << shift; ++ result |= ((1L << shift) - 1) ^ -1L; + + return result; + } +--- a/gas/read.c ++++ b/gas/read.c +@@ -4968,7 +4968,7 @@ + { + /* Sign-extend VAL. */ + if (val & (1 << (loaded - 1))) +- val |= ~0 << loaded; ++ val |= ((1L << loaded) - 1) ^ -1L; + if (orig) + *p = val & 0x7f; + p++; +--- a/gas/write.c ++++ b/gas/write.c +@@ -2236,7 +2236,7 @@ + relax_addressT mask; + relax_addressT new_address; + +- mask = ~((~0) << alignment); ++ mask = ((1L << alignment) - 1); + new_address = (address + mask) & (~mask); + #ifdef LINKER_RELAXING_SHRINKS_ONLY + if (linkrelax) +--- a/gas/config/tc-msp430.c ++++ b/gas/config/tc-msp430.c +@@ -2630,7 +2630,7 @@ + { + int align = bfd_get_section_alignment (stdoutput, seg); + +- return ((addr + (1 << align) - 1) & (-1 << align)); ++ return ((addr + (1 << align) - 1) & (((1 << align) - 1) ^ -1)); + } + + /* If you define this macro, it should return the offset between the --- binutils-msp430-2.22~msp20120406.orig/debian/own-patch/gas-uninitialized.patch +++ binutils-msp430-2.22~msp20120406/debian/own-patch/gas-uninitialized.patch @@ -0,0 +1,17 @@ +X-Git-Url: https://sourceware.org/git/?p=binutils.git;a=blobdiff_plain;f=gas%2Fwrite.c;h=56ebb6c565bea35df43565b53206156270a41b66;hp=a4671475af608ea281caccf8832799caef5c13f7;hb=fec4394d16b8af9ce9b40d5a2974bdc6b70c9d6b;hpb=da72436797450a5858e10815e1c5dc230ad7f1ea + +diff --git a/gas/write.c b/gas/write.c +index a467147..56ebb6c 100644 +--- a/gas/write.c ++++ b/gas/write.c +@@ -406,8 +406,8 @@ chain_frchains_together_1 (segT section, struct frchain *frchp) + prev_fix = frchp->fix_tail; + } + } +- gas_assert (prev_frag->fr_type != 0); +- gas_assert (prev_frag != &dummy); ++ gas_assert (prev_frag != &dummy ++ && prev_frag->fr_type != 0); + prev_frag->fr_next = 0; + return prev_frag; + } --- binutils-msp430-2.22~msp20120406.orig/debian/own-patch/remove-unused-variables.patch +++ binutils-msp430-2.22~msp20120406/debian/own-patch/remove-unused-variables.patch @@ -0,0 +1,21 @@ +Subject: Remove unused variables +Author: Christoph Biedl + +--- a/gas/config/tc-msp430.c ++++ b/gas/config/tc-msp430.c +@@ -594,6 +594,7 @@ + | grep '^ *ERRATUM_*' \ + | cut -d= -f1 \ + | sed 's@ *$@,@' */ ++/* + static const int recognized_errata[] = { + ERRATUM_CPU4, + ERRATUM_CPU7, +@@ -623,6 +624,7 @@ + ERRATUM_CPU35, + ERRATUM_CPU40, + }; ++*/ + + static int msp430_cpu = MSP430_CPU_MSP430; + static int msp430_mpy = MSP430_MPY_NONE; --- binutils-msp430-2.22~msp20120406.orig/debian/patchlist +++ binutils-msp430-2.22~msp20120406/debian/patchlist @@ -0,0 +1,5 @@ +./own-patch/ftbfs-gcc-4.9.patch +./own-patch/gas-uninitialized.patch +../msp430-binutils-2.21.1a-20120406.patch +./own-patch/ftbfs-gcc-6.patch +./own-patch/remove-unused-variables.patch --- binutils-msp430-2.22~msp20120406.orig/debian/rules +++ binutils-msp430-2.22~msp20120406/debian/rules @@ -0,0 +1,90 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +PACKAGE = binutils-msp430 +TARGET = msp430 +VERSION = $(shell dpkg-parsechangelog | sed -n 's/^Version:.*\(msp.*\)-.*$$/\1/p') + +BUILD_TREE = $(shell find . -maxdepth 1 -mindepth 1 -type d -name 'binutils*') +DEB_BINUTILS = . + +CONFARGS = --prefix=/usr \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_HOST_GNU_TYPE) \ + --target=$(TARGET)\ + MAKEINFO=missing \ + --disable-static + + +unpack: unpack-stamp +unpack-stamp: + tar xf $(DEB_BINUTILS)/binutils-*.tar.* + touch unpack-stamp + +patch-stamp: unpack-stamp + cd $(BUILD_TREE) && \ + for upstreamp in `grep -v '^#' $(CURDIR)/debian/patchlist`; \ + do echo; echo Applying patch $$upstreamp; \ + patch -p1 < $(CURDIR)/debian/$$upstreamp; done + touch patch-stamp + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + dh_autotools-dev_updateconfig + cd $(BUILD_TREE) && ./configure $(CONFARGS) + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + cd $(BUILD_TREE) && $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp unpack-stamp patch-stamp + dh_autotools-dev_restoreconfig + rm -rf $(BUILD_TREE) + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + cd $(BUILD_TREE) && \ + $(MAKE) install prefix=$(CURDIR)/debian/$(PACKAGE)/usr + + # Remove conflicting files + cd debian/$(PACKAGE)/usr && \ + rm -rf lib/libiberty.* lib/libbfd.* lib/libopcodes* \ + include/bfd.h include/ansidecl.h include/bfdlink.h \ + share/locale include/symcat.h include/dis-asm.h \ + info share/info + +binary-indep: install + +binary-arch: install + dh_testdir + dh_testroot + dh_installdocs -n + dh_installman + dh_installchangelogs RELEASES.TXT + dh_lintian + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- binutils-msp430-2.22~msp20120406.orig/debian/source/format +++ binutils-msp430-2.22~msp20120406/debian/source/format @@ -0,0 +1 @@ +1.0