⛏️ index : buildtools.git

7c4eb4ef2c8d049bd74f2843c2863f95933d50b0 [patch]

f751fc8fe4d20a2ddfc135406685854e06f3ab39

5873a060ca0b72b568f4a183d93604b2280503dc

7c4eb4ef2c8d049bd74f2843c2863f95933d50b0.tar.gz

binutils: added missing licenses and reverted btrev29062.

* added missing GPL licence to te-beos.h and te-haiku.h in line with
other te-*.h files in this directory.
* reverted btrev29062 as it's not required since #6705 is fixed.
* this should ease upstreaming our changes.

Diff

 binutils/include/binary-io.h   |  4 ++--
 binutils/intl/loadmsgcat.c     |  4 ++--
 binutils/gas/config/te-beos.h  | 20 ++++++++++++++++++++
 binutils/gas/config/te-haiku.h | 20 ++++++++++++++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/binutils/include/binary-io.h b/binutils/include/binary-io.h
index 30d716b..2984271 100644
--- a/binutils/include/binary-io.h
+++ b/binutils/include/binary-io.h
@@ -30,8 +30,8 @@
# define O_BINARY _O_BINARY
# define O_TEXT _O_TEXT
#endif
#if defined(__BEOS__) || defined(__HAIKU__)

  /* BeOS 5 and Haiku R1 have O_BINARY and O_TEXT, but they have no effect.  */
#ifdef __BEOS__
  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
# undef O_BINARY
# undef O_TEXT
#endif
diff --git a/binutils/intl/loadmsgcat.c b/binutils/intl/loadmsgcat.c
index 8d282ae..536ee12 100644
--- a/binutils/intl/loadmsgcat.c
+++ b/binutils/intl/loadmsgcat.c
@@ -480,8 +480,8 @@
# define O_BINARY _O_BINARY
# define O_TEXT _O_TEXT
#endif
#if defined(__BEOS__) || defined(__HAIKU__)

  /* BeOS 5 and Haiku R1 have O_BINARY and O_TEXT, but they have no effect.  */
#ifdef __BEOS__
  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
# undef O_BINARY
# undef O_TEXT
#endif
diff --git a/binutils/gas/config/te-beos.h b/binutils/gas/config/te-beos.h
index af472ad..23eea6a 100644
--- a/binutils/gas/config/te-beos.h
+++ b/binutils/gas/config/te-beos.h
@@ -1,3 +1,23 @@
/* te-beos.h -- BeOS target environment declarations.
   Copyright 2013 Free Software Foundation, Inc.

   This file is part of GAS, the GNU Assembler.

   GAS 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, or (at your option)
   any later version.

   GAS 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 GAS; see the file COPYING.  If not, write to
   the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
   02110-1301, USA.  */

/* Target environment for BeOS/Haiku.  It is the same as the generic
   target, except that it arranges via the TE_BeOS define to
   suppress the use of "/" as a comment character.  Some code in the
diff --git a/binutils/gas/config/te-haiku.h b/binutils/gas/config/te-haiku.h
index af472ad..5578046 100644
--- a/binutils/gas/config/te-haiku.h
+++ b/binutils/gas/config/te-haiku.h
@@ -1,3 +1,23 @@
/* te-haiku.h -- Haiku target environment declarations.
   Copyright 2013 Free Software Foundation, Inc.

   This file is part of GAS, the GNU Assembler.

   GAS 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, or (at your option)
   any later version.

   GAS 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 GAS; see the file COPYING.  If not, write to
   the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
   02110-1301, USA.  */

/* Target environment for BeOS/Haiku.  It is the same as the generic
   target, except that it arranges via the TE_BeOS define to
   suppress the use of "/" as a comment character.  Some code in the