[gcc-7] 101/354: * Package gccbrig and the libhsail-rt library.

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:50:37 UTC 2017


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

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 8c65d6b046fb53e4009920a915e9c5cf1cabbf01
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri Jan 27 13:27:57 2017 +0000

      * Package gccbrig and the libhsail-rt library.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9267 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                  |   1 +
 debian/control                    |  45 ++++++
 debian/control.m4                 | 287 ++++++++++++++++++++++++++++++++++++++
 debian/copyright                  |  52 ++++++-
 debian/copyright.in               |  52 ++++++-
 debian/libhsail-rt.symbols        | 153 ++++++++++++++++++++
 debian/libubsan0.symbols          |   4 +
 debian/rules.conf                 |  14 +-
 debian/rules.d/binary-brig.mk     |  73 ++++++++++
 debian/rules.d/binary-libhsail.mk | 133 ++++++++++++++++++
 debian/rules.defs                 |  14 ++
 debian/rules.sonames              |   2 +
 debian/rules2                     |   7 +-
 13 files changed, 833 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5dcdc66..83101ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ gcc-7 (7-20170126-1) experimental; urgency=medium
   * Build the BRIG frontend on amd64.
   * Install new intrinsics headers. Closes: #852551.
   * libgo version bumped to 11.
+  * Package gccbrig and the libhsail-rt library.
 
  -- Matthias Klose <doko at debian.org>  Thu, 26 Jan 2017 18:51:44 +0100
 
diff --git a/debian/control b/debian/control
index 934aeff..3b9098a 100644
--- a/debian/control
+++ b/debian/control
@@ -2270,6 +2270,51 @@ Description: Phobos D standard library (debug symbols)
  .
  For more information check http://www.dlang.org/phobos/
 
+Package: gccbrig-7
+Architecture: any
+Priority: optional
+Depends: gcc-7-base (= ${gcc:Version}), gcc-7 (= ${gcc:Version}), ${dep:libcdev},
+  ${shlibs:Depends}, libhsail-rt-7-dev (= ${gcc:Version}), ${misc:Depends}
+Suggests: ${gccbrig:multilib},
+  libhsail-rt0-dbg (>= ${gcc:Version})
+Provides: brig-compiler
+Description: GNU BRIG (HSA IL) frontend
+ This is the GNU BRIG (HSA IL) frontend.
+ The consumed format is a binary representation. The textual HSAIL
+ can be compiled to it with a separate assembler.
+
+Package: libhsail-rt-7-dev
+Architecture: any
+Section: libdevel
+Priority: optional
+Depends: gcc-7-base (= ${gcc:Version}), libgcc-7-dev (= ${gcc:Version}), libhsail-rt0 (>= ${gcc:Version}),
+  ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Description: HSAIL runtime library (development files)
+ This package contains the headers and static library files needed to build
+ GNU HSAIL applications.
+
+Package: libhsail-rt0
+Section: libs
+Architecture: any
+Provides: libhsail-rt0-armel [armel], libhsail-rt0-armhf [armhf]
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Priority: optional
+Depends: gcc-7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: HSAIL runtime library
+ Library needed for GNU HSAIL applications linked against the shared library.
+
+Package: libhsail-rt0-dbg
+Section: debug
+Architecture: any
+Provides: libhsail-rt0-dbg-armel [armel], libhsail-rt0-dbg-armhf [armhf]
+Multi-Arch: same
+Priority: extra
+Depends: gcc-7-base (= ${gcc:Version}), libhsail-rt0 (= ${gcc:Version}), libgcc1-dbg (>= ${libgcc:Version}), ${misc:Depends}
+Description: HSAIL runtime library (debug symbols)
+ Library needed for GNU HSAIL applications linked against the shared library.
+
 #Package: gcc`'PV-soft-float
 #Architecture: arm armel armhf
 #Priority: PRI(optional)
diff --git a/debian/control.m4 b/debian/control.m4
index 4a4243d..85882da 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -4976,6 +4976,293 @@ Description: Phobos D standard library (debug symbols)
 ')`'dnl libphobos
 ')`'dnl d
 
+ifenabled(`brig',`
+ifenabled(`brigdev',`
+Package: gccbrig`'PV`'TS
+Architecture: any
+ifdef(`TARGET',`Multi-Arch: foreign
+')dnl
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcdev},
+  ${shlibs:Depends}, libidevdep(hsail-rt`'PV-dev,,=), ${misc:Depends}
+Suggests: ${gccbrig:multilib},
+  libdbgdep(hsail-rt`'HSAIL_SO-dbg,)
+Provides: brig-compiler`'TS
+BUILT_USING`'dnl
+Description: GNU BRIG (HSA IL) frontend
+ This is the GNU BRIG (HSA IL) frontend.
+ The consumed format is a binary representation. The textual HSAIL
+ can be compiled to it with a separate assembler.
+
+ifenabled(`multiXXXlib',`
+Package: gccbrig`'PV-multilib`'TS
+Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS)
+ifdef(`TARGET',`Multi-Arch: foreign
+')dnl
+Section: devel
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, gccbrig`'PV`'TS (= ${gcc:Version}),
+  gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libhsailrtbiarchdev},
+  ${shlibs:Depends}, ${misc:Depends}
+BUILT_USING`'dnl
+Description: GNU BRIG (HSA IL) frontend (multilib support)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `')
+ This is the GNU BRIG (HSA IL) frontend.
+ The consumed format is a binary representation. The textual HSAIL
+ can be compiled to it with a separate assembler.
+ .
+ This is a dependency package, depending on development packages
+ for the non-default multilib architecture(s).
+')`'dnl multilib
+
+Package: libhsail-rt`'PV-dev`'LS
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
+Section: libdevel
+Priority: ifdef(`TARGET',`extra',PRI(optional))
+Depends: BASELDEP, libdevdep(gcc`'PV-dev,), libdep(hsail-rt`'HSAIL_SO,),
+  ${shlibs:Depends}, ${misc:Depends}
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
+BUILT_USING`'dnl
+Description: HSAIL runtime library (development files)
+ This package contains the headers and static library files needed to build
+ GNU HSAIL applications.
+
+ifenabled(`lib64hsail',`
+Package: lib64hsail-rt`'PV-dev`'LS
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarch64_archs')
+Section: libdevel
+Priority: ifdef(`TARGET',`extra',PRI(optional))
+Depends: BASELDEP, libdevdep(gcc`'PV-dev,64), libdep(hsail-rt`'HSAIL_SO,64),
+  ${shlibs:Depends}, ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (64bit development files)
+ This package contains the headers and static library files needed to build
+ GNU HSAIL applications.
+')`'dnl lib64hsail
+
+ifenabled(`lib32hsail',`
+Package: lib32hsail-rt`'PV-dev`'LS
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarch32_archs')
+Section: libdevel
+Priority: ifdef(`TARGET',`extra',PRI(optional))
+Depends: BASELDEP, libdevdep(gcc`'PV-dev,32), libdep(hsail-rt`'HSAIL_SO,32), ${shlibs:Depends}, ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (32bit development files)
+ This package contains the headers and static library files needed to build
+ GNU HSAIL applications.
+')`'dnl lib32hsail
+
+ifenabled(`libn32hsail',`
+Package: libn32hsail-rt`'PV-dev`'LS
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchn32_archs')
+Section: libdevel
+Priority: ifdef(`TARGET',`extra',PRI(optional))
+Depends: BASELDEP, libdevdep(gcc`'PV-dev,n32), libdep(hsail-rt`'HSAIL_SO,n32), ${shlibs:Depends}, ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (n32 development files)
+ This package contains the headers and static library files needed to build
+ GNU HSAIL applications.
+')`'dnl libn32hsail
+
+ifenabled(`x32dev',`
+ifenabled(`libx32hsail',`
+Package: libx32hsail-rt`'PV-dev`'LS
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchx32_archs')
+Section: libdevel
+Priority: ifdef(`TARGET',`extra',PRI(optional))
+Depends: BASELDEP, libdevdep(gcc`'PV-dev,x32), libdep(hsail-rt`'HSAIL_SO,x32), ${shlibs:Depends}, ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (x32 development files)
+ This package contains the headers and static library files needed to build
+ GNU HSAIL applications.
+')`'dnl libx32hsail
+')`'dnl x32dev
+
+ifenabled(`armml',`
+ifenabled(`libhfhsail',`
+Package: libhfhsail-rt`'PV-dev`'LS
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchhf_archs')
+Section: libdevel
+Priority: ifdef(`TARGET',`extra',PRI(optional))
+Depends: BASELDEP, libdevdep(gcc`'PV-dev,hf), libdep(hsail-rt`'HSAIL_SO,hf), ${shlibs:Depends}, ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (hard float ABI development files)
+ This package contains the headers and static library files needed to build
+ GNU HSAIL applications.
+')`'dnl libhfhsail
+')`'dnl armml
+
+ifenabled(`armml',`
+ifenabled(`libsfhsail',`
+Package: libsfhsail-rt`'PV-dev`'LS
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchsf_archs')
+Section: libdevel
+Priority: ifdef(`TARGET',`extra',PRI(optional))
+Depends: BASELDEP, libdevdep(gcc`'PV-dev,sf), libdep(hsail-rt`'HSAIL_SO,sf), ${shlibs:Depends}, ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (soft float development files)
+ This package contains the headers and static library files needed to build
+ GNU HSAIL applications.
+')`'dnl libsfhsail
+')`'dnl armml
+')`'dnl hsailrtdev
+
+ifenabled(`libhsail',`
+Package: libhsail-rt`'HSAIL_SO`'LS
+Section: ifdef(`TARGET',`devel',`libs')
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
+ifdef(`TARGET',`',`Provides: libhsail-rt'HSAIL_SO`-armel [armel], libhsail-rt'HSAIL_SO`-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+ifelse(HSAIL_SO,`2',`Breaks: ${multiarch:breaks}
+',`')')`'dnl
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASELDEP, ${shlibs:Depends}, ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library
+ Library needed for GNU HSAIL applications linked against the shared library.
+
+Package: libhsail-rt`'HSAIL_SO-dbg`'LS
+Section: debug
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
+ifdef(`TARGET',`',`Provides: libhsail-rt'HSAIL_SO`-dbg-armel [armel], libhsail-rt'HSAIL_SO`-dbg-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
+Priority: extra
+Depends: BASELDEP, libdep(hsail-rt`'HSAIL_SO,,=), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (debug symbols)
+ Library needed for GNU HSAIL applications linked against the shared library.
+')`'dnl libhsail
+
+ifenabled(`lib64hsail',`
+Package: lib64hsail-rt`'HSAIL_SO`'LS
+Section: ifdef(`TARGET',`devel',`libs')
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarch64_archs')
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASELDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (64bit)
+ Library needed for GNU HSAIL applications linked against the shared library.
+
+Package: lib64hsail-rt`'HSAIL_SO-dbg`'LS
+Section: debug
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarch64_archs')
+Priority: extra
+Depends: BASELDEP, libdep(hsail-rt`'HSAIL_SO,64,=), libdbgdep(gcc`'GCC_SO-dbg,64,>=,${gcc:EpochVersion}), ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (64 bit debug symbols)
+ Library needed for GNU HSAIL applications linked against the shared library.
+')`'dnl lib64hsail
+
+ifenabled(`lib32hsail',`
+Package: lib32hsail-rt`'HSAIL_SO`'LS
+Section: ifdef(`TARGET',`devel',`libs')
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarch32_archs')
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASELDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: ${confl:lib32}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (32bit)
+ Library needed for GNU HSAIL applications linked against the shared library.
+
+Package: lib32hsail-rt`'HSAIL_SO-dbg`'LS
+Section: debug
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarch32_archs')
+Priority: extra
+Depends: BASELDEP, libdep(hsail-rt`'HSAIL_SO,32,=), libdbgdep(gcc`'GCC_SO-dbg,32,>=,${gcc:EpochVersion}), ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (32 bit debug symbols)
+ Library needed for GNU HSAIL applications linked against the shared library.
+')`'dnl lib32hsail
+
+ifenabled(`libn32hsail',`
+Package: libn32hsail-rt`'HSAIL_SO`'LS
+Section: ifdef(`TARGET',`devel',`libs')
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchn32_archs')
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASELDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (n32)
+ Library needed for GNU HSAIL applications linked against the shared library.
+
+Package: libn32hsail-rt`'HSAIL_SO-dbg`'LS
+Section: debug
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchn32_archs')
+Priority: extra
+Depends: BASELDEP, libdep(hsail-rt`'HSAIL_SO,n32,=), libdbgdep(gcc`'GCC_SO-dbg,n32,>=,${gcc:EpochVersion}), ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (n32 debug symbols)
+ Library needed for GNU HSAIL applications linked against the shared library.
+')`'dnl libn32hsail
+
+ifenabled(`libx32hsail',`
+Package: libx32hsail-rt`'HSAIL_SO`'LS
+Section: ifdef(`TARGET',`devel',`libs')
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchx32_archs')
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASELDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (x32)
+ Library needed for GNU HSAIL applications linked against the shared library.
+
+Package: libx32hsail-rt`'HSAIL_SO-dbg`'LS
+Section: debug
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchx32_archs')
+Priority: extra
+Depends: BASELDEP, libdep(hsail-rt`'HSAIL_SO,x32,=), libdbgdep(gcc`'GCC_SO-dbg,x32,>=,${gcc:EpochVersion}), ${misc:Depends}
+BUILT_USING`'dnl
+Description: HSAIL runtime library (x32 debug symbols)
+ Library needed for GNU HSAIL applications linked against the shared library.
+')`'dnl libx32hsail
+
+ifenabled(`libhfhsail',`
+Package: libhfhsail-rt`'HSAIL_SO`'LS
+Section: ifdef(`TARGET',`devel',`libs')
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchhf_archs')
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASELDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
+ifdef(`TARGET',`dnl',`Conflicts: libhsail-rt'HSAIL_SO`-armhf [biarchhf_archs]')
+BUILT_USING`'dnl
+Description: HSAIL runtime library (hard float ABI)
+ Library needed for GNU HSAIL applications linked against the shared library.
+
+Package: libhfhsail-rt`'HSAIL_SO-dbg`'LS
+Section: debug
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchhf_archs')
+Priority: extra
+Depends: BASELDEP, libdep(hsail-rt`'HSAIL_SO,hf,=), libdbgdep(gcc`'GCC_SO-dbg,hf,>=,${gcc:EpochVersion}), ${misc:Depends}
+ifdef(`TARGET',`dnl',`Conflicts: libhsail-rt'HSAIL_SO`-dbg-armhf [biarchhf_archs]')
+BUILT_USING`'dnl
+Description: HSAIL runtime library (hard float ABI debug symbols)
+ Library needed for GNU HSAIL applications linked against the shared library.
+')`'dnl libhfhsailrt
+
+ifenabled(`libsfhsail',`
+Package: libsfhsail-rt`'HSAIL_SO`'LS
+Section: ifdef(`TARGET',`devel',`libs')
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchsf_archs')
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASELDEP, ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
+ifdef(`TARGET',`dnl',`Conflicts: libhsail-rt'HSAIL_SO`-armel [biarchsf_archs]')
+BUILT_USING`'dnl
+Description: HSAIL runtime library (soft float ABI)
+ Library needed for GNU HSAIL applications linked against the shared library.
+
+Package: libsfhsail-rt`'HSAIL_SO-dbg`'LS
+Section: debug
+Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchsf_archs')
+Priority: extra
+Depends: BASELDEP, libdep(hsail-rt`'HSAIL_SO,sf,=), libdbgdep(gcc`'GCC_SO-dbg,sf,>=,${gcc:EpochVersion}), ${misc:Depends}
+ifdef(`TARGET',`dnl',`Conflicts: libhsail-rt'HSAIL_SO`-dbg-armel [biarchsf_archs]')
+BUILT_USING`'dnl
+Description: HSAIL runtime library (soft float ABI debug symbols)
+ Library needed for GNU HSAIL applications linked against the shared library.
+')`'dnl libsfhsailrt
+')`'dnl brig
+
 ifdef(`TARGET',`',`dnl
 ifenabled(`libs',`
 #Package: gcc`'PV-soft-float
diff --git a/debian/copyright b/debian/copyright
index 1afac43..160618b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,7 +19,8 @@ library, and documentation as follows:
 
 Language       Compiler package  Library package    Documentation
 ---------------------------------------------------------------------------
-Ada            gnat-7          libgnat-7        gnat-7-doc
+Ada            gnat-7          libgnat-7          gnat-7-doc
+BRIG           gccbrig-7       libhsail-rt0
 C              gcc-7                              gcc-7-doc
 C++            g++-7           libstdc++6         libstdc++6-7-doc
 D              gdc-7
@@ -606,3 +607,52 @@ By plainly marking modifications, something along the lines of adding to each
 file that has been changed a "Modified by Foo Bar" line
 underneath the "Written by" line would be adequate.
 
+The libhsail-rt library is licensed under the following terms:
+
+   Copyright (C) 2015-2017 Free Software Foundation, Inc.
+   Contributed by Pekka Jaaskelainen <pekka.jaaskelainen at parmance.com>
+   for General Processor Tech.
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files
+   (the "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+   DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+   OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+   USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+libhsail-rt/rt/fp16.c is licensed under the following terms:
+
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
+   Contributed by CodeSourcery.
+
+   This file 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.
+
+   This file 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.
+ 
diff --git a/debian/copyright.in b/debian/copyright.in
index 98f5be4..c90c22a 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -19,7 +19,8 @@ library, and documentation as follows:
 
 Language       Compiler package  Library package    Documentation
 ---------------------------------------------------------------------------
-Ada            gnat- at BV@          libgnat- at BV@        gnat- at BV@-doc
+Ada            gnat- at BV@          libgnat- at BV@          gnat- at BV@-doc
+BRIG           gccbrig- at BV@       libhsail-rt0
 C              gcc- at BV@                              gcc- at BV@-doc
 C++            g++- at BV@           libstdc++6         libstdc++6- at BV@-doc
 D              gdc- at BV@
@@ -606,3 +607,52 @@ By plainly marking modifications, something along the lines of adding to each
 file that has been changed a "Modified by Foo Bar" line
 underneath the "Written by" line would be adequate.
 
+The libhsail-rt library is licensed under the following terms:
+
+   Copyright (C) 2015-2017 Free Software Foundation, Inc.
+   Contributed by Pekka Jaaskelainen <pekka.jaaskelainen at parmance.com>
+   for General Processor Tech.
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files
+   (the "Software"), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+   DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+   OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+   USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+libhsail-rt/rt/fp16.c is licensed under the following terms:
+
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
+   Contributed by CodeSourcery.
+
+   This file 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.
+
+   This file 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.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.
+ 
diff --git a/debian/libhsail-rt.symbols b/debian/libhsail-rt.symbols
new file mode 100644
index 0000000..89346d0
--- /dev/null
+++ b/debian/libhsail-rt.symbols
@@ -0,0 +1,153 @@
+libhsail-rt.so.0 #PACKAGE# #MINVER#
+ __hsail_addqueuewriteindex at Base 7
+ __hsail_alloca at Base 7
+ __hsail_alloca_pop_frame at Base 7
+ __hsail_alloca_push_frame at Base 7
+ __hsail_arrivefbar at Base 7
+ __hsail_atomic_max_s32 at Base 7
+ __hsail_atomic_max_s64 at Base 7
+ __hsail_atomic_max_u32 at Base 7
+ __hsail_atomic_max_u64 at Base 7
+ __hsail_atomic_min_s32 at Base 7
+ __hsail_atomic_min_s64 at Base 7
+ __hsail_atomic_min_u32 at Base 7
+ __hsail_atomic_min_u64 at Base 7
+ __hsail_atomic_wrapdec_u32 at Base 7
+ __hsail_atomic_wrapdec_u64 at Base 7
+ __hsail_atomic_wrapinc_u32 at Base 7
+ __hsail_atomic_wrapinc_u64 at Base 7
+ __hsail_barrier at Base 7
+ __hsail_bitalign at Base 7
+ __hsail_bitextract_s32 at Base 7
+ __hsail_bitextract_s64 at Base 7
+ __hsail_bitextract_u32 at Base 7
+ __hsail_bitextract_u64 at Base 7
+ __hsail_bitinsert_u32 at Base 7
+ __hsail_bitinsert_u64 at Base 7
+ __hsail_bitmask_u32 at Base 7
+ __hsail_bitmask_u64 at Base 7
+ __hsail_bitrev_u32 at Base 7
+ __hsail_bitrev_u64 at Base 7
+ __hsail_bitselect_u32 at Base 7
+ __hsail_bitselect_u64 at Base 7
+ __hsail_borrow_u32 at Base 7
+ __hsail_borrow_u64 at Base 7
+ __hsail_bytealign at Base 7
+ __hsail_carry_u32 at Base 7
+ __hsail_carry_u64 at Base 7
+ __hsail_casqueuewriteindex at Base 7
+ __hsail_class_f32 at Base 7
+ __hsail_class_f32_f16 at Base 7
+ __hsail_clock at Base 7
+ __hsail_cuid at Base 7
+ __hsail_currentworkgroupsize at Base 7
+ __hsail_currentworkitemflatid at Base 7
+ __hsail_cvt_zeroi_sat_s16_f32 at Base 7
+ __hsail_cvt_zeroi_sat_s16_f64 at Base 7
+ __hsail_cvt_zeroi_sat_s32_f32 at Base 7
+ __hsail_cvt_zeroi_sat_s32_f64 at Base 7
+ __hsail_cvt_zeroi_sat_s64_f32 at Base 7
+ __hsail_cvt_zeroi_sat_s64_f64 at Base 7
+ __hsail_cvt_zeroi_sat_s8_f32 at Base 7
+ __hsail_cvt_zeroi_sat_s8_f64 at Base 7
+ __hsail_cvt_zeroi_sat_u16_f32 at Base 7
+ __hsail_cvt_zeroi_sat_u16_f64 at Base 7
+ __hsail_cvt_zeroi_sat_u32_f32 at Base 7
+ __hsail_cvt_zeroi_sat_u32_f64 at Base 7
+ __hsail_cvt_zeroi_sat_u64_f32 at Base 7
+ __hsail_cvt_zeroi_sat_u64_f64 at Base 7
+ __hsail_cvt_zeroi_sat_u8_f32 at Base 7
+ __hsail_cvt_zeroi_sat_u8_f64 at Base 7
+ __hsail_debugtrap at Base 7
+ __hsail_dim at Base 7
+ __hsail_f16_to_f32 at Base 7
+ __hsail_f32_to_f16 at Base 7
+ __hsail_firstbit_s32 at Base 7
+ __hsail_firstbit_s64 at Base 7
+ __hsail_firstbit_u32 at Base 7
+ __hsail_firstbit_u64 at Base 7
+ __hsail_fract_f32 at Base 7
+ __hsail_fract_f64 at Base 7
+ __hsail_ftz_f32 at Base 7
+ __hsail_ftz_f32_f16 at Base 7
+ __hsail_ftz_f64 at Base 7
+ __hsail_gridgroups at Base 7
+ __hsail_gridsize at Base 7
+ __hsail_groupbaseptr at Base 7
+ __hsail_initfbar at Base 7
+ __hsail_joinfbar at Base 7
+ __hsail_kernargbaseptr_u32 at Base 7
+ __hsail_kernargbaseptr_u64 at Base 7
+ __hsail_lastbit_u32 at Base 7
+ __hsail_lastbit_u64 at Base 7
+ __hsail_launch_kernel at Base 7
+ __hsail_launch_wg_function at Base 7
+ __hsail_ldqueuereadindex at Base 7
+ __hsail_ldqueuewriteindex at Base 7
+ __hsail_leavefbar at Base 7
+ __hsail_lerp at Base 7
+ __hsail_max_f32 at Base 7
+ __hsail_max_f64 at Base 7
+ __hsail_maxcuid at Base 7
+ __hsail_min_f32 at Base 7
+ __hsail_min_f64 at Base 7
+ __hsail_packcvt at Base 7
+ __hsail_packetcompletionsig_sig32 at Base 7
+ __hsail_packetcompletionsig_sig64 at Base 7
+ __hsail_packetid at Base 7
+ __hsail_releasefbar at Base 7
+ __hsail_rem_s32 at Base 7
+ __hsail_rem_s64 at Base 7
+ __hsail_sad_u16x2 at Base 7
+ __hsail_sad_u32 at Base 7
+ __hsail_sad_u8x4 at Base 7
+ __hsail_sadhi_u16x2_u8x4 at Base 7
+ __hsail_sat_add_s16 at Base 7
+ __hsail_sat_add_s32 at Base 7
+ __hsail_sat_add_s64 at Base 7
+ __hsail_sat_add_s8 at Base 7
+ __hsail_sat_add_u16 at Base 7
+ __hsail_sat_add_u32 at Base 7
+ __hsail_sat_add_u64 at Base 7
+ __hsail_sat_add_u8 at Base 7
+ __hsail_sat_mul_s16 at Base 7
+ __hsail_sat_mul_s32 at Base 7
+ __hsail_sat_mul_s64 at Base 7
+ __hsail_sat_mul_s8 at Base 7
+ __hsail_sat_mul_u16 at Base 7
+ __hsail_sat_mul_u32 at Base 7
+ __hsail_sat_mul_u64 at Base 7
+ __hsail_sat_mul_u8 at Base 7
+ __hsail_sat_sub_s16 at Base 7
+ __hsail_sat_sub_s32 at Base 7
+ __hsail_sat_sub_s64 at Base 7
+ __hsail_sat_sub_s8 at Base 7
+ __hsail_sat_sub_u16 at Base 7
+ __hsail_sat_sub_u32 at Base 7
+ __hsail_sat_sub_u64 at Base 7
+ __hsail_sat_sub_u8 at Base 7
+ __hsail_segmentp_global at Base 7
+ __hsail_segmentp_group at Base 7
+ __hsail_segmentp_private at Base 7
+ __hsail_setworkitemid at Base 7
+ __hsail_stqueuereadindex at Base 7
+ __hsail_stqueuewriteindex at Base 7
+ __hsail_unpackcvt at Base 7
+ __hsail_waitfbar at Base 7
+ __hsail_workgroupid at Base 7
+ __hsail_workgroupsize at Base 7
+ __hsail_workitemabsid at Base 7
+ __hsail_workitemabsid_u64 at Base 7
+ __hsail_workitemflatabsid_u32 at Base 7
+ __hsail_workitemflatabsid_u64 at Base 7
+ __hsail_workitemflatid at Base 7
+ __hsail_workitemid at Base 7
+ fiber_barrier_init at Base 7
+ fiber_barrier_reach at Base 7
+ fiber_exit at Base 7
+ fiber_init at Base 7
+ fiber_int_args_to_ptr at Base 7
+ fiber_join at Base 7
+ fiber_yield at Base 7
+ main_context at Base 7
+ phsa_fatal_error at Base 7
diff --git a/debian/libubsan0.symbols b/debian/libubsan0.symbols
index 527f248..27c5b9f 100644
--- a/debian/libubsan0.symbols
+++ b/debian/libubsan0.symbols
@@ -78,6 +78,10 @@ libubsan.so.0 libubsan0 #MINVER#
  __ubsan_handle_add_overflow at Base 4.9
  __ubsan_handle_add_overflow_abort at Base 4.9
  __ubsan_handle_builtin_unreachable at Base 4.9
+ __ubsan_handle_cfi_bad_icall at Base 7
+ __ubsan_handle_cfi_bad_icall_abort at Base 7
+ __ubsan_handle_cfi_bad_type at Base 7
+ __ubsan_handle_cfi_bad_type_abort at Base 7
  __ubsan_handle_cfi_check_fail at Base 7
  __ubsan_handle_cfi_check_fail_abort at Base 7
  __ubsan_handle_divrem_overflow at Base 4.9
diff --git a/debian/rules.conf b/debian/rules.conf
index 6653e26..75ec3a3 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -27,7 +27,7 @@ _soname_map = gcc=$(GCC_SONAME) stdc++=$(CXX_SONAME) gomp=$(GOMP_SONAME) \
 	atomic=$(ATOMIC_SONAME) asan=$(ASAN_SONAME) lsan=$(LSAN_SONAME) \
 	tsan=$(TSAN_SONAME) ubsan=$(UBSAN_SONAME) \
 	vtv=$(VTV_SONAME) cilkrts=$(CILKRTS_SONAME) mpx=$(MPX_SONAME) \
-	gphobos=$(GPHOBOS_SONAME)
+	gphobos=$(GPHOBOS_SONAME) hsail-rt=$(HSAIL_SONAME)
 _soname = $(patsubst $(1)=%,%,$(filter $(1)=%,$(_soname_map)))
 
 rel_on_dev := $(if $(cross_lib_arch),>=,=)
@@ -715,6 +715,9 @@ ifneq ($(DEB_STAGE),rtlibs)
   ifneq (,$(filter objpp, $(languages)))
       addons += objppdev
   endif
+  ifneq (,$(filter brig, $(enabled_languages)))
+      addons += brigdev
+  endif
   addons += plugindev
 endif
 addons += $(if $(findstring armel,$(biarchhfarchs)),armml)
@@ -848,6 +851,13 @@ ifeq ($(with_ada),yes)
     addons += adasjlj
   endif
 endif
+ifeq ($(with_brig),yes)
+  addons += brig
+  ifeq ($(with_libhsailrt),yes)
+    addons += libhsail # lib32hsail lib64hsail libn32hsail
+    addons += # $(if $(findstring amd64,$(biarchx32archs)),libx32hsail)
+  endif
+endif
 
   ifneq ($(DEB_CROSS),yes)
   ifneq (,$(neon_archs))
@@ -939,6 +949,7 @@ control-file:
 	  -DGO_SO=$(GO_SONAME) \
 	  -DCC1_SO=$(CC1_SONAME) \
 	  -DGCCJIT_SO=$(GCCJIT_SONAME) \
+	  -DHSAIL_SO=$(HSAIL_SONAME) \
 	  -Denabled_languages="$(languages) $(addons)" \
 	  -Dada_no_archs="$(ada_no_archs)" \
 	  -Dfortran_no_archs="$(fortran_no_archs)" \
@@ -1234,6 +1245,7 @@ parameters-file:
 		echo 'GCCJIT_SONAME	:= $(GCCJIT_SONAME)'; \
 		echo 'GPHOBOS_SONAME	:= $(GPHOBOS_SONAME)'; \
 		echo 'GDRUNTIME_SONAME	:= $(GDRUNTIME_SONAME)'; \
+		echo 'HSAIL_SONAME	:= $(HSAIL_SONAME)'; \
 		echo 'LIBC_DEP		:= $(LIBC_DEP)'; \
 	) > debian/rules.parameters.tmp
 	[ -e debian/rules.parameters ] \
diff --git a/debian/rules.d/binary-brig.mk b/debian/rules.d/binary-brig.mk
new file mode 100644
index 0000000..1288973
--- /dev/null
+++ b/debian/rules.d/binary-brig.mk
@@ -0,0 +1,73 @@
+ifneq ($(DEB_STAGE),rtlibs)
+#  ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchhf) $(biarchsf)))
+#    arch_binaries  := $(arch_binaries) brig-multi
+#  endif
+  arch_binaries := $(arch_binaries) brig
+endif
+
+p_brig	= gccbrig$(pkg_ver)$(cross_bin_arch)
+d_brig	= debian/$(p_brig)
+
+p_brig_m= gccbrig$(pkg_ver)-multilib$(cross_bin_arch)
+d_brig_m= debian/$(p_brig_m)
+
+dirs_brig = \
+	$(docdir)/$(p_xbase)/BRIG \
+	$(gcc_lexec_dir)
+
+files_brig = \
+	$(PF)/bin/$(cmd_prefix)gccbrig$(pkg_ver) \
+	$(gcc_lexec_dir)/brig1
+
+$(binary_stamp)-brig: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_brig)
+	dh_installdirs -p$(p_brig) $(dirs_brig)
+	$(dh_compat2) dh_movefiles -p$(p_brig) $(files_brig)
+
+ifeq ($(unprefixed_names),yes)
+	ln -sf $(cmd_prefix)gccbrig$(pkg_ver) \
+	    $(d_brig)/$(PF)/bin/gccbrig$(pkg_ver)
+#  ifneq ($(GFDL_INVARIANT_FREE),yes-now-pure-gfdl)
+#	ln -sf $(cmd_prefix)gccbrig$(pkg_ver).1 \
+#	    $(d_brig)/$(PF)/share/man/man1/gccbrig$(pkg_ver).1
+#  endif
+endif
+	cp -p $(srcdir)/gcc/brig/ChangeLog \
+		$(d_brig)/$(docdir)/$(p_xbase)/BRIG/changelog.BRIG
+
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	mkdir -p $(d_brig)/usr/share/lintian/overrides
+	echo '$(p_brig) binary: binary-without-manpage' \
+	  >> $(d_brig)/usr/share/lintian/overrides/$(p_brig)
+endif
+
+	debian/dh_doclink -p$(p_brig) $(p_xbase)
+
+	debian/dh_rmemptydirs -p$(p_brig)
+
+	dh_strip -p$(p_brig) \
+	  $(if $(unstripped_exe),-X/brig1)
+	dh_shlibdeps -p$(p_brig)
+	echo $(p_brig) >> debian/arch_binaries
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+$(binary_stamp)-brig-multi: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_brig_m)
+	dh_installdirs -p$(p_brig_m) $(docdir)
+
+	debian/dh_doclink -p$(p_brig_m) $(p_xbase)
+
+	dh_strip -p$(p_brig_m)
+	dh_shlibdeps -p$(p_brig_m)
+	echo $(p_brig_m) >> debian/arch_binaries
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
diff --git a/debian/rules.d/binary-libhsail.mk b/debian/rules.d/binary-libhsail.mk
new file mode 100644
index 0000000..b48d56b
--- /dev/null
+++ b/debian/rules.d/binary-libhsail.mk
@@ -0,0 +1,133 @@
+ifeq ($(with_libhsailrt),yes)
+  $(lib_binaries)  += libhsail
+endif
+ifeq ($(with_brigdev),yes)
+  $(lib_binaries) += libhsail-dev
+endif
+#ifeq ($(with_lib64hsailrt),yes)
+#  $(lib_binaries)  += lib64hsail
+#endif
+#ifeq ($(with_lib64hsailrtdev),yes)
+#  $(lib_binaries)  += lib64hsail-dev
+#endif
+#ifeq ($(with_lib32hsailrt),yes)
+#  $(lib_binaries)	+= lib32hsail
+#endif
+#ifeq ($(with_lib32hsailrtdev),yes)
+#  $(lib_binaries)	+= lib32hsail-dev
+#endif
+#ifeq ($(with_libn32hsailrt),yes)
+#  $(lib_binaries)	+= libn32hsail
+#endif
+#ifeq ($(with_libn32hsailrtdev),yes)
+#  $(lib_binaries)	+= libn32hsail-dev
+#endif
+#ifeq ($(with_libx32hsailrt),yes)
+#  $(lib_binaries)	+= libx32hsail
+#endif
+#ifeq ($(with_libx32hsailrtdev),yes)
+#  $(lib_binaries)	+= libx32hsail-dev
+#endif
+#ifeq ($(with_libhfhsailrt),yes)
+#  $(lib_binaries)	+= libhfhsail
+#endif
+#ifeq ($(with_libhfhsailrtdev),yes)
+#  $(lib_binaries)	+= libhfhsail-dev
+#endif
+#ifeq ($(with_libsfhsailrt),yes)
+#  $(lib_binaries)	+= libsfhsail
+#endif
+#ifeq ($(with_libsfhsailrt-dev),yes)
+#  $(lib_binaries)	+= libsfhsail-dev
+#endif
+
+define __do_hsail
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l) $(d_d)
+	dh_installdirs -p$(p_l) $(usr_lib$(2))
+	$(dh_compat2) dh_movefiles -p$(p_l) $(usr_lib$(2))/libhsail-rt.so.*
+
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
+
+	dh_strip -p$(p_l) --dbg-package=$(p_d)
+	ln -sf libhsail-rt.symbols debian/$(p_l).symbols
+	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
+	$(call cross_mangle_shlibs,$(p_l))
+	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
+		$(call shlibdirs_to_search,$(subst hsail-rt$(HSAIL_SONAME),gcc$(GCC_SONAME),$(p_l)),$(2))
+	$(call cross_mangle_substvars,$(p_l))
+	echo $(p_l) $(p_d) >> debian/$(lib_binaries)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+endef
+
+define __do_hsail_dev
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l)
+	dh_installdirs -p$(p_l) \
+		$(gcc_lib_dir$(2))
+#	$(dh_compat2) dh_movefiles -p$(p_l)
+
+	$(call install_gcc_lib,libhsail-rt,$(HSAIL_SONAME),$(2),$(p_l))
+
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	echo $(p_l) >> debian/$(lib_binaries)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+endef
+
+# ----------------------------------------------------------------------
+
+do_hsail = $(call __do_hsail,lib$(1)hsail-rt$(HSAIL_SONAME),$(1))
+do_hsail_dev = $(call __do_hsail_dev,lib$(1)hsail-rt-$(BASE_VERSION)-dev,$(1))
+
+$(binary_stamp)-libhsail: $(install_stamp)
+	@echo XXXXXXXXXXXX XX $(HSAIL_SONAME)
+	$(call do_hsail,)
+
+$(binary_stamp)-lib64hsail: $(install_stamp)
+	$(call do_hsail,64)
+
+$(binary_stamp)-lib32hsail: $(install_stamp)
+	$(call do_hsail,32)
+
+$(binary_stamp)-libn32hsail: $(install_stamp)
+	$(call do_hsail,n32)
+
+$(binary_stamp)-libx32hsail: $(install_stamp)
+	$(call do_hsail,x32)
+
+$(binary_stamp)-libhfhsail: $(install_dependencies)
+	$(call do_hsail,hf)
+
+$(binary_stamp)-libsfhsail: $(install_dependencies)
+	$(call do_hsail,sf)
+
+
+$(binary_stamp)-libhsail-dev: $(install_stamp)
+	$(call do_hsail_dev,)
+
+$(binary_stamp)-lib64hsail-dev: $(install_stamp)
+	$(call do_hsail_dev,64)
+
+$(binary_stamp)-lib32hsail-dev: $(install_stamp)
+	$(call do_hsail_dev,32)
+
+$(binary_stamp)-libx32hsail-dev: $(install_stamp)
+	$(call do_hsail_dev,x32)
+
+$(binary_stamp)-libn32hsail-dev: $(install_stamp)
+	$(call do_hsail_dev,n32)
+
+$(binary_stamp)-libhfhsail-dev: $(install_stamp)
+	$(call do_hsail_dev,hf)
+
+$(binary_stamp)-libsfhsail-dev: $(install_stamp)
+	$(call do_hsail_dev,sf)
diff --git a/debian/rules.defs b/debian/rules.defs
index 185365b..13b9717 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -840,6 +840,8 @@ endif
 with_brig := no
 ifneq (,$(filter $(DEB_TARGET_ARCH),amd64 x32))
   with_brig := yes
+  with_brigdev := yes
+  with_libhsailrt := yes
 endif
 
 ifeq ($(with_brig),yes)
@@ -1526,6 +1528,9 @@ define gen_biarch
     ifeq ($$(with_libgo),yes)
       with_lib$1go := yes
     endif
+    ifeq ($$(with_libhsailrt),yes)
+      with_lib$1hsailrt := yes
+    endif
 
     biarch_multidir_names = libiberty libgcc libbacktrace libatomic libgomp
     ifneq (,$$(findstring gcc-, $$(PKGSOURCE)))
@@ -1546,6 +1551,9 @@ define gen_biarch
     ifeq ($(with_go),yes)
       biarch_multidir_names += libgo
     endif
+    ifeq ($(with_brig),yes)
+      biarch_multidir_names += libhsail-rt
+    endif
     ifeq ($(with_libphobos),yes)
       ifeq (,$(filter $1, hf))
         biarch_multidir_names += libphobos
@@ -1619,6 +1627,7 @@ ifeq ($(no_biarch_libs),yes)
   with_lib64objcdev	:= no
   with_lib64gfortrandev	:= no
   with_lib64phobosdev	:= no
+  with_lib64hsailrtdev	:= no
 
   with_lib32gcc		:= no
   with_lib32cxx		:= no
@@ -1645,6 +1654,7 @@ ifeq ($(no_biarch_libs),yes)
   with_lib32objcdev	:= no
   with_lib32gfortrandev	:= no
   with_lib32phobosdev	:= no
+  with_lib32hsailrtdev	:= no
 
   with_libn32gcc	:= no
   with_libn32cxx	:= no
@@ -1668,6 +1678,7 @@ ifeq ($(no_biarch_libs),yes)
   with_libn32objcdev	:= no
   with_libn32gfortrandev:= no
   with_libn32phobosdev	:= no
+  with_libn32hsailrtdev	:= no
 
   with_libx32gcc	:= no
   with_libx32cxx	:= no
@@ -1693,6 +1704,7 @@ ifeq ($(no_biarch_libs),yes)
   with_libx32objcdev	:= no
   with_libx32gfortrandev:= no
   with_libx32phobosdev	:= no
+  with_libx32hsailrtdev	:= no
 
   with_libhfgcc		:= no
   with_libhfcxx		:= no
@@ -1716,6 +1728,7 @@ ifeq ($(no_biarch_libs),yes)
   with_libhfobjcdev	:= no
   with_libhfgfortrandev	:= no
   with_libhfphobosdev	:= no
+  with_libhfhsailrtdev	:= no
 
   with_libsfgcc		:= no
   with_libsfcxx		:= no
@@ -1739,6 +1752,7 @@ ifeq ($(no_biarch_libs),yes)
   with_libsfobjcdev	:= no
   with_libsfgfortrandev	:= no
   with_libsfphobosdev	:= no
+  with_libsfhsailrtdev	:= no
 
   ifeq ($(with_ada)-$(with_separate_gnat),yes-yes)
     biarchhf	:= disabled for Ada
diff --git a/debian/rules.sonames b/debian/rules.sonames
index d77cd1b..88ea48f 100644
--- a/debian/rules.sonames
+++ b/debian/rules.sonames
@@ -56,6 +56,7 @@ ifeq (,$(wildcard debian/soname-cache))
 	echo MPX_SONAME=$$v >> $$cache; \
 	echo GPHOBOS_SONAME=68 >> $$cache; \
 	echo GDRUNTIME_SONAME=68 >> $$cache; \
+	echo HSAIL_SONAME=0 >> $$cache; \
 	cat $$cache)
 else
   SONAME_VARS := $(shell cat debian/soname-cache)
@@ -83,6 +84,7 @@ GCCJIT_SONAME	= $(call vafilt,$(SONAME_VARS),GCCJIT_SONAME)
 MPX_SONAME	= $(call vafilt,$(SONAME_VARS),MPX_SONAME)
 GPHOBOS_SONAME	= $(call vafilt,$(SONAME_VARS),GPHOBOS_SONAME)
 GDRUNTIME_SONAME= $(call vafilt,$(SONAME_VARS),GDRUNTIME_SONAME)
+HSAIL_SONAME	= $(call vafilt,$(SONAME_VARS),HSAIL_SONAME)
 
 # alias
 GFORTRAN_SONAME = $(FORTRAN_SONAME)
diff --git a/debian/rules2 b/debian/rules2
index eec539b..7ed74d7 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -1686,7 +1686,7 @@ clean: debian/control
 	  rm -f $$f2; \
 	done
 	rm -f debian/lib*gcc1.symbols
-	rm -f debian/lib*{atomic$(ATOMIC_SONAME),cilkrts$(CILKRTS_SONAME),gfortran$(FORTRAN_SONAME),gomp$(GOMP_SONAME),itm$(ITM_SONAME),mpx$(MPX_SONAME),quadmath$(QUADMATH_SONAME)}.symbols
+	rm -f debian/lib*{atomic$(ATOMIC_SONAME),cilkrts$(CILKRTS_SONAME),gfortran$(FORTRAN_SONAME),gomp$(GOMP_SONAME),itm$(ITM_SONAME),mpx$(MPX_SONAME),quadmath$(QUADMATH_SONAME),hsail-rt$(HSAIL_SONAME)}.symbols
 	find debian -maxdepth 1 -name '*-cross.symbols' -type l | xargs -r rm -f
 	rm -f debian/gcc-{XX,ar,nm,ranlib}-$(BASE_VERSION).1
 	rm -f debian/shlibs.local debian/shlibs.common* debian/substvars.local
@@ -1835,6 +1835,11 @@ ifeq ($(with_go),yes)
   include debian/rules.d/binary-go.mk
 endif
 
+ifeq ($(with_brig),yes)
+  include debian/rules.d/binary-brig.mk
+  include debian/rules.d/binary-libhsail.mk
+endif
+
 ifeq ($(with_cxxdev),yes)
   include debian/rules.d/binary-cxx.mk
 endif

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



More information about the Reproducible-commits mailing list