diff --git a/.gcc.metadata b/.gcc.metadata
new file mode 100644
index 0000000..bc0d5cc
--- /dev/null
+++ b/.gcc.metadata
@@ -0,0 +1,4 @@
+85f620a26aabf6a934c44ca40a9799af0952f863 SOURCES/cloog-0.18.0.tar.gz
+8263777994323f58bb81869354fb18c6ca32f88a SOURCES/fastjar-0.97.tar.gz
+500237a6ba14b8a56751f57e5957b40cefa9cb01 SOURCES/gcc-4.8.5-20150702.tar.bz2
+d7936929c3937e03f09b64c3c54e49422fa8ddb3 SOURCES/isl-0.11.1.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..388b5e1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+SOURCES/cloog-0.18.0.tar.gz
+SOURCES/fastjar-0.97.tar.gz
+SOURCES/gcc-4.8.5-20150702.tar.bz2
+SOURCES/isl-0.11.1.tar.bz2
diff --git a/SOURCES/cloog-0.18.0-ppc64le-config.patch b/SOURCES/cloog-0.18.0-ppc64le-config.patch
new file mode 100644
index 0000000..5538a24
--- /dev/null
+++ b/SOURCES/cloog-0.18.0-ppc64le-config.patch
@@ -0,0 +1,717 @@
+--- cloog-0.18.0/m4/libtool.m4.jj 2014-04-10 14:29:12.547772844 -0700
++++ cloog-0.18.0/m4/libtool.m4 2014-04-10 14:33:01.848642792 -0700
+@@ -1312,7 +1312,7 @@
+ rm -rf conftest*
+ ;;
+
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+@@ -1326,7 +1326,10 @@
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+- ppc64-*linux*|powerpc64-*linux*)
++ powerpc64le-*linux*)
++ LD="${LD-ld} -m elf32lppclinux"
++ ;;
++ powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -1345,7 +1348,10 @@
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- ppc*-*linux*|powerpc*-*linux*)
++ powerpcle-*linux*)
++ LD="${LD-ld} -m elf64lppc"
++ ;;
++ powerpc-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+--- cloog-0.18.0/autoconf/config.sub.jj 2013-10-11 09:27:45.000000000 +0200
++++ cloog-0.18.0/autoconf/config.sub 2014-04-10 10:38:39.000000000 +0200
+@@ -1,24 +1,18 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-# 2011, 2012 Free Software Foundation, Inc.
+-
+-timestamp='2012-04-18'
+-
+-# This file is (in principle) common to ALL GNU software.
+-# The presence of a machine in this file suggests that SOME GNU software
+-# can handle that machine. It does not imply ALL GNU software can.
+-#
+-# 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 2 of the License, or
++# Copyright 1992-2013 Free Software Foundation, Inc.
++
++timestamp='2013-10-01'
++
++# 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 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.
++# 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, see .
+@@ -26,11 +20,12 @@ timestamp='2012-04-18'
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
++# the same distribution terms that you use for the rest of that
++# program. This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
+
+
+-# Please send patches to . Submit a context
+-# diff and a properly formatted GNU ChangeLog entry.
++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+@@ -73,9 +68,7 @@ Report bugs and patches to and include a ChangeLog
+-# entry.
++# the same distribution terms that you use for the rest of that
++# program. This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# This script attempts to guess a canonical system name similar to
+-# config.sub. If it succeeds, it prints the system name on stdout, and
+-# exits with 0. Otherwise, it exits with 1.
++# Originally written by Per Bothner.
+ #
+ # You can get the latest version of this script from:
+ # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++#
++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -54,9 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+-Free Software Foundation, Inc.
++Copyright 1992-2013 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
++case "${UNAME_SYSTEM}" in
++Linux|GNU|GNU/*)
++ # If the system lacks a compiler, then just pick glibc.
++ # We could probably try harder.
++ LIBC=gnu
++
++ eval $set_cc_for_build
++ cat <<-EOF > $dummy.c
++ #include
++ #if defined(__UCLIBC__)
++ LIBC=uclibc
++ #elif defined(__dietlibc__)
++ LIBC=dietlibc
++ #else
++ LIBC=gnu
++ #endif
++ EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ ;;
++esac
++
+ # Note: order is significant - the case branches are not exclusive.
+
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit ;;
++ *:Bitrig:*:*)
++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++ exit ;;
+ *:OpenBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit ;;
+- arm:riscos:*:*|arm:RISCOS:*:*)
++ arm*:riscos:*:*|arm*:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+@@ -801,6 +820,9 @@ EOF
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
++ *:MINGW64*:*)
++ echo ${UNAME_MACHINE}-pc-mingw64
++ exit ;;
+ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+@@ -852,21 +874,21 @@ EOF
+ exit ;;
+ *:GNU:*:*)
+ # the GNU system
+- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ exit ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
+ aarch64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -879,59 +901,54 @@ EOF
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
++ arc:Linux:*:* | arceb:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ else
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ else
+- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ fi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ cris:Linux:*:*)
+- echo ${UNAME_MACHINE}-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ exit ;;
+ crisv32:Linux:*:*)
+- echo ${UNAME_MACHINE}-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ exit ;;
+ frv:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ hexagon:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ i*86:Linux:*:*)
+- LIBC=gnu
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ exit ;;
+ ia64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ m32r*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ m68*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+@@ -950,54 +967,63 @@ EOF
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ ;;
++ or1k:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
+ or32:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ padre:Linux:*:*)
+- echo sparc-unknown-linux-gnu
++ echo sparc-unknown-linux-${LIBC}
+ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
++ echo hppa64-unknown-linux-${LIBC}
+ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+- PA7*) echo hppa1.1-unknown-linux-gnu ;;
+- PA8*) echo hppa2.0-unknown-linux-gnu ;;
+- *) echo hppa-unknown-linux-gnu ;;
++ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
++ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
++ *) echo hppa-unknown-linux-${LIBC} ;;
+ esac
+ exit ;;
+ ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
++ echo powerpc64-unknown-linux-${LIBC}
+ exit ;;
+ ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
++ echo powerpc-unknown-linux-${LIBC}
++ exit ;;
++ ppc64le:Linux:*:*)
++ echo powerpc64le-unknown-linux-${LIBC}
++ exit ;;
++ ppcle:Linux:*:*)
++ echo powerpcle-unknown-linux-${LIBC}
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+- echo ${UNAME_MACHINE}-ibm-linux
++ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ exit ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ sh*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ tile*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ vax:Linux:*:*)
+- echo ${UNAME_MACHINE}-dec-linux-gnu
++ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ exit ;;
+ x86_64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ xtensa*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -1201,6 +1227,9 @@ EOF
+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+ echo i586-pc-haiku
+ exit ;;
++ x86_64:Haiku:*:*)
++ echo x86_64-unknown-haiku
++ exit ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit ;;
+@@ -1227,19 +1256,21 @@ EOF
+ exit ;;
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+- case $UNAME_PROCESSOR in
+- i386)
+- eval $set_cc_for_build
+- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+- grep IS_64BIT_ARCH >/dev/null
+- then
+- UNAME_PROCESSOR="x86_64"
+- fi
+- fi ;;
+- unknown) UNAME_PROCESSOR=powerpc ;;
+- esac
++ eval $set_cc_for_build
++ if test "$UNAME_PROCESSOR" = unknown ; then
++ UNAME_PROCESSOR=powerpc
++ fi
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ case $UNAME_PROCESSOR in
++ i386) UNAME_PROCESSOR=x86_64 ;;
++ powerpc) UNAME_PROCESSOR=powerpc64 ;;
++ esac
++ fi
++ fi
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+@@ -1256,7 +1287,7 @@ EOF
+ NEO-?:NONSTOP_KERNEL:*:*)
+ echo neo-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+- NSE-?:NONSTOP_KERNEL:*:*)
++ NSE-*:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
+@@ -1330,9 +1361,6 @@ EOF
+ exit ;;
+ esac
+
+-#echo '(No uname command or uname output not recognized.)' 1>&2
+-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+-
+ eval $set_cc_for_build
+ cat >$dummy.c < conftest.$ac_ext
+@@ -1326,7 +1326,10 @@
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+- ppc64-*linux*|powerpc64-*linux*)
++ powerpc64le-*linux*)
++ LD="${LD-ld} -m elf32lppclinux"
++ ;;
++ powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -1345,7 +1348,10 @@
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- ppc*-*linux*|powerpc*-*linux*)
++ powerpcle-*linux*)
++ LD="${LD-ld} -m elf64lppc"
++ ;;
++ powerpc-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
diff --git a/SOURCES/fastjar-0.97-aarch64-config.patch b/SOURCES/fastjar-0.97-aarch64-config.patch
new file mode 100644
index 0000000..d340abc
--- /dev/null
+++ b/SOURCES/fastjar-0.97-aarch64-config.patch
@@ -0,0 +1,1536 @@
+--- fastjar-0.97/config.guess
++++ fastjar-0.97/config.guess
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+-# Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++# 2011, 2012 Free Software Foundation, Inc.
+
+-timestamp='2008-01-23'
++timestamp='2012-06-10'
+
+ # 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
+@@ -17,9 +17,7 @@ timestamp='2008-01-23'
+ # 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.
++# along with this program; if not, see .
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -27,16 +25,16 @@ timestamp='2008-01-23'
+ # the same distribution terms that you use for the rest of that program.
+
+
+-# Originally written by Per Bothner .
+-# Please send patches to . Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner. Please send patches (context
++# diff format) to and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -56,8 +54,9 @@ version="\
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+@@ -170,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+- | grep __ELF__ >/dev/null
++ | grep -q __ELF__
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ fi
+ ;;
+ *)
+- os=netbsd
++ os=netbsd
+ ;;
+ esac
+ # The OS release
+@@ -223,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ ;;
+ *5.*)
+- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+@@ -269,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+- exit ;;
++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++ exitcode=$?
++ trap '' 0
++ exit $exitcode ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+@@ -295,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ echo s390-ibm-zvmoe
+ exit ;;
+ *:OS400:*:*)
+- echo powerpc-ibm-os400
++ echo powerpc-ibm-os400
+ exit ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+@@ -324,14 +326,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
++ s390x:SunOS:*:*)
++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ exit ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++ echo i386-pc-auroraux${UNAME_RELEASE}
++ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ eval $set_cc_for_build
++ SUN_ARCH="i386"
++ # If there is a compiler, see if it is configured for 64-bit objects.
++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++ # This test works for both compilers.
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ SUN_ARCH="x86_64"
++ fi
++ fi
++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+@@ -375,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+- echo m68k-atari-mint${UNAME_RELEASE}
++ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+- exit ;;
++ exit ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+- echo m68k-atari-mint${UNAME_RELEASE}
++ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+- echo m68k-milan-mint${UNAME_RELEASE}
+- exit ;;
++ echo m68k-milan-mint${UNAME_RELEASE}
++ exit ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+- echo m68k-hades-mint${UNAME_RELEASE}
+- exit ;;
++ echo m68k-hades-mint${UNAME_RELEASE}
++ exit ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+- echo m68k-unknown-mint${UNAME_RELEASE}
+- exit ;;
++ echo m68k-unknown-mint${UNAME_RELEASE}
++ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit ;;
+@@ -461,8 +482,8 @@ EOF
+ echo m88k-motorola-sysv3
+ exit ;;
+ AViiON:dgux:*:*)
+- # DG/UX returns AViiON for all architectures
+- UNAME_PROCESSOR=`/usr/bin/uname -p`
++ # DG/UX returns AViiON for all architectures
++ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+@@ -475,7 +496,7 @@ EOF
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+- exit ;;
++ exit ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit ;;
+@@ -532,7 +553,7 @@ EOF
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[456])
++ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -575,52 +596,52 @@ EOF
+ 9000/[678][0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+- case "${sc_cpu_version}" in
+- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+- 532) # CPU_PA_RISC2_0
+- case "${sc_kernel_bits}" in
+- 32) HP_ARCH="hppa2.0n" ;;
+- 64) HP_ARCH="hppa2.0w" ;;
++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++ case "${sc_cpu_version}" in
++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++ 532) # CPU_PA_RISC2_0
++ case "${sc_kernel_bits}" in
++ 32) HP_ARCH="hppa2.0n" ;;
++ 64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+- esac ;;
+- esac
++ esac ;;
++ esac
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
++ sed 's/^ //' << EOF >$dummy.c
+
+- #define _HPUX_SOURCE
+- #include
+- #include
++ #define _HPUX_SOURCE
++ #include
++ #include
+
+- int main ()
+- {
+- #if defined(_SC_KERNEL_BITS)
+- long bits = sysconf(_SC_KERNEL_BITS);
+- #endif
+- long cpu = sysconf (_SC_CPU_VERSION);
++ int main ()
++ {
++ #if defined(_SC_KERNEL_BITS)
++ long bits = sysconf(_SC_KERNEL_BITS);
++ #endif
++ long cpu = sysconf (_SC_CPU_VERSION);
+
+- switch (cpu)
+- {
+- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+- case CPU_PA_RISC2_0:
+- #if defined(_SC_KERNEL_BITS)
+- switch (bits)
+- {
+- case 64: puts ("hppa2.0w"); break;
+- case 32: puts ("hppa2.0n"); break;
+- default: puts ("hppa2.0"); break;
+- } break;
+- #else /* !defined(_SC_KERNEL_BITS) */
+- puts ("hppa2.0"); break;
+- #endif
+- default: puts ("hppa1.0"); break;
+- }
+- exit (0);
+- }
++ switch (cpu)
++ {
++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++ case CPU_PA_RISC2_0:
++ #if defined(_SC_KERNEL_BITS)
++ switch (bits)
++ {
++ case 64: puts ("hppa2.0w"); break;
++ case 32: puts ("hppa2.0n"); break;
++ default: puts ("hppa2.0"); break;
++ } break;
++ #else /* !defined(_SC_KERNEL_BITS) */
++ puts ("hppa2.0"); break;
++ #endif
++ default: puts ("hppa1.0"); break;
++ }
++ exit (0);
++ }
+ EOF
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+@@ -640,7 +661,7 @@ EOF
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+- grep __LP64__ >/dev/null
++ grep -q __LP64__
+ then
+ HP_ARCH="hppa2.0w"
+ else
+@@ -711,22 +732,22 @@ EOF
+ exit ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+- exit ;;
++ exit ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+- exit ;;
++ exit ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+- exit ;;
++ exit ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+- exit ;;
++ exit ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+- exit ;;
++ exit ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+@@ -750,14 +771,14 @@ EOF
+ exit ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+- exit ;;
++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+@@ -769,13 +790,12 @@ EOF
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:FreeBSD:*:*)
+- case ${UNAME_MACHINE} in
+- pc98)
+- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ UNAME_PROCESSOR=`/usr/bin/uname -p`
++ case ${UNAME_PROCESSOR} in
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
+ i*:CYGWIN*:*)
+@@ -784,19 +804,22 @@ EOF
+ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
++ i*:MSYS*:*)
++ echo ${UNAME_MACHINE}-pc-msys
++ exit ;;
+ i*:windows32*:*)
+- # uname -m includes "-pc" on this system.
+- echo ${UNAME_MACHINE}-mingw32
++ # uname -m includes "-pc" on this system.
++ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- *:Interix*:[3456]*)
+- case ${UNAME_MACHINE} in
++ *:Interix*:*)
++ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd)
++ authenticamd | genuineintel | EM64T)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -806,6 +829,9 @@ EOF
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
++ 8664:Windows_NT:*)
++ echo x86_64-pc-mks
++ exit ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+@@ -835,6 +861,27 @@ EOF
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
++ aarch64:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ aarch64_be:Linux:*:*)
++ UNAME_MACHINE=aarch64_be
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++ EV56) UNAME_MACHINE=alphaev56 ;;
++ PCA56) UNAME_MACHINE=alphapca56 ;;
++ PCA57) UNAME_MACHINE=alphapca56 ;;
++ EV6) UNAME_MACHINE=alphaev6 ;;
++ EV67) UNAME_MACHINE=alphaev67 ;;
++ EV68*) UNAME_MACHINE=alphaev68 ;;
++ esac
++ objdump --private-headers /bin/sh | grep -q ld.so.1
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -842,20 +889,40 @@ EOF
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++ | grep -q __ARM_PCS_VFP
++ then
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ else
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++ fi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ cris:Linux:*:*)
+- echo cris-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-gnu
+ exit ;;
+ crisv32:Linux:*:*)
+- echo crisv32-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+- echo frv-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ hexagon:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ i*86:Linux:*:*)
++ LIBC=gnu
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #ifdef __dietlibc__
++ LIBC=dietlibc
++ #endif
++EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -866,74 +933,33 @@ EOF
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+- mips:Linux:*:*)
++ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+- #undef mips
+- #undef mipsel
++ #undef ${UNAME_MACHINE}
++ #undef ${UNAME_MACHINE}el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- CPU=mipsel
++ CPU=${UNAME_MACHINE}el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- CPU=mips
++ CPU=${UNAME_MACHINE}
+ #else
+ CPU=
+ #endif
+ #endif
+ EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+- ;;
+- mips64:Linux:*:*)
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #undef CPU
+- #undef mips64
+- #undef mips64el
+- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- CPU=mips64el
+- #else
+- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- CPU=mips64
+- #else
+- CPU=
+- #endif
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+- echo or32-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+- ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
++ padre:Linux:*:*)
++ echo sparc-unknown-linux-gnu
+ exit ;;
+- ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
+- exit ;;
+- alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+- EV5) UNAME_MACHINE=alphaev5 ;;
+- EV56) UNAME_MACHINE=alphaev56 ;;
+- PCA56) UNAME_MACHINE=alphapca56 ;;
+- PCA57) UNAME_MACHINE=alphapca56 ;;
+- EV6) UNAME_MACHINE=alphaev6 ;;
+- EV67) UNAME_MACHINE=alphaev67 ;;
+- EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
+- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++ echo hppa64-unknown-linux-gnu
+ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+@@ -943,14 +969,17 @@ EOF
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-gnu
++ exit ;;
++ ppc:Linux:*:*)
++ echo powerpc-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -958,78 +987,18 @@ EOF
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
++ tile*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
+ x86_64:Linux:*:*)
+- echo x86_64-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ xtensa*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+- i*86:Linux:*:*)
+- # The BFD linker knows what the default object file format is, so
+- # first see if it will tell us. cd to the root directory to prevent
+- # problems with other programs or directories called `ld' in the path.
+- # Set LC_ALL=C to ensure ld outputs messages in English.
+- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+- | sed -ne '/supported targets:/!d
+- s/[ ][ ]*/ /g
+- s/.*supported targets: *//
+- s/ .*//
+- p'`
+- case "$ld_supported_targets" in
+- elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+- ;;
+- a.out-i386-linux)
+- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+- exit ;;
+- coff-i386)
+- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+- exit ;;
+- "")
+- # Either a pre-BFD a.out linker (linux-gnuoldld) or
+- # one that does not give us useful --help.
+- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+- exit ;;
+- esac
+- # Determine whether the default compiler is a.out or elf
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #include
+- #ifdef __ELF__
+- # ifdef __GLIBC__
+- # if __GLIBC__ >= 2
+- LIBC=gnu
+- # else
+- LIBC=gnulibc1
+- # endif
+- # else
+- LIBC=gnulibc1
+- # endif
+- #else
+- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+- LIBC=gnu
+- #else
+- LIBC=gnuaout
+- #endif
+- #endif
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^LIBC/{
+- s: ::g
+- p
+- }'`"
+- test x"${LIBC}" != x && {
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+- exit
+- }
+- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+- ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+@@ -1037,11 +1006,11 @@ EOF
+ echo i386-sequent-sysv4
+ exit ;;
+ i*86:UNIX_SV:4.2MP:2.*)
+- # Unixware is an offshoot of SVR4, but it has its own version
+- # number series starting with 2...
+- # I am not positive that other SVR4 systems won't match this,
++ # Unixware is an offshoot of SVR4, but it has its own version
++ # number series starting with 2...
++ # I am not positive that other SVR4 systems won't match this,
+ # I just have to hope. -- rms.
+- # Use sysv4.2uw... so that sysv4* matches it.
++ # Use sysv4.2uw... so that sysv4* matches it.
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ exit ;;
+ i*86:OS/2:*:*)
+@@ -1058,7 +1027,7 @@ EOF
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
+- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ i*86:*DOS:*:*)
+@@ -1073,7 +1042,7 @@ EOF
+ fi
+ exit ;;
+ i*86:*:5:[678]*)
+- # UnixWare 7.x, OpenUNIX and OpenServer 6.
++ # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+@@ -1101,10 +1070,13 @@ EOF
+ exit ;;
+ pc:*:*:*)
+ # Left here for compatibility:
+- # uname -m prints for DJGPP always 'pc', but it prints nothing about
+- # the processor, so we play safe by assuming i386.
+- echo i386-pc-msdosdjgpp
+- exit ;;
++ # uname -m prints for DJGPP always 'pc', but it prints nothing about
++ # the processor, so we play safe by assuming i586.
++ # Note: whatever this is, it MUST be the same as what config.sub
++ # prints for the "djgpp" host, or else GDB configury will decide that
++ # this is a cross-build.
++ echo i586-pc-msdosdjgpp
++ exit ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+ exit ;;
+@@ -1139,8 +1111,18 @@ EOF
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+- && { echo i486-ncr-sysv4; exit; } ;;
++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++ && { echo i486-ncr-sysv4; exit; } ;;
++ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++ OS_REL='.3'
++ test -r /etc/.relid \
++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+@@ -1153,7 +1135,7 @@ EOF
+ rs6000:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ SM[BE]S:UNIX_SV:*:*)
+@@ -1173,10 +1155,10 @@ EOF
+ echo ns32k-sni-sysv
+ fi
+ exit ;;
+- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+- # says
+- echo i586-unisys-sysv4
+- exit ;;
++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++ # says
++ echo i586-unisys-sysv4
++ exit ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes .
+ # How about differentiating between stratus architectures? -djm
+@@ -1202,11 +1184,11 @@ EOF
+ exit ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+- echo mips-nec-sysv${UNAME_RELEASE}
++ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+- echo mips-unknown-sysv${UNAME_RELEASE}
++ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+- exit ;;
++ exit ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+ exit ;;
+@@ -1216,6 +1198,9 @@ EOF
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit ;;
++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
++ echo i586-pc-haiku
++ exit ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit ;;
+@@ -1243,6 +1228,16 @@ EOF
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
++ i386)
++ eval $set_cc_for_build
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ UNAME_PROCESSOR="x86_64"
++ fi
++ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+@@ -1258,7 +1253,10 @@ EOF
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit ;;
+- NSE-?:NONSTOP_KERNEL:*:*)
++ NEO-?:NONSTOP_KERNEL:*:*)
++ echo neo-tandem-nsk${UNAME_RELEASE}
++ exit ;;
++ NSE-*:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
+@@ -1303,13 +1301,13 @@ EOF
+ echo pdp10-unknown-its
+ exit ;;
+ SEI:*:*:SEIUX)
+- echo mips-sei-seiux${UNAME_RELEASE}
++ echo mips-sei-seiux${UNAME_RELEASE}
+ exit ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit ;;
+ *:*VMS:*:*)
+- UNAME_MACHINE=`(uname -p) 2>/dev/null`
++ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+@@ -1324,6 +1322,12 @@ EOF
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
++ i*86:AROS:*:*)
++ echo ${UNAME_MACHINE}-pc-aros
++ exit ;;
++ x86_64:VMkernel:*:*)
++ echo ${UNAME_MACHINE}-unknown-esx
++ exit ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1346,11 +1350,11 @@ main ()
+ #include
+ printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+- "4"
++ "4"
+ #else
+- ""
++ ""
+ #endif
+- ); exit (0);
++ ); exit (0);
+ #endif
+ #endif
+
+--- fastjar-0.97/config.sub
++++ fastjar-0.97/config.sub
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+-# Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++# 2011, 2012 Free Software Foundation, Inc.
+
+-timestamp='2008-01-16'
++timestamp='2012-04-18'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -21,9 +21,7 @@ timestamp='2008-01-16'
+ # 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.
++# along with this program; if not, see .
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -32,13 +30,16 @@ timestamp='2008-01-16'
+
+
+ # Please send patches to . Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,8 +73,9 @@ Report bugs and patches to ."
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -120,12 +122,18 @@ esac
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++ knetbsd*-gnu* | netbsd*-gnu* | \
++ kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
++ android-linux)
++ os=-linux-android
++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+@@ -148,10 +156,13 @@ case $os in
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+- -apple | -axis | -knuth | -cray)
++ -apple | -axis | -knuth | -cray | -microblaze)
+ os=
+ basic_machine=$1
+ ;;
++ -bluegene*)
++ os=-cnk
++ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+@@ -166,10 +177,10 @@ case $os in
+ os=-chorusos
+ basic_machine=$1
+ ;;
+- -chorusrdb)
+- os=-chorusrdb
++ -chorusrdb)
++ os=-chorusrdb
+ basic_machine=$1
+- ;;
++ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+@@ -214,6 +225,12 @@ case $os in
+ -isc*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
++ -lynx*178)
++ os=-lynxos178
++ ;;
++ -lynx*5)
++ os=-lynxos5
++ ;;
+ -lynx*)
+ os=-lynxos
+ ;;
+@@ -238,24 +255,32 @@ case $basic_machine in
+ # Some are omitted here because they have special meanings below.
+ 1750a | 580 \
+ | a29k \
++ | aarch64 | aarch64_be \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | be32 | be64 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
++ | epiphany \
+ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++ | hexagon \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
++ | le32 | le64 \
++ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+- | maxq | mb | microblaze | mcore | mep \
++ | maxq | mb | microblaze | mcore | mep | metag \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+- | mips64vr | mips64vrel \
++ | mips64octeon | mips64octeonel \
+ | mips64orion | mips64orionel \
++ | mips64r5900 | mips64r5900el \
++ | mips64vr | mips64vrel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+@@ -268,29 +293,42 @@ case $basic_machine in
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
++ | moxie \
+ | mt \
+ | msp430 \
++ | nds32 | nds32le | nds32be \
+ | nios | nios2 \
+ | ns16k | ns32k \
++ | open8 \
+ | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++ | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pyramid \
++ | rl78 | rx \
+ | score \
+- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+- | spu | strongarm \
+- | tahoe | thumb | tic4x | tic80 | tron \
+- | v850 | v850e \
++ | spu \
++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
++ | ubicom32 \
++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ | we32k \
+- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+- | z8k)
++ | x86 | xc16x | xstormy16 | xtensa \
++ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12)
+- # Motorola 68HC11/12.
++ c54x)
++ basic_machine=tic54x-unknown
++ ;;
++ c55x)
++ basic_machine=tic55x-unknown
++ ;;
++ c6x)
++ basic_machine=tic6x-unknown
++ ;;
++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+@@ -300,6 +338,21 @@ case $basic_machine in
+ basic_machine=mt-unknown
+ ;;
+
++ strongarm | thumb | xscale)
++ basic_machine=arm-unknown
++ ;;
++ xgate)
++ basic_machine=$basic_machine-unknown
++ os=-none
++ ;;
++ xscaleeb)
++ basic_machine=armeb-unknown
++ ;;
++
++ xscaleel)
++ basic_machine=armel-unknown
++ ;;
++
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+@@ -314,29 +367,36 @@ case $basic_machine in
+ # Recognize the basic CPU types with company name.
+ 580-* \
+ | a29k-* \
++ | aarch64-* | aarch64_be-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
++ | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++ | hexagon-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
++ | le32-* | le64-* \
++ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+- | mips64vr-* | mips64vrel-* \
++ | mips64octeon-* | mips64octeonel-* \
+ | mips64orion-* | mips64orionel-* \
++ | mips64r5900-* | mips64r5900el-* \
++ | mips64vr-* | mips64vrel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+@@ -351,27 +411,32 @@ case $basic_machine in
+ | mmix-* \
+ | mt-* \
+ | msp430-* \
++ | nds32-* | nds32le-* | nds32be-* \
+ | nios-* | nios2-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
++ | open8-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pyramid-* \
+- | romp-* | rs6000-* \
+- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++ | rl78-* | romp-* | rs6000-* | rx-* \
++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+- | tahoe-* | thumb-* \
++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile*-* \
+ | tron-* \
+- | v850-* | v850e-* | vax-* \
++ | ubicom32-* \
++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++ | vax-* \
+ | we32k-* \
+- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
++ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+- | z8k-*)
++ | z8k-* | z80-*)
+ ;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+@@ -393,7 +458,7 @@ case $basic_machine in
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+- abacus)
++ abacus)
+ basic_machine=abacus-unknown
+ ;;
+ adobe68k)
+@@ -439,6 +504,10 @@ case $basic_machine in
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
++ aros)
++ basic_machine=i386-pc
++ os=-aros
++ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+@@ -455,10 +524,27 @@ case $basic_machine in
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
++ bluegene*)
++ basic_machine=powerpc-ibm
++ os=-cnk
++ ;;
++ c54x-*)
++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
++ c55x-*)
++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
++ c6x-*)
++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
++ cegcc)
++ basic_machine=arm-unknown
++ os=-cegcc
++ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+@@ -487,7 +573,7 @@ case $basic_machine in
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+- cr16)
++ cr16 | cr16-*)
+ basic_machine=cr16-unknown
+ os=-elf
+ ;;
+@@ -526,6 +612,10 @@ case $basic_machine in
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
++ dicos)
++ basic_machine=i686-pc
++ os=-dicos
++ ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+@@ -641,7 +731,6 @@ case $basic_machine in
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
+-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i*86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+@@ -699,6 +788,9 @@ case $basic_machine in
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
++ microblaze)
++ basic_machine=microblaze-xilinx
++ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+@@ -735,10 +827,18 @@ case $basic_machine in
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
++ msys)
++ basic_machine=i386-pc
++ os=-msys
++ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
++ nacl)
++ basic_machine=le32-unknown
++ os=-nacl
++ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+@@ -803,6 +903,12 @@ case $basic_machine in
+ np1)
+ basic_machine=np1-gould
+ ;;
++ neo-tandem)
++ basic_machine=neo-tandem
++ ;;
++ nse-tandem)
++ basic_machine=nse-tandem
++ ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+@@ -885,9 +991,10 @@ case $basic_machine in
+ ;;
+ power) basic_machine=power-ibm
+ ;;
+- ppc) basic_machine=powerpc-unknown
++ ppc | ppcbe) basic_machine=powerpc-unknown
+ ;;
+- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ppc-* | ppcbe-*)
++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+@@ -981,6 +1088,9 @@ case $basic_machine in
+ basic_machine=i860-stratus
+ os=-sysv4
+ ;;
++ strongarm-* | thumb-*)
++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
+ sun2)
+ basic_machine=m68000-sun
+ ;;
+@@ -1037,20 +1147,8 @@ case $basic_machine in
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
+- tic54x | c54x*)
+- basic_machine=tic54x-unknown
+- os=-coff
+- ;;
+- tic55x | c55x*)
+- basic_machine=tic55x-unknown
+- os=-coff
+- ;;
+- tic6x | c6x*)
+- basic_machine=tic6x-unknown
+- os=-coff
+- ;;
+ tile*)
+- basic_machine=tile-unknown
++ basic_machine=$basic_machine-unknown
+ os=-linux-gnu
+ ;;
+ tx39)
+@@ -1120,6 +1218,9 @@ case $basic_machine in
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
++ xscale-* | xscalee[bl]-*)
++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++ ;;
+ ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+@@ -1128,6 +1229,10 @@ case $basic_machine in
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
++ z80-*-coff)
++ basic_machine=z80-unknown
++ os=-sim
++ ;;
+ none)
+ basic_machine=none-none
+ os=-none
+@@ -1166,7 +1271,7 @@ case $basic_machine in
+ we32k)
+ basic_machine=we32k-att
+ ;;
+- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
+ ;;
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+@@ -1213,9 +1318,12 @@ esac
+ if [ x"$os" != x"" ]
+ then
+ case $os in
+- # First match some system type aliases
+- # that might get confused with valid system types.
++ # First match some system type aliases
++ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
++ -auroraux)
++ os=-auroraux
++ ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+@@ -1236,10 +1344,11 @@ case $os in
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++ | -sym* | -kopensolaris* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+- | -aos* \
++ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+@@ -1248,9 +1357,10 @@ case $os in
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+- | -chorusos* | -chorusrdb* \
+- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++ | -chorusos* | -chorusrdb* | -cegcc* \
++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++ | -mingw32* | -linux-gnu* | -linux-android* \
++ | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+@@ -1258,7 +1368,7 @@ case $os in
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1297,7 +1407,7 @@ case $os in
+ -opened*)
+ os=-openedition
+ ;;
+- -os400*)
++ -os400*)
+ os=-os400
+ ;;
+ -wince*)
+@@ -1346,7 +1456,7 @@ case $os in
+ -sinix*)
+ os=-sysv4
+ ;;
+- -tpf*)
++ -tpf*)
+ os=-tpf
+ ;;
+ -triton*)
+@@ -1388,6 +1498,11 @@ case $os in
+ -zvmoe)
+ os=-zvmoe
+ ;;
++ -dicos*)
++ os=-dicos
++ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+@@ -1410,10 +1525,10 @@ else
+ # system, and we'll never get to this point.
+
+ case $basic_machine in
+- score-*)
++ score-*)
+ os=-elf
+ ;;
+- spu-*)
++ spu-*)
+ os=-elf
+ ;;
+ *-acorn)
+@@ -1425,8 +1540,20 @@ case $basic_machine in
+ arm*-semi)
+ os=-aout
+ ;;
+- c4x-* | tic4x-*)
+- os=-coff
++ c4x-* | tic4x-*)
++ os=-coff
++ ;;
++ hexagon-*)
++ os=-elf
++ ;;
++ tic54x-*)
++ os=-coff
++ ;;
++ tic55x-*)
++ os=-coff
++ ;;
++ tic6x-*)
++ os=-coff
+ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+@@ -1446,14 +1573,11 @@ case $basic_machine in
+ ;;
+ m68000-sun)
+ os=-sunos3
+- # This also exists in the configure program, but was not the
+- # default.
+- # os=-sunos4
+ ;;
+ m68*-cisco)
+ os=-aout
+ ;;
+- mep-*)
++ mep-*)
+ os=-elf
+ ;;
+ mips*-cisco)
+@@ -1480,7 +1604,7 @@ case $basic_machine in
+ *-ibm)
+ os=-aix
+ ;;
+- *-knuth)
++ *-knuth)
+ os=-mmixware
+ ;;
+ *-wec)
+@@ -1585,7 +1709,7 @@ case $basic_machine in
+ -sunos*)
+ vendor=sun
+ ;;
+- -aix*)
++ -cnk*|-aix*)
+ vendor=ibm
+ ;;
+ -beos*)
diff --git a/SOURCES/fastjar-0.97-filename0.patch b/SOURCES/fastjar-0.97-filename0.patch
new file mode 100644
index 0000000..34a02a7
--- /dev/null
+++ b/SOURCES/fastjar-0.97-filename0.patch
@@ -0,0 +1,14 @@
+2010-03-01 Richard Guenther
+
+ * jartool.c (read_entries): Properly zero-terminate filename.
+
+--- fastjar-0.97/jartool.c 6 Sep 2009 22:16:00 -0000 1.59
++++ fastjar-0.97/jartool.c 1 Mar 2010 15:38:43 -0000 1.60
+@@ -790,6 +790,7 @@ int read_entries (int fd)
+ progname, jarfile);
+ return 1;
+ }
++ ze->filename[len] = '\0';
+ len = UNPACK_UB4(header, CEN_EFLEN);
+ len += UNPACK_UB4(header, CEN_COMLEN);
+ if (lseek (fd, len, SEEK_CUR) == -1)
diff --git a/SOURCES/fastjar-0.97-len1.patch b/SOURCES/fastjar-0.97-len1.patch
new file mode 100644
index 0000000..722351d
--- /dev/null
+++ b/SOURCES/fastjar-0.97-len1.patch
@@ -0,0 +1,16 @@
+2009-12-21 Chris Ball
+
+ * jartool.c (add_file_to_jar): Test write return value against -1
+ instead of 1.
+
+--- fastjar-0.97/jartool.c.jj 2008-10-15 12:35:37.000000000 -0400
++++ fastjar-0.97/jartool.c 2009-12-22 06:48:09.309530000 -0500
+@@ -1257,7 +1257,7 @@ int add_file_to_jar(int jfd, int ffd, co
+ exit_on_error("write");
+
+ /* write the file name to the zip file */
+- if (1 == write(jfd, fname, file_name_length))
++ if (-1 == write(jfd, fname, file_name_length))
+ exit_on_error("write");
+
+ if(verbose){
diff --git a/SOURCES/fastjar-0.97-ppc64le-config.patch b/SOURCES/fastjar-0.97-ppc64le-config.patch
new file mode 100644
index 0000000..5671561
--- /dev/null
+++ b/SOURCES/fastjar-0.97-ppc64le-config.patch
@@ -0,0 +1,708 @@
+--- fastjar-0.97/m4/libtool.m4.jj 2008-10-16 10:14:54.000000000 +0200
++++ fastjar-0.97/m4/libtool.m4 2014-04-10 20:41:26.563064023 +0200
+@@ -1263,7 +1263,7 @@ ia64-*-hpux*)
+ rm -rf conftest*
+ ;;
+
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+@@ -1277,7 +1277,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+- ppc64-*linux*|powerpc64-*linux*)
++ powerpc64le-*linux*)
++ LD="${LD-ld} -m elf32lppclinux"
++ ;;
++ powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -1296,7 +1299,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- ppc*-*linux*|powerpc*-*linux*)
++ powerpcle-*linux*)
++ LD="${LD-ld} -m elf64lppc"
++ ;;
++ powerpc-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+--- fastjar-0.97/config.sub.jj 2014-04-10 20:40:53.000000000 +0200
++++ fastjar-0.97/config.sub 2014-04-10 10:38:39.000000000 +0200
+@@ -1,24 +1,18 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-# 2011, 2012 Free Software Foundation, Inc.
+-
+-timestamp='2012-04-18'
+-
+-# This file is (in principle) common to ALL GNU software.
+-# The presence of a machine in this file suggests that SOME GNU software
+-# can handle that machine. It does not imply ALL GNU software can.
+-#
+-# 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 2 of the License, or
++# Copyright 1992-2013 Free Software Foundation, Inc.
++
++timestamp='2013-10-01'
++
++# 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 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.
++# 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, see .
+@@ -26,11 +20,12 @@ timestamp='2012-04-18'
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
++# the same distribution terms that you use for the rest of that
++# program. This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
+
+
+-# Please send patches to . Submit a context
+-# diff and a properly formatted GNU ChangeLog entry.
++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+@@ -73,9 +68,7 @@ Report bugs and patches to and include a ChangeLog
+-# entry.
++# the same distribution terms that you use for the rest of that
++# program. This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# This script attempts to guess a canonical system name similar to
+-# config.sub. If it succeeds, it prints the system name on stdout, and
+-# exits with 0. Otherwise, it exits with 1.
++# Originally written by Per Bothner.
+ #
+ # You can get the latest version of this script from:
+ # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++#
++# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -54,9 +50,7 @@ version="\
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+-Free Software Foundation, Inc.
++Copyright 1992-2013 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
++case "${UNAME_SYSTEM}" in
++Linux|GNU|GNU/*)
++ # If the system lacks a compiler, then just pick glibc.
++ # We could probably try harder.
++ LIBC=gnu
++
++ eval $set_cc_for_build
++ cat <<-EOF > $dummy.c
++ #include
++ #if defined(__UCLIBC__)
++ LIBC=uclibc
++ #elif defined(__dietlibc__)
++ LIBC=dietlibc
++ #else
++ LIBC=gnu
++ #endif
++ EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ ;;
++esac
++
+ # Note: order is significant - the case branches are not exclusive.
+
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit ;;
++ *:Bitrig:*:*)
++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++ exit ;;
+ *:OpenBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit ;;
+- arm:riscos:*:*|arm:RISCOS:*:*)
++ arm*:riscos:*:*|arm*:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+@@ -801,6 +820,9 @@ EOF
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
++ *:MINGW64*:*)
++ echo ${UNAME_MACHINE}-pc-mingw64
++ exit ;;
+ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+@@ -852,21 +874,21 @@ EOF
+ exit ;;
+ *:GNU:*:*)
+ # the GNU system
+- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ exit ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
+ aarch64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -879,59 +901,54 @@ EOF
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
++ arc:Linux:*:* | arceb:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ else
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+ else
+- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+ fi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ cris:Linux:*:*)
+- echo ${UNAME_MACHINE}-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ exit ;;
+ crisv32:Linux:*:*)
+- echo ${UNAME_MACHINE}-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ exit ;;
+ frv:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ hexagon:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ i*86:Linux:*:*)
+- LIBC=gnu
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ exit ;;
+ ia64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ m32r*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ m68*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+@@ -950,54 +967,63 @@ EOF
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ ;;
++ or1k:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++ exit ;;
+ or32:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ padre:Linux:*:*)
+- echo sparc-unknown-linux-gnu
++ echo sparc-unknown-linux-${LIBC}
+ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
++ echo hppa64-unknown-linux-${LIBC}
+ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+- PA7*) echo hppa1.1-unknown-linux-gnu ;;
+- PA8*) echo hppa2.0-unknown-linux-gnu ;;
+- *) echo hppa-unknown-linux-gnu ;;
++ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
++ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
++ *) echo hppa-unknown-linux-${LIBC} ;;
+ esac
+ exit ;;
+ ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
++ echo powerpc64-unknown-linux-${LIBC}
+ exit ;;
+ ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
++ echo powerpc-unknown-linux-${LIBC}
++ exit ;;
++ ppc64le:Linux:*:*)
++ echo powerpc64le-unknown-linux-${LIBC}
++ exit ;;
++ ppcle:Linux:*:*)
++ echo powerpcle-unknown-linux-${LIBC}
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+- echo ${UNAME_MACHINE}-ibm-linux
++ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ exit ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ sh*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ tile*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ vax:Linux:*:*)
+- echo ${UNAME_MACHINE}-dec-linux-gnu
++ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ exit ;;
+ x86_64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ xtensa*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -1201,6 +1227,9 @@ EOF
+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+ echo i586-pc-haiku
+ exit ;;
++ x86_64:Haiku:*:*)
++ echo x86_64-unknown-haiku
++ exit ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit ;;
+@@ -1227,19 +1256,21 @@ EOF
+ exit ;;
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+- case $UNAME_PROCESSOR in
+- i386)
+- eval $set_cc_for_build
+- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+- grep IS_64BIT_ARCH >/dev/null
+- then
+- UNAME_PROCESSOR="x86_64"
+- fi
+- fi ;;
+- unknown) UNAME_PROCESSOR=powerpc ;;
+- esac
++ eval $set_cc_for_build
++ if test "$UNAME_PROCESSOR" = unknown ; then
++ UNAME_PROCESSOR=powerpc
++ fi
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ case $UNAME_PROCESSOR in
++ i386) UNAME_PROCESSOR=x86_64 ;;
++ powerpc) UNAME_PROCESSOR=powerpc64 ;;
++ esac
++ fi
++ fi
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+@@ -1330,9 +1361,6 @@ EOF
+ exit ;;
+ esac
+
+-#echo '(No uname command or uname output not recognized.)' 1>&2
+-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+-
+ eval $set_cc_for_build
+ cat >$dummy.c < conftest.$ac_ext
+@@ -6936,7 +6936,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+- ppc64-*linux*|powerpc64-*linux*)
++ powerpc64le-*linux*)
++ LD="${LD-ld} -m elf32lppclinux"
++ ;;
++ powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -6955,7 +6958,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- ppc*-*linux*|powerpc*-*linux*)
++ powerpcle-*linux*)
++ LD="${LD-ld} -m elf64lppc"
++ ;;
++ powerpc-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
diff --git a/SOURCES/fastjar-0.97-segfault.patch b/SOURCES/fastjar-0.97-segfault.patch
new file mode 100644
index 0000000..ab62624
--- /dev/null
+++ b/SOURCES/fastjar-0.97-segfault.patch
@@ -0,0 +1,29 @@
+2009-01-14 Jakub Jelinek
+
+ * jartool.c (make_manifest): Initialize current_time before
+ calling unix2dostime on it.
+
+--- fastjar-0.97/jartool.c.jj 2008-10-15 18:35:37.000000000 +0200
++++ fastjar-0.97/jartool.c 2009-01-14 15:40:50.000000000 +0100
+@@ -820,6 +820,10 @@ int make_manifest(int jfd, const char *m
+ int mod_time; /* file modification time */
+ struct zipentry *ze;
+
++ current_time = time(NULL);
++ if(current_time == (time_t)-1)
++ exit_on_error("time");
++
+ mod_time = unix2dostime(¤t_time);
+
+ /* If we are creating a new manifest, create a META-INF directory entry */
+@@ -828,10 +832,6 @@ int make_manifest(int jfd, const char *m
+
+ memset((file_header + 12), '\0', 16); /*clear mod time, crc, size fields*/
+
+- current_time = time(NULL);
+- if(current_time == (time_t)-1)
+- exit_on_error("time");
+-
+ PACK_UB2(file_header, LOC_EXTRA, 0);
+ PACK_UB2(file_header, LOC_COMP, 0);
+ PACK_UB2(file_header, LOC_FNLEN, nlen);
diff --git a/SOURCES/fastjar-CVE-2010-0831.patch b/SOURCES/fastjar-CVE-2010-0831.patch
new file mode 100644
index 0000000..2c6e23c
--- /dev/null
+++ b/SOURCES/fastjar-CVE-2010-0831.patch
@@ -0,0 +1,102 @@
+2010-06-10 Jakub Jelinek
+ Dan Rosenberg
+
+ * jartool.c (extract_jar): Fix up checks for traversal to parent
+ directories, disallow absolute paths, make the code slightly more
+ efficient.
+
+--- fastjar-0.97/jartool.c.jj 2009-09-07 00:10:47.000000000 +0200
++++ fastjar-0.97/jartool.c 2010-06-08 20:00:29.000000000 +0200
+@@ -1730,7 +1730,17 @@ int extract_jar(int fd, const char **fil
+ struct stat sbuf;
+ int depth = 0;
+
+- tmp_buff = malloc(sizeof(char) * strlen((const char *)filename));
++ if(*filename == '/'){
++ fprintf(stderr, "Absolute path names are not allowed.\n");
++ exit(EXIT_FAILURE);
++ }
++
++ tmp_buff = malloc(strlen((const char *)filename));
++
++ if(tmp_buff == NULL) {
++ fprintf(stderr, "Out of memory.\n");
++ exit(EXIT_FAILURE);
++ }
+
+ for(;;){
+ const ub1 *idx = (const unsigned char *)strchr((const char *)start, '/');
+@@ -1738,25 +1748,28 @@ int extract_jar(int fd, const char **fil
+ if(idx == NULL)
+ break;
+ else if(idx == start){
++ tmp_buff[idx - filename] = '/';
+ start++;
+ continue;
+ }
+- start = idx + 1;
+
+- strncpy(tmp_buff, (const char *)filename, (idx - filename));
+- tmp_buff[(idx - filename)] = '\0';
++ memcpy(tmp_buff + (start - filename), (const char *)start, (idx - start));
++ tmp_buff[idx - filename] = '\0';
+
+ #ifdef DEBUG
+ printf("checking the existance of %s\n", tmp_buff);
+ #endif
+- if(strcmp(tmp_buff, "..") == 0){
++ if(idx - start == 2 && memcmp(start, "..", 2) == 0){
+ --depth;
+ if (depth < 0){
+ fprintf(stderr, "Traversal to parent directories during unpacking!\n");
+ exit(EXIT_FAILURE);
+ }
+- } else if (strcmp(tmp_buff, ".") != 0)
++ } else if (idx - start != 1 || *start != '.')
+ ++depth;
++
++ start = idx + 1;
++
+ if(stat(tmp_buff, &sbuf) < 0){
+ if(errno != ENOENT)
+ exit_on_error("stat");
+@@ -1765,6 +1778,7 @@ int extract_jar(int fd, const char **fil
+ #ifdef DEBUG
+ printf("Directory exists\n");
+ #endif
++ tmp_buff[idx - filename] = '/';
+ continue;
+ }else {
+ fprintf(stderr, "Hmmm.. %s exists but isn't a directory!\n",
+@@ -1781,10 +1795,11 @@ int extract_jar(int fd, const char **fil
+ if(verbose && handle)
+ printf("%10s: %s/\n", "created", tmp_buff);
+
++ tmp_buff[idx - filename] = '/';
+ }
+
+ /* only a directory */
+- if(strlen((const char *)start) == 0)
++ if(*start == '\0')
+ dir = TRUE;
+
+ #ifdef DEBUG
+@@ -1792,7 +1807,7 @@ int extract_jar(int fd, const char **fil
+ #endif
+
+ /* If the entry was just a directory, don't write to file, etc */
+- if(strlen((const char *)start) == 0)
++ if(*start == '\0')
+ f_fd = -1;
+
+ free(tmp_buff);
+@@ -1876,7 +1891,8 @@ int extract_jar(int fd, const char **fil
+ exit(EXIT_FAILURE);
+ }
+
+- close(f_fd);
++ if (f_fd != -1)
++ close(f_fd);
+
+ if(verbose && dir == FALSE && handle)
+ printf("%10s: %s\n",
diff --git a/SOURCES/fastjar-man.patch b/SOURCES/fastjar-man.patch
new file mode 100644
index 0000000..34bf704
--- /dev/null
+++ b/SOURCES/fastjar-man.patch
@@ -0,0 +1,27 @@
+2010-03-24 Jan Kratochvil
+
+ * Makefile.am (POD2MAN): Provide --date from ChangeLog.
+ * Makefile.in: Regenerate.
+
+--- fastjar-0.97/Makefile.am.jj 2008-10-16 04:24:55.000000000 -0400
++++ fastjar-0.97/Makefile.am 2010-06-21 09:29:41.021398000 -0400
+@@ -39,7 +39,7 @@ EXTRA_DIST = \
+ texi2pod.pl
+
+ TEXI2POD = perl $(srcdir)/texi2pod.pl
+-POD2MAN = pod2man --center="GNU" --release=@VERSION@
++POD2MAN = pod2man --center="GNU" --release=@VERSION@ --date=$(shell sed -n '1s/ .*//p' <$(srcdir)/ChangeLog)
+
+ .pod.1:
+ -($(POD2MAN) --section=1 $< > $(@).T$$$$ && \
+--- fastjar-0.97/Makefile.in.jj 2008-10-16 04:15:16.000000000 -0400
++++ fastjar-0.97/Makefile.in 2010-06-21 09:30:15.882810000 -0400
+@@ -515,7 +515,7 @@ EXTRA_DIST = \
+ texi2pod.pl
+
+ TEXI2POD = perl $(srcdir)/texi2pod.pl
+-POD2MAN = pod2man --center="GNU" --release=@VERSION@
++POD2MAN = pod2man --center="GNU" --release=@VERSION@ --date=$(shell sed -n '1s/ .*//p' <$(srcdir)/ChangeLog)
+
+ #SPLINT_FLAGS=-I . -I $(srcdir)/lib -I $(srcdir) -DHAVE_CONFIG_H +posixlib +weak
+ SPLINT_FLAGS = -I . -I $(srcdir)/lib -I $(srcdir) -DHAVE_CONFIG_H -DPRIx32= -warnposix +weak
diff --git a/SOURCES/gcc48-aarch64-ada.patch b/SOURCES/gcc48-aarch64-ada.patch
new file mode 100644
index 0000000..4d2fb7d
--- /dev/null
+++ b/SOURCES/gcc48-aarch64-ada.patch
@@ -0,0 +1,96 @@
+2014-04-09 Richard Henderson
+
+ * gcc-interface/Makefile.in: Support aarch64-linux.
+ * init.c: Enable alternate stack support also on aarch64.
+ * types.h (Fat_Pointer): Remove aligned attribute.
+
+--- gcc/ada/gcc-interface/Makefile.in
++++ gcc/ada/gcc-interface/Makefile.in
+@@ -2123,6 +2123,44 @@ ifeq ($(strip $(filter-out alpha% linux%,$(arch) $(osys))),)
+ LIBRARY_VERSION := $(LIB_VERSION)
+ endif
+
++# AArch64 Linux
++ifeq ($(strip $(filter-out aarch64% linux%,$(arch) $(osys))),)
++ LIBGNAT_TARGET_PAIRS = \
++ a-exetim.adb
+
+ * common/config/aarch64/aarch64-common.c (TARGET_OPTION_INIT_STRUCT):
+ Define.
+ (aarch64_option_init_struct): New function.
+
+--- gcc/common/config/aarch64/aarch64-common.c
++++ gcc/common/config/aarch64/aarch64-common.c
+@@ -39,6 +39,9 @@
+ #undef TARGET_OPTION_OPTIMIZATION_TABLE
+ #define TARGET_OPTION_OPTIMIZATION_TABLE aarch_option_optimization_table
+
++#undef TARGET_OPTION_INIT_STRUCT
++#define TARGET_OPTION_INIT_STRUCT aarch64_option_init_struct
++
+ /* Set default optimization options. */
+ static const struct default_options aarch_option_optimization_table[] =
+ {
+@@ -47,6 +50,16 @@ static const struct default_options aarch_option_optimization_table[] =
+ { OPT_LEVELS_NONE, 0, NULL, 0 }
+ };
+
++/* Implement TARGET_OPTION_INIT_STRUCT. */
++
++static void
++aarch64_option_init_struct (struct gcc_options *opts)
++{
++ /* By default, always emit DWARF-2 unwind info. This allows debugging
++ without maintaining a stack frame back-chain. */
++ opts->x_flag_asynchronous_unwind_tables = 1;
++}
++
+ /* Implement TARGET_HANDLE_OPTION.
+ This function handles the target specific options for CPU/target selection.
+
diff --git a/SOURCES/gcc48-aarch64-unwind-opt.patch b/SOURCES/gcc48-aarch64-unwind-opt.patch
new file mode 100644
index 0000000..074cd7e
--- /dev/null
+++ b/SOURCES/gcc48-aarch64-unwind-opt.patch
@@ -0,0 +1,342 @@
+2014-08-08 Richard Henderson
+
+ * config/aarch64/aarch64.c (aarch64_save_or_restore_fprs): Add
+ cfi_ops argument, for restore put REG_CFA_RESTORE notes into
+ *cfi_ops rather than on individual insns. Cleanup.
+ (aarch64_save_or_restore_callee_save_registers): Likewise.
+ (aarch64_expand_prologue): Adjust caller.
+ (aarch64_expand_epilogue): Likewise. Cleanup. Emit queued cfi_ops
+ on the stack restore insn.
+
+--- gcc/config/aarch64/aarch64.c 2014-07-15 02:27:16.000000000 -0700
++++ gcc/config/aarch64/aarch64.c 2014-08-21 12:52:44.190455860 -0700
+@@ -1603,24 +1603,23 @@ aarch64_register_saved_on_entry (int reg
+
+ static void
+ aarch64_save_or_restore_fprs (int start_offset, int increment,
+- bool restore, rtx base_rtx)
+-
++ bool restore, rtx base_rtx, rtx *cfi_ops)
+ {
+ unsigned regno;
+ unsigned regno2;
+ rtx insn;
+ rtx (*gen_mem_ref)(enum machine_mode, rtx) = (frame_pointer_needed)? gen_frame_mem : gen_rtx_MEM;
+
+-
+ for (regno = V0_REGNUM; regno <= V31_REGNUM; regno++)
+ {
+ if (aarch64_register_saved_on_entry (regno))
+ {
+- rtx mem;
++ rtx mem, reg1;
+ mem = gen_mem_ref (DFmode,
+ plus_constant (Pmode,
+ base_rtx,
+ start_offset));
++ reg1 = gen_rtx_REG (DFmode, regno);
+
+ for (regno2 = regno + 1;
+ regno2 <= V31_REGNUM
+@@ -1632,54 +1631,51 @@ aarch64_save_or_restore_fprs (int start_
+ if (regno2 <= V31_REGNUM &&
+ aarch64_register_saved_on_entry (regno2))
+ {
+- rtx mem2;
++ rtx mem2, reg2;
+ /* Next highest register to be saved. */
+ mem2 = gen_mem_ref (DFmode,
+ plus_constant
+ (Pmode,
+ base_rtx,
+ start_offset + increment));
++ reg2 = gen_rtx_REG (DFmode, regno2);
++
+ if (restore == false)
+ {
+- insn = emit_insn
+- ( gen_store_pairdf (mem, gen_rtx_REG (DFmode, regno),
+- mem2, gen_rtx_REG (DFmode, regno2)));
+-
++ insn = emit_insn (gen_store_pairdf (mem, reg1, mem2, reg2));
++ /* The first part of a frame-related parallel insn
++ is always assumed to be relevant to the frame
++ calculations; subsequent parts, are only
++ frame-related if explicitly marked. */
++ RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 1)) = 1;
++ RTX_FRAME_RELATED_P (insn) = 1;
+ }
+ else
+ {
+- insn = emit_insn
+- ( gen_load_pairdf (gen_rtx_REG (DFmode, regno), mem,
+- gen_rtx_REG (DFmode, regno2), mem2));
+-
+- add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (DFmode, regno));
+- add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (DFmode, regno2));
++ emit_insn (gen_load_pairdf (reg1, mem, reg2, mem2));
++ *cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg1, *cfi_ops);
++ *cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg2, *cfi_ops);
+ }
+
+- /* The first part of a frame-related parallel insn
+- is always assumed to be relevant to the frame
+- calculations; subsequent parts, are only
+- frame-related if explicitly marked. */
+- RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0,
+- 1)) = 1;
+ regno = regno2;
+ start_offset += increment * 2;
+ }
+ else
+ {
+ if (restore == false)
+- insn = emit_move_insn (mem, gen_rtx_REG (DFmode, regno));
++ {
++ insn = emit_move_insn (mem, reg1);
++ RTX_FRAME_RELATED_P (insn) = 1;
++ }
+ else
+ {
+- insn = emit_move_insn (gen_rtx_REG (DFmode, regno), mem);
+- add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (DImode, regno));
++ emit_move_insn (reg1, mem);
++ *cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg1, *cfi_ops);
+ }
+ start_offset += increment;
+ }
+- RTX_FRAME_RELATED_P (insn) = 1;
+ }
+ }
+-
+ }
+
+
+@@ -1687,13 +1683,14 @@ aarch64_save_or_restore_fprs (int start_
+ restore's have to happen. */
+ static void
+ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT offset,
+- bool restore)
++ bool restore, rtx *cfi_ops)
+ {
+ rtx insn;
+ rtx base_rtx = stack_pointer_rtx;
+ HOST_WIDE_INT start_offset = offset;
+ HOST_WIDE_INT increment = UNITS_PER_WORD;
+- rtx (*gen_mem_ref)(enum machine_mode, rtx) = (frame_pointer_needed)? gen_frame_mem : gen_rtx_MEM;
++ rtx (*gen_mem_ref)(enum machine_mode, rtx)
++ = (frame_pointer_needed)? gen_frame_mem : gen_rtx_MEM;
+ unsigned limit = (frame_pointer_needed)? R28_REGNUM: R30_REGNUM;
+ unsigned regno;
+ unsigned regno2;
+@@ -1702,11 +1699,13 @@ aarch64_save_or_restore_callee_save_regi
+ {
+ if (aarch64_register_saved_on_entry (regno))
+ {
+- rtx mem;
++ rtx mem, reg1;
++
+ mem = gen_mem_ref (Pmode,
+ plus_constant (Pmode,
+ base_rtx,
+ start_offset));
++ reg1 = gen_rtx_REG (DImode, regno);
+
+ for (regno2 = regno + 1;
+ regno2 <= limit
+@@ -1718,56 +1717,54 @@ aarch64_save_or_restore_callee_save_regi
+ if (regno2 <= limit &&
+ aarch64_register_saved_on_entry (regno2))
+ {
+- rtx mem2;
++ rtx mem2, reg2;
+ /* Next highest register to be saved. */
+ mem2 = gen_mem_ref (Pmode,
+ plus_constant
+ (Pmode,
+ base_rtx,
+ start_offset + increment));
++ reg2 = gen_rtx_REG (DImode, regno2);
++
+ if (restore == false)
+ {
+- insn = emit_insn
+- ( gen_store_pairdi (mem, gen_rtx_REG (DImode, regno),
+- mem2, gen_rtx_REG (DImode, regno2)));
+-
++ insn = emit_insn (gen_store_pairdi (mem, reg1, mem2, reg2));
++ /* The first part of a frame-related parallel insn
++ is always assumed to be relevant to the frame
++ calculations; subsequent parts, are only
++ frame-related if explicitly marked. */
++ RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 1)) = 1;
++ RTX_FRAME_RELATED_P (insn) = 1;
+ }
+ else
+ {
+- insn = emit_insn
+- ( gen_load_pairdi (gen_rtx_REG (DImode, regno), mem,
+- gen_rtx_REG (DImode, regno2), mem2));
+-
+- add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (DImode, regno));
+- add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (DImode, regno2));
++ emit_insn (gen_load_pairdi (reg1, mem, reg2, mem2));
++ *cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg1, *cfi_ops);
++ *cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg2, *cfi_ops);
+ }
+
+- /* The first part of a frame-related parallel insn
+- is always assumed to be relevant to the frame
+- calculations; subsequent parts, are only
+- frame-related if explicitly marked. */
+- RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0,
+- 1)) = 1;
+ regno = regno2;
+ start_offset += increment * 2;
+ }
+ else
+ {
+ if (restore == false)
+- insn = emit_move_insn (mem, gen_rtx_REG (DImode, regno));
++ {
++ insn = emit_move_insn (mem, reg1);
++ RTX_FRAME_RELATED_P (insn) = 1;
++ }
+ else
+ {
+- insn = emit_move_insn (gen_rtx_REG (DImode, regno), mem);
+- add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (DImode, regno));
++ emit_move_insn (reg1, mem);
++ *cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg1, *cfi_ops);
+ }
+ start_offset += increment;
+ }
+- RTX_FRAME_RELATED_P (insn) = 1;
+ }
+ }
+
+- aarch64_save_or_restore_fprs (start_offset, increment, restore, base_rtx);
+-
++ aarch64_save_or_restore_fprs (start_offset, increment, restore,
++ base_rtx, cfi_ops);
+ }
+
+ /* AArch64 stack frames generated by this compiler look like:
+@@ -1966,7 +1963,7 @@ aarch64_expand_prologue (void)
+ }
+
+ aarch64_save_or_restore_callee_save_registers
+- (fp_offset + cfun->machine->frame.hardfp_offset, 0);
++ (fp_offset + cfun->machine->frame.hardfp_offset, 0, NULL);
+ }
+
+ /* when offset >= 512,
+@@ -1991,6 +1988,7 @@ aarch64_expand_epilogue (bool for_sibcal
+ HOST_WIDE_INT fp_offset;
+ rtx insn;
+ rtx cfa_reg;
++ rtx cfi_ops = NULL;
+
+ aarch64_layout_frame ();
+ original_frame_size = get_frame_size () + cfun->machine->saved_varargs_size;
+@@ -2035,15 +2033,17 @@ aarch64_expand_epilogue (bool for_sibcal
+ insn = emit_insn (gen_add3_insn (stack_pointer_rtx,
+ hard_frame_pointer_rtx,
+ GEN_INT (- fp_offset)));
++ /* CFA should be calculated from the value of SP from now on. */
++ add_reg_note (insn, REG_CFA_ADJUST_CFA,
++ gen_rtx_SET (VOIDmode, stack_pointer_rtx,
++ plus_constant (Pmode, hard_frame_pointer_rtx,
++ -fp_offset)));
+ RTX_FRAME_RELATED_P (insn) = 1;
+- /* As SP is set to (FP - fp_offset), according to the rules in
+- dwarf2cfi.c:dwarf2out_frame_debug_expr, CFA should be calculated
+- from the value of SP from now on. */
+ cfa_reg = stack_pointer_rtx;
+ }
+
+ aarch64_save_or_restore_callee_save_registers
+- (fp_offset + cfun->machine->frame.hardfp_offset, 1);
++ (fp_offset + cfun->machine->frame.hardfp_offset, 1, &cfi_ops);
+
+ /* Restore the frame pointer and lr if the frame pointer is needed. */
+ if (offset > 0)
+@@ -2051,6 +2051,8 @@ aarch64_expand_epilogue (bool for_sibcal
+ if (frame_pointer_needed)
+ {
+ rtx mem_fp, mem_lr;
++ rtx reg_fp = hard_frame_pointer_rtx;
++ rtx reg_lr = gen_rtx_REG (DImode, LR_REGNUM);
+
+ if (fp_offset)
+ {
+@@ -2063,52 +2065,36 @@ aarch64_expand_epilogue (bool for_sibcal
+ stack_pointer_rtx,
+ fp_offset
+ + UNITS_PER_WORD));
+- insn = emit_insn (gen_load_pairdi (hard_frame_pointer_rtx,
+- mem_fp,
+- gen_rtx_REG (DImode,
+- LR_REGNUM),
+- mem_lr));
++ emit_insn (gen_load_pairdi (reg_fp, mem_fp, reg_lr, mem_lr));
++
++ insn = emit_insn (gen_add2_insn (stack_pointer_rtx,
++ GEN_INT (offset)));
+ }
+ else
+ {
+ insn = emit_insn (gen_loadwb_pairdi_di
+- (stack_pointer_rtx,
+- stack_pointer_rtx,
+- hard_frame_pointer_rtx,
+- gen_rtx_REG (DImode, LR_REGNUM),
+- GEN_INT (offset),
++ (stack_pointer_rtx, stack_pointer_rtx,
++ reg_fp, reg_lr, GEN_INT (offset),
+ GEN_INT (GET_MODE_SIZE (DImode) + offset)));
+- RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 2)) = 1;
+- add_reg_note (insn, REG_CFA_ADJUST_CFA,
+- (gen_rtx_SET (Pmode, stack_pointer_rtx,
+- plus_constant (Pmode, cfa_reg,
+- offset))));
+- }
+-
+- /* The first part of a frame-related parallel insn
+- is always assumed to be relevant to the frame
+- calculations; subsequent parts, are only
+- frame-related if explicitly marked. */
+- RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 1)) = 1;
+- RTX_FRAME_RELATED_P (insn) = 1;
+- add_reg_note (insn, REG_CFA_RESTORE, hard_frame_pointer_rtx);
+- add_reg_note (insn, REG_CFA_RESTORE,
+- gen_rtx_REG (DImode, LR_REGNUM));
+-
+- if (fp_offset)
+- {
+- insn = emit_insn (gen_add2_insn (stack_pointer_rtx,
+- GEN_INT (offset)));
+- RTX_FRAME_RELATED_P (insn) = 1;
+ }
++ cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg_fp, cfi_ops);
++ cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg_lr, cfi_ops);
+ }
+ else
+ {
+ insn = emit_insn (gen_add2_insn (stack_pointer_rtx,
+ GEN_INT (offset)));
+- RTX_FRAME_RELATED_P (insn) = 1;
+ }
++ cfi_ops = alloc_reg_note (REG_CFA_ADJUST_CFA,
++ gen_rtx_SET (VOIDmode, stack_pointer_rtx,
++ plus_constant (Pmode, cfa_reg,
++ offset)),
++ cfi_ops);
++ REG_NOTES (insn) = cfi_ops;
++ RTX_FRAME_RELATED_P (insn) = 1;
+ }
++ else
++ gcc_assert (cfi_ops == NULL);
+
+ /* Stack adjustment for exception handler. */
+ if (crtl->calls_eh_return)
diff --git a/SOURCES/gcc48-cloog-dl.patch b/SOURCES/gcc48-cloog-dl.patch
new file mode 100644
index 0000000..52b5c51
--- /dev/null
+++ b/SOURCES/gcc48-cloog-dl.patch
@@ -0,0 +1,474 @@
+--- gcc/Makefile.in.jj 2012-12-13 17:09:20.000000000 +0100
++++ gcc/Makefile.in 2012-12-14 11:45:22.585670055 +0100
+@@ -1022,7 +1022,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
+ # and the system's installed libraries.
+ LIBS = @LIBS@ libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) \
+ $(LIBIBERTY) $(LIBDECNUMBER) $(HOST_LIBS)
+-BACKENDLIBS = $(CLOOGLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \
++BACKENDLIBS = $(if $(CLOOGLIBS),-ldl) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \
+ $(ZLIB)
+ # Any system libraries needed just for GNAT.
+ SYSLIBS = @GNAT_LIBEXC@
+@@ -3442,6 +3442,15 @@ $(common_out_object_file): $(common_out_
+ $(DIAGNOSTIC_CORE_H) $(FLAGS_H) $(OPTS_H) $(TM_H) $(TM_P_H) $(MACHMODE_H)
+ $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \
+ $< $(OUTPUT_OPTION)
++
++graphite%.o : \
++ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS))
++graphite.o : \
++ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS))
++graphite%.o : \
++ ALL_CXXFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CXXFLAGS))
++graphite.o : \
++ ALL_CXXFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CXXFLAGS))
+ #
+ # Generate header and source files from the machine description,
+ # and compile them.
+--- gcc/graphite-poly.h.jj 2012-12-13 11:31:27.000000000 +0100
++++ gcc/graphite-poly.h 2012-12-14 13:41:41.970800726 +0100
+@@ -22,6 +22,369 @@ along with GCC; see the file COPYING3.
+ #ifndef GCC_GRAPHITE_POLY_H
+ #define GCC_GRAPHITE_POLY_H
+
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#define DYNSYMS \
++ DYNSYM (clast_pprint); \
++ DYNSYM (cloog_clast_create_from_input); \
++ DYNSYM (cloog_clast_free); \
++ DYNSYM (cloog_domain_from_isl_set); \
++ DYNSYM (cloog_input_alloc); \
++ DYNSYM (cloog_isl_state_malloc); \
++ DYNSYM (cloog_options_free); \
++ DYNSYM (cloog_options_malloc); \
++ DYNSYM (cloog_scattering_from_isl_map); \
++ DYNSYM (cloog_state_free); \
++ DYNSYM (cloog_union_domain_add_domain); \
++ DYNSYM (cloog_union_domain_alloc); \
++ DYNSYM (cloog_union_domain_set_name); \
++ DYNSYM (isl_aff_add_coefficient_si); \
++ DYNSYM (isl_aff_add_constant); \
++ DYNSYM (isl_aff_free); \
++ DYNSYM (isl_aff_get_coefficient); \
++ DYNSYM (isl_aff_get_space); \
++ DYNSYM (isl_aff_mod); \
++ DYNSYM (isl_aff_set_coefficient_si); \
++ DYNSYM (isl_aff_set_constant_si); \
++ DYNSYM (isl_aff_zero_on_domain); \
++ DYNSYM (isl_band_free); \
++ DYNSYM (isl_band_get_children); \
++ DYNSYM (isl_band_get_partial_schedule); \
++ DYNSYM (isl_band_has_children); \
++ DYNSYM (isl_band_list_free); \
++ DYNSYM (isl_band_list_get_band); \
++ DYNSYM (isl_band_list_get_ctx); \
++ DYNSYM (isl_band_list_n_band); \
++ DYNSYM (isl_band_member_is_zero_distance); \
++ DYNSYM (isl_band_n_member); \
++ DYNSYM (isl_basic_map_add_constraint); \
++ DYNSYM (isl_basic_map_project_out); \
++ DYNSYM (isl_basic_map_universe); \
++ DYNSYM (isl_constraint_set_coefficient); \
++ DYNSYM (isl_constraint_set_coefficient_si); \
++ DYNSYM (isl_constraint_set_constant); \
++ DYNSYM (isl_constraint_set_constant_si); \
++ DYNSYM (isl_ctx_alloc); \
++ DYNSYM (isl_ctx_free); \
++ DYNSYM (isl_equality_alloc); \
++ DYNSYM (isl_id_alloc); \
++ DYNSYM (isl_id_copy); \
++ DYNSYM (isl_id_free); \
++ DYNSYM (isl_inequality_alloc); \
++ DYNSYM (isl_local_space_copy); \
++ DYNSYM (isl_local_space_free); \
++ DYNSYM (isl_local_space_from_space); \
++ DYNSYM (isl_local_space_range); \
++ DYNSYM (isl_map_add_constraint); \
++ DYNSYM (isl_map_add_dims); \
++ DYNSYM (isl_map_align_params); \
++ DYNSYM (isl_map_apply_range); \
++ DYNSYM (isl_map_copy); \
++ DYNSYM (isl_map_dim); \
++ DYNSYM (isl_map_dump); \
++ DYNSYM (isl_map_equate); \
++ DYNSYM (isl_map_fix_si); \
++ DYNSYM (isl_map_flat_product); \
++ DYNSYM (isl_map_flat_range_product); \
++ DYNSYM (isl_map_free); \
++ DYNSYM (isl_map_from_basic_map); \
++ DYNSYM (isl_map_from_pw_aff); \
++ DYNSYM (isl_map_from_union_map); \
++ DYNSYM (isl_map_get_ctx); \
++ DYNSYM (isl_map_get_space); \
++ DYNSYM (isl_map_get_tuple_id); \
++ DYNSYM (isl_map_insert_dims); \
++ DYNSYM (isl_map_intersect); \
++ DYNSYM (isl_map_intersect_domain); \
++ DYNSYM (isl_map_intersect_range); \
++ DYNSYM (isl_map_is_empty); \
++ DYNSYM (isl_map_lex_ge); \
++ DYNSYM (isl_map_lex_le); \
++ DYNSYM (isl_map_n_out); \
++ DYNSYM (isl_map_range); \
++ DYNSYM (isl_map_set_tuple_id); \
++ DYNSYM (isl_map_universe); \
++ DYNSYM (isl_options_set_on_error); \
++ DYNSYM (isl_options_set_schedule_fuse); \
++ DYNSYM (isl_options_set_schedule_max_constant_term); \
++ DYNSYM (isl_options_set_schedule_maximize_band_depth); \
++ DYNSYM (isl_printer_free); \
++ DYNSYM (isl_printer_print_aff); \
++ DYNSYM (isl_printer_print_constraint); \
++ DYNSYM (isl_printer_print_map); \
++ DYNSYM (isl_printer_print_set); \
++ DYNSYM (isl_printer_to_file); \
++ DYNSYM (isl_pw_aff_add); \
++ DYNSYM (isl_pw_aff_alloc); \
++ DYNSYM (isl_pw_aff_copy); \
++ DYNSYM (isl_pw_aff_eq_set); \
++ DYNSYM (isl_pw_aff_free); \
++ DYNSYM (isl_pw_aff_from_aff); \
++ DYNSYM (isl_pw_aff_ge_set); \
++ DYNSYM (isl_pw_aff_gt_set); \
++ DYNSYM (isl_pw_aff_is_cst); \
++ DYNSYM (isl_pw_aff_le_set); \
++ DYNSYM (isl_pw_aff_lt_set); \
++ DYNSYM (isl_pw_aff_mod); \
++ DYNSYM (isl_pw_aff_mul); \
++ DYNSYM (isl_pw_aff_ne_set); \
++ DYNSYM (isl_pw_aff_nonneg_set); \
++ DYNSYM (isl_pw_aff_set_tuple_id); \
++ DYNSYM (isl_pw_aff_sub); \
++ DYNSYM (isl_pw_aff_zero_set); \
++ DYNSYM (isl_schedule_free); \
++ DYNSYM (isl_schedule_get_band_forest); \
++ DYNSYM (isl_set_add_constraint); \
++ DYNSYM (isl_set_add_dims); \
++ DYNSYM (isl_set_apply); \
++ DYNSYM (isl_set_coalesce); \
++ DYNSYM (isl_set_copy); \
++ DYNSYM (isl_set_dim); \
++ DYNSYM (isl_set_fix_si); \
++ DYNSYM (isl_set_free); \
++ DYNSYM (isl_set_from_cloog_domain); \
++ DYNSYM (isl_set_get_space); \
++ DYNSYM (isl_set_get_tuple_id); \
++ DYNSYM (isl_set_intersect); \
++ DYNSYM (isl_set_is_empty); \
++ DYNSYM (isl_set_max); \
++ DYNSYM (isl_set_min); \
++ DYNSYM (isl_set_nat_universe); \
++ DYNSYM (isl_set_project_out); \
++ DYNSYM (isl_set_set_tuple_id); \
++ DYNSYM (isl_set_universe); \
++ DYNSYM (isl_space_add_dims); \
++ DYNSYM (isl_space_alloc); \
++ DYNSYM (isl_space_copy); \
++ DYNSYM (isl_space_dim); \
++ DYNSYM (isl_space_domain); \
++ DYNSYM (isl_space_find_dim_by_id); \
++ DYNSYM (isl_space_free); \
++ DYNSYM (isl_space_from_domain); \
++ DYNSYM (isl_space_get_tuple_id); \
++ DYNSYM (isl_space_params_alloc); \
++ DYNSYM (isl_space_range); \
++ DYNSYM (isl_space_set_alloc); \
++ DYNSYM (isl_space_set_dim_id); \
++ DYNSYM (isl_space_set_tuple_id); \
++ DYNSYM (isl_union_map_add_map); \
++ DYNSYM (isl_union_map_align_params); \
++ DYNSYM (isl_union_map_apply_domain); \
++ DYNSYM (isl_union_map_apply_range); \
++ DYNSYM (isl_union_map_compute_flow); \
++ DYNSYM (isl_union_map_copy); \
++ DYNSYM (isl_union_map_empty); \
++ DYNSYM (isl_union_map_flat_range_product); \
++ DYNSYM (isl_union_map_foreach_map); \
++ DYNSYM (isl_union_map_free); \
++ DYNSYM (isl_union_map_from_map); \
++ DYNSYM (isl_union_map_get_ctx); \
++ DYNSYM (isl_union_map_get_space); \
++ DYNSYM (isl_union_map_gist_domain); \
++ DYNSYM (isl_union_map_gist_range); \
++ DYNSYM (isl_union_map_intersect_domain); \
++ DYNSYM (isl_union_map_is_empty); \
++ DYNSYM (isl_union_map_subtract); \
++ DYNSYM (isl_union_map_union); \
++ DYNSYM (isl_union_set_add_set); \
++ DYNSYM (isl_union_set_compute_schedule); \
++ DYNSYM (isl_union_set_copy); \
++ DYNSYM (isl_union_set_empty); \
++ DYNSYM (isl_union_set_from_set); \
++ DYNSYM (stmt_ass); \
++ DYNSYM (stmt_block); \
++ DYNSYM (stmt_for); \
++ DYNSYM (stmt_guard); \
++ DYNSYM (stmt_root); \
++ DYNSYM (stmt_user);
++extern struct cloog_pointers_s__
++{
++ bool inited;
++ void *h;
++#define DYNSYM(x) __typeof (x) *p_##x
++ DYNSYMS
++#undef DYNSYM
++} cloog_pointers__;
++
++#define cloog_block_alloc (*cloog_pointers__.p_cloog_block_alloc)
++#define clast_pprint (*cloog_pointers__.p_clast_pprint)
++#define cloog_clast_create_from_input (*cloog_pointers__.p_cloog_clast_create_from_input)
++#define cloog_clast_free (*cloog_pointers__.p_cloog_clast_free)
++#define cloog_domain_from_isl_set (*cloog_pointers__.p_cloog_domain_from_isl_set)
++#define cloog_input_alloc (*cloog_pointers__.p_cloog_input_alloc)
++#define cloog_isl_state_malloc (*cloog_pointers__.p_cloog_isl_state_malloc)
++#define cloog_options_free (*cloog_pointers__.p_cloog_options_free)
++#define cloog_options_malloc (*cloog_pointers__.p_cloog_options_malloc)
++#define cloog_scattering_from_isl_map (*cloog_pointers__.p_cloog_scattering_from_isl_map)
++#define cloog_state_free (*cloog_pointers__.p_cloog_state_free)
++#define cloog_union_domain_add_domain (*cloog_pointers__.p_cloog_union_domain_add_domain)
++#define cloog_union_domain_alloc (*cloog_pointers__.p_cloog_union_domain_alloc)
++#define cloog_union_domain_set_name (*cloog_pointers__.p_cloog_union_domain_set_name)
++#define isl_aff_add_coefficient_si (*cloog_pointers__.p_isl_aff_add_coefficient_si)
++#define isl_aff_add_constant (*cloog_pointers__.p_isl_aff_add_constant)
++#define isl_aff_free (*cloog_pointers__.p_isl_aff_free)
++#define isl_aff_get_coefficient (*cloog_pointers__.p_isl_aff_get_coefficient)
++#define isl_aff_get_space (*cloog_pointers__.p_isl_aff_get_space)
++#define isl_aff_mod (*cloog_pointers__.p_isl_aff_mod)
++#define isl_aff_set_coefficient_si (*cloog_pointers__.p_isl_aff_set_coefficient_si)
++#define isl_aff_set_constant_si (*cloog_pointers__.p_isl_aff_set_constant_si)
++#define isl_aff_zero_on_domain (*cloog_pointers__.p_isl_aff_zero_on_domain)
++#define isl_band_free (*cloog_pointers__.p_isl_band_free)
++#define isl_band_get_children (*cloog_pointers__.p_isl_band_get_children)
++#define isl_band_get_partial_schedule (*cloog_pointers__.p_isl_band_get_partial_schedule)
++#define isl_band_has_children (*cloog_pointers__.p_isl_band_has_children)
++#define isl_band_list_free (*cloog_pointers__.p_isl_band_list_free)
++#define isl_band_list_get_band (*cloog_pointers__.p_isl_band_list_get_band)
++#define isl_band_list_get_ctx (*cloog_pointers__.p_isl_band_list_get_ctx)
++#define isl_band_list_n_band (*cloog_pointers__.p_isl_band_list_n_band)
++#define isl_band_member_is_zero_distance (*cloog_pointers__.p_isl_band_member_is_zero_distance)
++#define isl_band_n_member (*cloog_pointers__.p_isl_band_n_member)
++#define isl_basic_map_add_constraint (*cloog_pointers__.p_isl_basic_map_add_constraint)
++#define isl_basic_map_project_out (*cloog_pointers__.p_isl_basic_map_project_out)
++#define isl_basic_map_universe (*cloog_pointers__.p_isl_basic_map_universe)
++#define isl_constraint_set_coefficient (*cloog_pointers__.p_isl_constraint_set_coefficient)
++#define isl_constraint_set_coefficient_si (*cloog_pointers__.p_isl_constraint_set_coefficient_si)
++#define isl_constraint_set_constant (*cloog_pointers__.p_isl_constraint_set_constant)
++#define isl_constraint_set_constant_si (*cloog_pointers__.p_isl_constraint_set_constant_si)
++#define isl_ctx_alloc (*cloog_pointers__.p_isl_ctx_alloc)
++#define isl_ctx_free (*cloog_pointers__.p_isl_ctx_free)
++#define isl_equality_alloc (*cloog_pointers__.p_isl_equality_alloc)
++#define isl_id_alloc (*cloog_pointers__.p_isl_id_alloc)
++#define isl_id_copy (*cloog_pointers__.p_isl_id_copy)
++#define isl_id_free (*cloog_pointers__.p_isl_id_free)
++#define isl_inequality_alloc (*cloog_pointers__.p_isl_inequality_alloc)
++#define isl_local_space_copy (*cloog_pointers__.p_isl_local_space_copy)
++#define isl_local_space_free (*cloog_pointers__.p_isl_local_space_free)
++#define isl_local_space_from_space (*cloog_pointers__.p_isl_local_space_from_space)
++#define isl_local_space_range (*cloog_pointers__.p_isl_local_space_range)
++#define isl_map_add_constraint (*cloog_pointers__.p_isl_map_add_constraint)
++#define isl_map_add_dims (*cloog_pointers__.p_isl_map_add_dims)
++#define isl_map_align_params (*cloog_pointers__.p_isl_map_align_params)
++#define isl_map_apply_range (*cloog_pointers__.p_isl_map_apply_range)
++#define isl_map_copy (*cloog_pointers__.p_isl_map_copy)
++#define isl_map_dim (*cloog_pointers__.p_isl_map_dim)
++#define isl_map_dump (*cloog_pointers__.p_isl_map_dump)
++#define isl_map_equate (*cloog_pointers__.p_isl_map_equate)
++#define isl_map_fix_si (*cloog_pointers__.p_isl_map_fix_si)
++#define isl_map_flat_product (*cloog_pointers__.p_isl_map_flat_product)
++#define isl_map_flat_range_product (*cloog_pointers__.p_isl_map_flat_range_product)
++#define isl_map_free (*cloog_pointers__.p_isl_map_free)
++#define isl_map_from_basic_map (*cloog_pointers__.p_isl_map_from_basic_map)
++#define isl_map_from_pw_aff (*cloog_pointers__.p_isl_map_from_pw_aff)
++#define isl_map_from_union_map (*cloog_pointers__.p_isl_map_from_union_map)
++#define isl_map_get_ctx (*cloog_pointers__.p_isl_map_get_ctx)
++#define isl_map_get_space (*cloog_pointers__.p_isl_map_get_space)
++#define isl_map_get_tuple_id (*cloog_pointers__.p_isl_map_get_tuple_id)
++#define isl_map_insert_dims (*cloog_pointers__.p_isl_map_insert_dims)
++#define isl_map_intersect (*cloog_pointers__.p_isl_map_intersect)
++#define isl_map_intersect_domain (*cloog_pointers__.p_isl_map_intersect_domain)
++#define isl_map_intersect_range (*cloog_pointers__.p_isl_map_intersect_range)
++#define isl_map_is_empty (*cloog_pointers__.p_isl_map_is_empty)
++#define isl_map_lex_ge (*cloog_pointers__.p_isl_map_lex_ge)
++#define isl_map_lex_le (*cloog_pointers__.p_isl_map_lex_le)
++#define isl_map_n_out (*cloog_pointers__.p_isl_map_n_out)
++#define isl_map_range (*cloog_pointers__.p_isl_map_range)
++#define isl_map_set_tuple_id (*cloog_pointers__.p_isl_map_set_tuple_id)
++#define isl_map_universe (*cloog_pointers__.p_isl_map_universe)
++#define isl_options_set_on_error (*cloog_pointers__.p_isl_options_set_on_error)
++#define isl_options_set_schedule_fuse (*cloog_pointers__.p_isl_options_set_schedule_fuse)
++#define isl_options_set_schedule_max_constant_term (*cloog_pointers__.p_isl_options_set_schedule_max_constant_term)
++#define isl_options_set_schedule_maximize_band_depth (*cloog_pointers__.p_isl_options_set_schedule_maximize_band_depth)
++#define isl_printer_free (*cloog_pointers__.p_isl_printer_free)
++#define isl_printer_print_aff (*cloog_pointers__.p_isl_printer_print_aff)
++#define isl_printer_print_constraint (*cloog_pointers__.p_isl_printer_print_constraint)
++#define isl_printer_print_map (*cloog_pointers__.p_isl_printer_print_map)
++#define isl_printer_print_set (*cloog_pointers__.p_isl_printer_print_set)
++#define isl_printer_to_file (*cloog_pointers__.p_isl_printer_to_file)
++#define isl_pw_aff_add (*cloog_pointers__.p_isl_pw_aff_add)
++#define isl_pw_aff_alloc (*cloog_pointers__.p_isl_pw_aff_alloc)
++#define isl_pw_aff_copy (*cloog_pointers__.p_isl_pw_aff_copy)
++#define isl_pw_aff_eq_set (*cloog_pointers__.p_isl_pw_aff_eq_set)
++#define isl_pw_aff_free (*cloog_pointers__.p_isl_pw_aff_free)
++#define isl_pw_aff_from_aff (*cloog_pointers__.p_isl_pw_aff_from_aff)
++#define isl_pw_aff_ge_set (*cloog_pointers__.p_isl_pw_aff_ge_set)
++#define isl_pw_aff_gt_set (*cloog_pointers__.p_isl_pw_aff_gt_set)
++#define isl_pw_aff_is_cst (*cloog_pointers__.p_isl_pw_aff_is_cst)
++#define isl_pw_aff_le_set (*cloog_pointers__.p_isl_pw_aff_le_set)
++#define isl_pw_aff_lt_set (*cloog_pointers__.p_isl_pw_aff_lt_set)
++#define isl_pw_aff_mod (*cloog_pointers__.p_isl_pw_aff_mod)
++#define isl_pw_aff_mul (*cloog_pointers__.p_isl_pw_aff_mul)
++#define isl_pw_aff_ne_set (*cloog_pointers__.p_isl_pw_aff_ne_set)
++#define isl_pw_aff_nonneg_set (*cloog_pointers__.p_isl_pw_aff_nonneg_set)
++#define isl_pw_aff_set_tuple_id (*cloog_pointers__.p_isl_pw_aff_set_tuple_id)
++#define isl_pw_aff_sub (*cloog_pointers__.p_isl_pw_aff_sub)
++#define isl_pw_aff_zero_set (*cloog_pointers__.p_isl_pw_aff_zero_set)
++#define isl_schedule_free (*cloog_pointers__.p_isl_schedule_free)
++#define isl_schedule_get_band_forest (*cloog_pointers__.p_isl_schedule_get_band_forest)
++#define isl_set_add_constraint (*cloog_pointers__.p_isl_set_add_constraint)
++#define isl_set_add_dims (*cloog_pointers__.p_isl_set_add_dims)
++#define isl_set_apply (*cloog_pointers__.p_isl_set_apply)
++#define isl_set_coalesce (*cloog_pointers__.p_isl_set_coalesce)
++#define isl_set_copy (*cloog_pointers__.p_isl_set_copy)
++#define isl_set_dim (*cloog_pointers__.p_isl_set_dim)
++#define isl_set_fix_si (*cloog_pointers__.p_isl_set_fix_si)
++#define isl_set_free (*cloog_pointers__.p_isl_set_free)
++#define isl_set_from_cloog_domain (*cloog_pointers__.p_isl_set_from_cloog_domain)
++#define isl_set_get_space (*cloog_pointers__.p_isl_set_get_space)
++#define isl_set_get_tuple_id (*cloog_pointers__.p_isl_set_get_tuple_id)
++#define isl_set_intersect (*cloog_pointers__.p_isl_set_intersect)
++#define isl_set_is_empty (*cloog_pointers__.p_isl_set_is_empty)
++#define isl_set_max (*cloog_pointers__.p_isl_set_max)
++#define isl_set_min (*cloog_pointers__.p_isl_set_min)
++#define isl_set_nat_universe (*cloog_pointers__.p_isl_set_nat_universe)
++#define isl_set_project_out (*cloog_pointers__.p_isl_set_project_out)
++#define isl_set_set_tuple_id (*cloog_pointers__.p_isl_set_set_tuple_id)
++#define isl_set_universe (*cloog_pointers__.p_isl_set_universe)
++#define isl_space_add_dims (*cloog_pointers__.p_isl_space_add_dims)
++#define isl_space_alloc (*cloog_pointers__.p_isl_space_alloc)
++#define isl_space_copy (*cloog_pointers__.p_isl_space_copy)
++#define isl_space_dim (*cloog_pointers__.p_isl_space_dim)
++#define isl_space_domain (*cloog_pointers__.p_isl_space_domain)
++#define isl_space_find_dim_by_id (*cloog_pointers__.p_isl_space_find_dim_by_id)
++#define isl_space_free (*cloog_pointers__.p_isl_space_free)
++#define isl_space_from_domain (*cloog_pointers__.p_isl_space_from_domain)
++#define isl_space_get_tuple_id (*cloog_pointers__.p_isl_space_get_tuple_id)
++#define isl_space_params_alloc (*cloog_pointers__.p_isl_space_params_alloc)
++#define isl_space_range (*cloog_pointers__.p_isl_space_range)
++#define isl_space_set_alloc (*cloog_pointers__.p_isl_space_set_alloc)
++#define isl_space_set_dim_id (*cloog_pointers__.p_isl_space_set_dim_id)
++#define isl_space_set_tuple_id (*cloog_pointers__.p_isl_space_set_tuple_id)
++#define isl_union_map_add_map (*cloog_pointers__.p_isl_union_map_add_map)
++#define isl_union_map_align_params (*cloog_pointers__.p_isl_union_map_align_params)
++#define isl_union_map_apply_domain (*cloog_pointers__.p_isl_union_map_apply_domain)
++#define isl_union_map_apply_range (*cloog_pointers__.p_isl_union_map_apply_range)
++#define isl_union_map_compute_flow (*cloog_pointers__.p_isl_union_map_compute_flow)
++#define isl_union_map_copy (*cloog_pointers__.p_isl_union_map_copy)
++#define isl_union_map_empty (*cloog_pointers__.p_isl_union_map_empty)
++#define isl_union_map_flat_range_product (*cloog_pointers__.p_isl_union_map_flat_range_product)
++#define isl_union_map_foreach_map (*cloog_pointers__.p_isl_union_map_foreach_map)
++#define isl_union_map_free (*cloog_pointers__.p_isl_union_map_free)
++#define isl_union_map_from_map (*cloog_pointers__.p_isl_union_map_from_map)
++#define isl_union_map_get_ctx (*cloog_pointers__.p_isl_union_map_get_ctx)
++#define isl_union_map_get_space (*cloog_pointers__.p_isl_union_map_get_space)
++#define isl_union_map_gist_domain (*cloog_pointers__.p_isl_union_map_gist_domain)
++#define isl_union_map_gist_range (*cloog_pointers__.p_isl_union_map_gist_range)
++#define isl_union_map_intersect_domain (*cloog_pointers__.p_isl_union_map_intersect_domain)
++#define isl_union_map_is_empty (*cloog_pointers__.p_isl_union_map_is_empty)
++#define isl_union_map_subtract (*cloog_pointers__.p_isl_union_map_subtract)
++#define isl_union_map_union (*cloog_pointers__.p_isl_union_map_union)
++#define isl_union_set_add_set (*cloog_pointers__.p_isl_union_set_add_set)
++#define isl_union_set_compute_schedule (*cloog_pointers__.p_isl_union_set_compute_schedule)
++#define isl_union_set_copy (*cloog_pointers__.p_isl_union_set_copy)
++#define isl_union_set_empty (*cloog_pointers__.p_isl_union_set_empty)
++#define isl_union_set_from_set (*cloog_pointers__.p_isl_union_set_from_set)
++#define stmt_ass (*cloog_pointers__.p_stmt_ass)
++#define stmt_block (*cloog_pointers__.p_stmt_block)
++#define stmt_for (*cloog_pointers__.p_stmt_for)
++#define stmt_guard (*cloog_pointers__.p_stmt_guard)
++#define stmt_root (*cloog_pointers__.p_stmt_root)
++#define stmt_user (*cloog_pointers__.p_stmt_user)
++
+ typedef struct poly_dr *poly_dr_p;
+
+ typedef struct poly_bb *poly_bb_p;
+--- gcc/graphite.c.jj 2012-12-13 11:31:00.000000000 +0100
++++ gcc/graphite.c 2012-12-14 13:40:44.155136961 +0100
+@@ -66,6 +66,34 @@ along with GCC; see the file COPYING3.
+
+ CloogState *cloog_state;
+
++__typeof (cloog_pointers__) cloog_pointers__;
++
++static bool
++init_cloog_pointers (void)
++{
++ void *h;
++
++ if (cloog_pointers__.inited)
++ return cloog_pointers__.h != NULL;
++ h = dlopen ("libcloog-isl.so.4", RTLD_LAZY);
++ cloog_pointers__.h = h;
++ if (h == NULL)
++ return false;
++#define DYNSYM(x) \
++ do \
++ { \
++ union { __typeof (cloog_pointers__.p_##x) p; void *q; } u; \
++ u.q = dlsym (h, #x); \
++ if (u.q == NULL) \
++ return false; \
++ cloog_pointers__.p_##x = u.p; \
++ } \
++ while (0)
++ DYNSYMS
++#undef DYNSYM
++ return true;
++}
++
+ /* Print global statistics to FILE. */
+
+ static void
+@@ -264,6 +292,15 @@ graphite_transform_loops (void)
+ if (parallelized_function_p (cfun->decl))
+ return;
+
++ if (number_of_loops () <= 1)
++ return;
++
++ if (!init_cloog_pointers ())
++ {
++ sorry ("Graphite loop optimizations cannot be used");
++ return;
++ }
++
+ ctx = isl_ctx_alloc ();
+ isl_options_set_on_error(ctx, ISL_ON_ERROR_ABORT);
+ if (!graphite_initialize (ctx))
+--- gcc/graphite-clast-to-gimple.c.jj 2012-12-13 11:31:27.000000000 +0100
++++ gcc/graphite-clast-to-gimple.c 2012-12-14 13:27:47.196519858 +0100
+@@ -910,7 +910,7 @@ compute_bounds_for_loop (struct clast_fo
+ from STMT_FOR. */
+
+ static tree
+-type_for_clast_for (struct clast_for *stmt_for, ivs_params_p ip)
++type_for_clast_for (struct clast_for *stmt_fora, ivs_params_p ip)
+ {
+ mpz_t bound_one, bound_two;
+ tree lb_type, ub_type;
+@@ -918,8 +918,8 @@ type_for_clast_for (struct clast_for *st
+ mpz_init (bound_one);
+ mpz_init (bound_two);
+
+- lb_type = type_for_clast_expr (stmt_for->LB, ip, bound_one, bound_two);
+- ub_type = type_for_clast_expr (stmt_for->UB, ip, bound_one, bound_two);
++ lb_type = type_for_clast_expr (stmt_fora->LB, ip, bound_one, bound_two);
++ ub_type = type_for_clast_expr (stmt_fora->UB, ip, bound_one, bound_two);
+
+ mpz_clear (bound_one);
+ mpz_clear (bound_two);
diff --git a/SOURCES/gcc48-cloog-dl2.patch b/SOURCES/gcc48-cloog-dl2.patch
new file mode 100644
index 0000000..2f647a3
--- /dev/null
+++ b/SOURCES/gcc48-cloog-dl2.patch
@@ -0,0 +1,74 @@
+2011-04-04 Jakub Jelinek
+
+ * toplev.c (toplev_main_argv): New variable.
+ (toplev_main): Initialize it.
+ * graphite.c (init_cloog_pointers): Load libcloog-isl.so.4 from gcc's private
+ directory.
+
+--- gcc/toplev.c.jj 2008-12-09 23:59:10.000000000 +0100
++++ gcc/toplev.c 2009-01-27 14:33:52.000000000 +0100
+@@ -107,6 +107,8 @@ static bool no_backend;
+ /* Length of line when printing switch values. */
+ #define MAX_LINE 75
+
++const char **toplev_main_argv;
++
+ /* Decoded options, and number of such options. */
+ struct cl_decoded_option *save_decoded_options;
+ unsigned int save_decoded_options_count;
+@@ -1909,6 +1911,8 @@ toplev_main (int argc, char **argv)
+
+ expandargv (&argc, &argv);
+
++ toplev_main_argv = CONST_CAST2 (const char **, char **, argv);
++
+ /* Initialization of GCC's environment, and diagnostics. */
+ general_init (argv[0]);
+
+--- gcc/graphite.c.jj 2010-12-01 10:24:32.000000000 -0500
++++ gcc/graphite.c 2010-12-01 11:46:07.832118193 -0500
+@@ -72,11 +72,39 @@ __typeof (cloog_pointers__) cloog_pointe
+ static bool
+ init_cloog_pointers (void)
+ {
+- void *h;
+-
+- if (cloog_pointers__.inited)
+- return cloog_pointers__.h != NULL;
+- h = dlopen ("libcloog-isl.so.4", RTLD_LAZY);
++ void *h = NULL;
++ extern const char **toplev_main_argv;
++ char *buf, *p;
++ size_t len;
++
++ if (cloog_pointers__.inited)
++ return cloog_pointers__.h != NULL;
++ len = progname - toplev_main_argv[0];
++ buf = XALLOCAVAR (char, len + sizeof "libcloog-isl.so.4");
++ memcpy (buf, toplev_main_argv[0], len);
++ strcpy (buf + len, "libcloog-isl.so.4");
++ len += sizeof "libcloog-isl.so.4";
++ p = strstr (buf, "/libexec/");
++ if (p != NULL)
++ {
++ while (1)
++ {
++ char *q = strstr (p + 8, "/libexec/");
++ if (q == NULL)
++ break;
++ p = q;
++ }
++ memmove (p + 4, p + 8, len - (p + 8 - buf));
++ h = dlopen (buf, RTLD_LAZY);
++ if (h == NULL)
++ {
++ len = progname - toplev_main_argv[0];
++ memcpy (buf, toplev_main_argv[0], len);
++ strcpy (buf + len, "libcloog-isl.so.4");
++ }
++ }
++ if (h == NULL)
++ h = dlopen (buf, RTLD_LAZY);
+ cloog_pointers__.h = h;
+ if (h == NULL)
+ return false;
diff --git a/SOURCES/gcc48-color-auto.patch b/SOURCES/gcc48-color-auto.patch
new file mode 100644
index 0000000..a8cf938
--- /dev/null
+++ b/SOURCES/gcc48-color-auto.patch
@@ -0,0 +1,46 @@
+2013-09-20 Jakub Jelinek
+
+ * common.opt (-fdiagnostics-color=): Default to auto.
+ * toplev.c (process_options): Always default to
+ -fdiagnostics-color=auto if no -f{,no-}diagnostics-color*.
+ * doc/invoke.texi (-fdiagnostics-color*): Adjust documentation
+ of the default.
+
+--- gcc/common.opt.jj 2013-09-18 12:06:53.000000000 +0200
++++ gcc/common.opt 2013-09-20 10:00:00.935823900 +0200
+@@ -1037,7 +1037,7 @@ Common Alias(fdiagnostics-color=,always,
+ ;
+
+ fdiagnostics-color=
+-Common Joined RejectNegative Var(flag_diagnostics_show_color) Enum(diagnostic_color_rule) Init(DIAGNOSTICS_COLOR_NO)
++Common Joined RejectNegative Var(flag_diagnostics_show_color) Enum(diagnostic_color_rule) Init(DIAGNOSTICS_COLOR_AUTO)
+ -fdiagnostics-color=[never|always|auto] Colorize diagnostics
+
+ ; Required for these enum values.
+--- gcc/toplev.c.jj 2013-09-09 11:32:39.000000000 +0200
++++ gcc/toplev.c 2013-09-20 10:10:08.198721005 +0200
+@@ -1229,10 +1229,8 @@ process_options (void)
+
+ maximum_field_alignment = initial_max_fld_align * BITS_PER_UNIT;
+
+- /* Default to -fdiagnostics-color=auto if GCC_COLORS is in the environment,
+- otherwise default to -fdiagnostics-color=never. */
+- if (!global_options_set.x_flag_diagnostics_show_color
+- && getenv ("GCC_COLORS"))
++ /* Default to -fdiagnostics-color=auto. */
++ if (!global_options_set.x_flag_diagnostics_show_color)
+ pp_show_color (global_dc->printer)
+ = colorize_init (DIAGNOSTICS_COLOR_AUTO);
+
+--- gcc/doc/invoke.texi.jj 2013-09-18 12:06:50.000000000 +0200
++++ gcc/doc/invoke.texi 2013-09-20 10:09:29.079904455 +0200
+@@ -3046,8 +3046,7 @@ a message which is too long to fit on a
+ @cindex highlight, color, colour
+ @vindex GCC_COLORS @r{environment variable}
+ Use color in diagnostics. @var{WHEN} is @samp{never}, @samp{always},
+-or @samp{auto}. The default is @samp{never} if @env{GCC_COLORS} environment
+-variable isn't present in the environment, and @samp{auto} otherwise.
++or @samp{auto}. The default is @samp{auto}.
+ @samp{auto} means to use color only when the standard error is a terminal.
+ The forms @option{-fdiagnostics-color} and @option{-fno-diagnostics-color} are
+ aliases for @option{-fdiagnostics-color=always} and
diff --git a/SOURCES/gcc48-hack.patch b/SOURCES/gcc48-hack.patch
new file mode 100644
index 0000000..1903e95
--- /dev/null
+++ b/SOURCES/gcc48-hack.patch
@@ -0,0 +1,102 @@
+--- libada/Makefile.in.jj 2009-01-14 12:07:35.000000000 +0100
++++ libada/Makefile.in 2009-01-15 14:25:33.000000000 +0100
+@@ -66,18 +66,40 @@ libsubdir := $(libdir)/gcc/$(target_nonc
+ ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
+ ADA_RTS_SUBDIR=./rts$(subst /,_,$(MULTISUBDIR))
+
++DEFAULTMULTIFLAGS :=
++ifeq ($(MULTISUBDIR),)
++targ:=$(subst -, ,$(target))
++arch:=$(word 1,$(targ))
++ifeq ($(words $(targ)),2)
++osys:=$(word 2,$(targ))
++else
++osys:=$(word 3,$(targ))
++endif
++ifeq ($(strip $(filter-out i%86 x86_64 powerpc% ppc% s390% sparc% linux%, $(arch) $(osys))),)
++ifeq ($(shell $(CC) $(CFLAGS) -print-multi-os-directory),../lib64)
++DEFAULTMULTIFLAGS := -m64
++else
++ifeq ($(strip $(filter-out s390%, $(arch))),)
++DEFAULTMULTIFLAGS := -m31
++else
++DEFAULTMULTIFLAGS := -m32
++endif
++endif
++endif
++endif
++
+ # exeext should not be used because it's the *host* exeext. We're building
+ # a *target* library, aren't we?!? Likewise for CC. Still, provide bogus
+ # definitions just in case something slips through the safety net provided
+ # by recursive make invocations in gcc/ada/Makefile.in
+ LIBADA_FLAGS_TO_PASS = \
+ "MAKEOVERRIDES=" \
+- "LDFLAGS=$(LDFLAGS)" \
++ "LDFLAGS=$(LDFLAGS) $(DEFAULTMULTIFLAGS)" \
+ "LN_S=$(LN_S)" \
+ "SHELL=$(SHELL)" \
+- "GNATLIBFLAGS=$(GNATLIBFLAGS) $(MULTIFLAGS)" \
+- "GNATLIBCFLAGS=$(GNATLIBCFLAGS) $(MULTIFLAGS)" \
+- "GNATLIBCFLAGS_FOR_C=$(GNATLIBCFLAGS_FOR_C) $(MULTIFLAGS)" \
++ "GNATLIBFLAGS=$(GNATLIBFLAGS) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS)" \
++ "GNATLIBCFLAGS=$(GNATLIBCFLAGS) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS)" \
++ "GNATLIBCFLAGS_FOR_C=$(GNATLIBCFLAGS_FOR_C) $(MULTIFLAGS) $(DEFAULTMULTIFLAGS)" \
+ "PICFLAG_FOR_TARGET=$(PICFLAG)" \
+ "THREAD_KIND=$(THREAD_KIND)" \
+ "TRACE=$(TRACE)" \
+@@ -88,7 +110,7 @@ LIBADA_FLAGS_TO_PASS = \
+ "exeext=.exeext.should.not.be.used " \
+ 'CC=the.host.compiler.should.not.be.needed' \
+ "GCC_FOR_TARGET=$(CC)" \
+- "CFLAGS=$(CFLAGS)"
++ "CFLAGS=$(CFLAGS) $(DEFAULTMULTIFLAGS)"
+
+ # Rules to build gnatlib.
+ .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool
+--- gcc/ada/sem_util.adb (revision 161677)
++++ gcc/ada/sem_util.adb (working copy)
+@@ -5487,7 +5487,7 @@ package body Sem_Util is
+ Exp : Node_Id;
+ Assn : Node_Id;
+ Choice : Node_Id;
+- Comp_Type : Entity_Id;
++ Comp_Type : Entity_Id := Empty;
+ Is_Array_Aggr : Boolean;
+
+ begin
+--- config-ml.in.jj 2010-06-30 09:50:44.000000000 +0200
++++ config-ml.in 2010-07-02 21:24:17.994211151 +0200
+@@ -516,6 +516,8 @@ multi-do:
+ ADAFLAGS="$(ADAFLAGS) $${flags}" \
+ prefix="$(prefix)" \
+ exec_prefix="$(exec_prefix)" \
++ mandir="$(mandir)" \
++ infodir="$(infodir)" \
+ GCJFLAGS="$(GCJFLAGS) $${flags}" \
+ GOCFLAGS="$(GOCFLAGS) $${flags}" \
+ CXXFLAGS="$(CXXFLAGS) $${flags}" \
+--- libjava/Makefile.am.jj 2010-07-09 11:17:33.729604090 +0200
++++ libjava/Makefile.am 2010-07-09 13:16:41.894375641 +0200
+@@ -710,7 +710,8 @@ if USE_LIBGCJ_BC
+ ## later.
+ @echo Installing dummy lib libgcj_bc.so.1.0.0; \
+ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
+- mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
++ $(INSTALL) $(INSTALL_STRIP_FLAG) $(here)/.libs/libgcj_bc.so $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
++ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0; \
+ $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
+ -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
+ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
+--- libjava/Makefile.in.jj 2010-07-09 11:17:34.000000000 +0200
++++ libjava/Makefile.in 2010-07-09 13:18:07.542572270 +0200
+@@ -12665,7 +12665,8 @@ install-exec-hook: install-binPROGRAMS i
+ install-libexecsubPROGRAMS
+ @USE_LIBGCJ_BC_TRUE@ @echo Installing dummy lib libgcj_bc.so.1.0.0; \
+ @USE_LIBGCJ_BC_TRUE@ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
+-@USE_LIBGCJ_BC_TRUE@ mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
++@USE_LIBGCJ_BC_TRUE@ $(INSTALL) $(INSTALL_STRIP_FLAG) $(here)/.libs/libgcj_bc.so $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
++@USE_LIBGCJ_BC_TRUE@ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0; \
+ @USE_LIBGCJ_BC_TRUE@ $(libgcj_bc_dummy_LINK) -xc /dev/null -Wl,-soname,libgcj_bc.so.1 \
+ @USE_LIBGCJ_BC_TRUE@ -o $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 -lgcj || exit; \
+ @USE_LIBGCJ_BC_TRUE@ rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
diff --git a/SOURCES/gcc48-i386-libgomp.patch b/SOURCES/gcc48-i386-libgomp.patch
new file mode 100644
index 0000000..520561e
--- /dev/null
+++ b/SOURCES/gcc48-i386-libgomp.patch
@@ -0,0 +1,11 @@
+--- libgomp/configure.tgt.jj 2008-01-10 20:53:48.000000000 +0100
++++ libgomp/configure.tgt 2008-03-27 12:44:51.000000000 +0100
+@@ -67,7 +67,7 @@ if test $enable_linux_futex = yes; then
+ ;;
+ *)
+ if test -z "$with_arch"; then
+- XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
++ XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
+ fi
+ esac
+ ;;
diff --git a/SOURCES/gcc48-java-nomulti.patch b/SOURCES/gcc48-java-nomulti.patch
new file mode 100644
index 0000000..17334aa
--- /dev/null
+++ b/SOURCES/gcc48-java-nomulti.patch
@@ -0,0 +1,44 @@
+--- libjava/configure.ac.jj 2007-12-07 17:55:50.000000000 +0100
++++ libjava/configure.ac 2007-12-07 18:36:56.000000000 +0100
+@@ -82,6 +82,13 @@ AC_ARG_ENABLE(java-maintainer-mode,
+ [allow rebuilding of .class and .h files]))
+ AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
+
++AC_ARG_ENABLE(libjava-multilib,
++ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
++if test "$enable_libjava_multilib" = no; then
++ multilib=no
++ ac_configure_args="$ac_configure_args --disable-multilib"
++fi
++
+ # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
+ GCC_NO_EXECUTABLES
+
+--- libjava/configure.jj 2007-12-07 17:55:50.000000000 +0100
++++ libjava/configure 2007-12-07 18:39:58.000000000 +0100
+@@ -1021,6 +1021,8 @@ Optional Features:
+ default=yes
+ --enable-java-maintainer-mode
+ allow rebuilding of .class and .h files
++ --enable-libjava-multilib
++ build libjava as multilib
+ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-maintainer-mode enable make rules and dependencies not useful
+@@ -1973,6 +1975,16 @@ else
+ fi
+
+
++# Check whether --enable-libjava-multilib was given.
++if test "${enable_libjava_multilib+set}" = set; then
++ enableval=$enable_libjava_multilib;
++fi
++
++if test "$enable_libjava_multilib" = no; then
++ multilib=no
++ ac_configure_args="$ac_configure_args --disable-multilib"
++fi
++
+ # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
+
+
diff --git a/SOURCES/gcc48-libgo-p224.patch b/SOURCES/gcc48-libgo-p224.patch
new file mode 100644
index 0000000..50461bc
--- /dev/null
+++ b/SOURCES/gcc48-libgo-p224.patch
@@ -0,0 +1,1302 @@
+--- libgo/Makefile.am.jj 2013-12-12 19:01:49.000000000 +0100
++++ libgo/Makefile.am 2014-02-18 17:31:54.798484657 +0100
+@@ -1109,8 +1109,7 @@ go_crypto_dsa_files = \
+ go_crypto_ecdsa_files = \
+ go/crypto/ecdsa/ecdsa.go
+ go_crypto_elliptic_files = \
+- go/crypto/elliptic/elliptic.go \
+- go/crypto/elliptic/p224.go
++ go/crypto/elliptic/elliptic.go
+ go_crypto_hmac_files = \
+ go/crypto/hmac/hmac.go
+ go_crypto_md5_files = \
+--- libgo/Makefile.in.jj 2013-12-12 19:01:49.000000000 +0100
++++ libgo/Makefile.in 2014-02-18 17:32:11.350389191 +0100
+@@ -1274,8 +1274,7 @@ go_crypto_ecdsa_files = \
+ go/crypto/ecdsa/ecdsa.go
+
+ go_crypto_elliptic_files = \
+- go/crypto/elliptic/elliptic.go \
+- go/crypto/elliptic/p224.go
++ go/crypto/elliptic/elliptic.go
+
+ go_crypto_hmac_files = \
+ go/crypto/hmac/hmac.go
+--- libgo/go/crypto/elliptic/elliptic.go.jj 2012-12-13 11:32:02.640039537 +0100
++++ libgo/go/crypto/elliptic/elliptic.go 2014-02-18 17:28:22.909692022 +0100
+@@ -327,7 +327,6 @@ var p384 *CurveParams
+ var p521 *CurveParams
+
+ func initAll() {
+- initP224()
+ initP256()
+ initP384()
+ initP521()
+--- libgo/go/crypto/elliptic/elliptic_test.go.jj 2012-12-13 11:32:02.640039537 +0100
++++ libgo/go/crypto/elliptic/elliptic_test.go 2014-02-18 17:31:04.052774265 +0100
+@@ -5,329 +5,14 @@
+ package elliptic
+
+ import (
+- "crypto/rand"
+- "encoding/hex"
+- "fmt"
+- "math/big"
+ "testing"
+ )
+
+-func TestOnCurve(t *testing.T) {
+- p224 := P224()
+- if !p224.IsOnCurve(p224.Params().Gx, p224.Params().Gy) {
+- t.Errorf("FAIL")
+- }
+-}
+-
+-type baseMultTest struct {
+- k string
+- x, y string
+-}
+-
+-var p224BaseMultTests = []baseMultTest{
+- {
+- "1",
+- "b70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21",
+- "bd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34",
+- },
+- {
+- "2",
+- "706a46dc76dcb76798e60e6d89474788d16dc18032d268fd1a704fa6",
+- "1c2b76a7bc25e7702a704fa986892849fca629487acf3709d2e4e8bb",
+- },
+- {
+- "3",
+- "df1b1d66a551d0d31eff822558b9d2cc75c2180279fe0d08fd896d04",
+- "a3f7f03cadd0be444c0aa56830130ddf77d317344e1af3591981a925",
+- },
+- {
+- "4",
+- "ae99feebb5d26945b54892092a8aee02912930fa41cd114e40447301",
+- "482580a0ec5bc47e88bc8c378632cd196cb3fa058a7114eb03054c9",
+- },
+- {
+- "5",
+- "31c49ae75bce7807cdff22055d94ee9021fedbb5ab51c57526f011aa",
+- "27e8bff1745635ec5ba0c9f1c2ede15414c6507d29ffe37e790a079b",
+- },
+- {
+- "6",
+- "1f2483f82572251fca975fea40db821df8ad82a3c002ee6c57112408",
+- "89faf0ccb750d99b553c574fad7ecfb0438586eb3952af5b4b153c7e",
+- },
+- {
+- "7",
+- "db2f6be630e246a5cf7d99b85194b123d487e2d466b94b24a03c3e28",
+- "f3a30085497f2f611ee2517b163ef8c53b715d18bb4e4808d02b963",
+- },
+- {
+- "8",
+- "858e6f9cc6c12c31f5df124aa77767b05c8bc021bd683d2b55571550",
+- "46dcd3ea5c43898c5c5fc4fdac7db39c2f02ebee4e3541d1e78047a",
+- },
+- {
+- "9",
+- "2fdcccfee720a77ef6cb3bfbb447f9383117e3daa4a07e36ed15f78d",
+- "371732e4f41bf4f7883035e6a79fcedc0e196eb07b48171697517463",
+- },
+- {
+- "10",
+- "aea9e17a306517eb89152aa7096d2c381ec813c51aa880e7bee2c0fd",
+- "39bb30eab337e0a521b6cba1abe4b2b3a3e524c14a3fe3eb116b655f",
+- },
+- {
+- "11",
+- "ef53b6294aca431f0f3c22dc82eb9050324f1d88d377e716448e507c",
+- "20b510004092e96636cfb7e32efded8265c266dfb754fa6d6491a6da",
+- },
+- {
+- "12",
+- "6e31ee1dc137f81b056752e4deab1443a481033e9b4c93a3044f4f7a",
+- "207dddf0385bfdeab6e9acda8da06b3bbef224a93ab1e9e036109d13",
+- },
+- {
+- "13",
+- "34e8e17a430e43289793c383fac9774247b40e9ebd3366981fcfaeca",
+- "252819f71c7fb7fbcb159be337d37d3336d7feb963724fdfb0ecb767",
+- },
+- {
+- "14",
+- "a53640c83dc208603ded83e4ecf758f24c357d7cf48088b2ce01e9fa",
+- "d5814cd724199c4a5b974a43685fbf5b8bac69459c9469bc8f23ccaf",
+- },
+- {
+- "15",
+- "baa4d8635511a7d288aebeedd12ce529ff102c91f97f867e21916bf9",
+- "979a5f4759f80f4fb4ec2e34f5566d595680a11735e7b61046127989",
+- },
+- {
+- "16",
+- "b6ec4fe1777382404ef679997ba8d1cc5cd8e85349259f590c4c66d",
+- "3399d464345906b11b00e363ef429221f2ec720d2f665d7dead5b482",
+- },
+- {
+- "17",
+- "b8357c3a6ceef288310e17b8bfeff9200846ca8c1942497c484403bc",
+- "ff149efa6606a6bd20ef7d1b06bd92f6904639dce5174db6cc554a26",
+- },
+- {
+- "18",
+- "c9ff61b040874c0568479216824a15eab1a838a797d189746226e4cc",
+- "ea98d60e5ffc9b8fcf999fab1df7e7ef7084f20ddb61bb045a6ce002",
+- },
+- {
+- "19",
+- "a1e81c04f30ce201c7c9ace785ed44cc33b455a022f2acdbc6cae83c",
+- "dcf1f6c3db09c70acc25391d492fe25b4a180babd6cea356c04719cd",
+- },
+- {
+- "20",
+- "fcc7f2b45df1cd5a3c0c0731ca47a8af75cfb0347e8354eefe782455",
+- "d5d7110274cba7cdee90e1a8b0d394c376a5573db6be0bf2747f530",
+- },
+- {
+- "112233445566778899",
+- "61f077c6f62ed802dad7c2f38f5c67f2cc453601e61bd076bb46179e",
+- "2272f9e9f5933e70388ee652513443b5e289dd135dcc0d0299b225e4",
+- },
+- {
+- "112233445566778899112233445566778899",
+- "29895f0af496bfc62b6ef8d8a65c88c613949b03668aab4f0429e35",
+- "3ea6e53f9a841f2019ec24bde1a75677aa9b5902e61081c01064de93",
+- },
+- {
+- "6950511619965839450988900688150712778015737983940691968051900319680",
+- "ab689930bcae4a4aa5f5cb085e823e8ae30fd365eb1da4aba9cf0379",
+- "3345a121bbd233548af0d210654eb40bab788a03666419be6fbd34e7",
+- },
+- {
+- "13479972933410060327035789020509431695094902435494295338570602119423",
+- "bdb6a8817c1f89da1c2f3dd8e97feb4494f2ed302a4ce2bc7f5f4025",
+- "4c7020d57c00411889462d77a5438bb4e97d177700bf7243a07f1680",
+- },
+- {
+- "13479971751745682581351455311314208093898607229429740618390390702079",
+- "d58b61aa41c32dd5eba462647dba75c5d67c83606c0af2bd928446a9",
+- "d24ba6a837be0460dd107ae77725696d211446c5609b4595976b16bd",
+- },
+- {
+- "13479972931865328106486971546324465392952975980343228160962702868479",
+- "dc9fa77978a005510980e929a1485f63716df695d7a0c18bb518df03",
+- "ede2b016f2ddffc2a8c015b134928275ce09e5661b7ab14ce0d1d403",
+- },
+- {
+- "11795773708834916026404142434151065506931607341523388140225443265536",
+- "499d8b2829cfb879c901f7d85d357045edab55028824d0f05ba279ba",
+- "bf929537b06e4015919639d94f57838fa33fc3d952598dcdbb44d638",
+- },
+- {
+- "784254593043826236572847595991346435467177662189391577090",
+- "8246c999137186632c5f9eddf3b1b0e1764c5e8bd0e0d8a554b9cb77",
+- "e80ed8660bc1cb17ac7d845be40a7a022d3306f116ae9f81fea65947",
+- },
+- {
+- "13479767645505654746623887797783387853576174193480695826442858012671",
+- "6670c20afcceaea672c97f75e2e9dd5c8460e54bb38538ebb4bd30eb",
+- "f280d8008d07a4caf54271f993527d46ff3ff46fd1190a3f1faa4f74",
+- },
+- {
+- "205688069665150753842126177372015544874550518966168735589597183",
+- "eca934247425cfd949b795cb5ce1eff401550386e28d1a4c5a8eb",
+- "d4c01040dba19628931bc8855370317c722cbd9ca6156985f1c2e9ce",
+- },
+- {
+- "13479966930919337728895168462090683249159702977113823384618282123295",
+- "ef353bf5c73cd551b96d596fbc9a67f16d61dd9fe56af19de1fba9cd",
+- "21771b9cdce3e8430c09b3838be70b48c21e15bc09ee1f2d7945b91f",
+- },
+- {
+- "50210731791415612487756441341851895584393717453129007497216",
+- "4036052a3091eb481046ad3289c95d3ac905ca0023de2c03ecd451cf",
+- "d768165a38a2b96f812586a9d59d4136035d9c853a5bf2e1c86a4993",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368041",
+- "fcc7f2b45df1cd5a3c0c0731ca47a8af75cfb0347e8354eefe782455",
+- "f2a28eefd8b345832116f1e574f2c6b2c895aa8c24941f40d8b80ad1",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368042",
+- "a1e81c04f30ce201c7c9ace785ed44cc33b455a022f2acdbc6cae83c",
+- "230e093c24f638f533dac6e2b6d01da3b5e7f45429315ca93fb8e634",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368043",
+- "c9ff61b040874c0568479216824a15eab1a838a797d189746226e4cc",
+- "156729f1a003647030666054e208180f8f7b0df2249e44fba5931fff",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368044",
+- "b8357c3a6ceef288310e17b8bfeff9200846ca8c1942497c484403bc",
+- "eb610599f95942df1082e4f9426d086fb9c6231ae8b24933aab5db",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368045",
+- "b6ec4fe1777382404ef679997ba8d1cc5cd8e85349259f590c4c66d",
+- "cc662b9bcba6f94ee4ff1c9c10bd6ddd0d138df2d099a282152a4b7f",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368046",
+- "baa4d8635511a7d288aebeedd12ce529ff102c91f97f867e21916bf9",
+- "6865a0b8a607f0b04b13d1cb0aa992a5a97f5ee8ca1849efb9ed8678",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368047",
+- "a53640c83dc208603ded83e4ecf758f24c357d7cf48088b2ce01e9fa",
+- "2a7eb328dbe663b5a468b5bc97a040a3745396ba636b964370dc3352",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368048",
+- "34e8e17a430e43289793c383fac9774247b40e9ebd3366981fcfaeca",
+- "dad7e608e380480434ea641cc82c82cbc92801469c8db0204f13489a",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368049",
+- "6e31ee1dc137f81b056752e4deab1443a481033e9b4c93a3044f4f7a",
+- "df82220fc7a4021549165325725f94c3410ddb56c54e161fc9ef62ee",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368050",
+- "ef53b6294aca431f0f3c22dc82eb9050324f1d88d377e716448e507c",
+- "df4aefffbf6d1699c930481cd102127c9a3d992048ab05929b6e5927",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368051",
+- "aea9e17a306517eb89152aa7096d2c381ec813c51aa880e7bee2c0fd",
+- "c644cf154cc81f5ade49345e541b4d4b5c1adb3eb5c01c14ee949aa2",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368052",
+- "2fdcccfee720a77ef6cb3bfbb447f9383117e3daa4a07e36ed15f78d",
+- "c8e8cd1b0be40b0877cfca1958603122f1e6914f84b7e8e968ae8b9e",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368053",
+- "858e6f9cc6c12c31f5df124aa77767b05c8bc021bd683d2b55571550",
+- "fb9232c15a3bc7673a3a03b0253824c53d0fd1411b1cabe2e187fb87",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368054",
+- "db2f6be630e246a5cf7d99b85194b123d487e2d466b94b24a03c3e28",
+- "f0c5cff7ab680d09ee11dae84e9c1072ac48ea2e744b1b7f72fd469e",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368055",
+- "1f2483f82572251fca975fea40db821df8ad82a3c002ee6c57112408",
+- "76050f3348af2664aac3a8b05281304ebc7a7914c6ad50a4b4eac383",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368056",
+- "31c49ae75bce7807cdff22055d94ee9021fedbb5ab51c57526f011aa",
+- "d817400e8ba9ca13a45f360e3d121eaaeb39af82d6001c8186f5f866",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368057",
+- "ae99feebb5d26945b54892092a8aee02912930fa41cd114e40447301",
+- "fb7da7f5f13a43b81774373c879cd32d6934c05fa758eeb14fcfab38",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368058",
+- "df1b1d66a551d0d31eff822558b9d2cc75c2180279fe0d08fd896d04",
+- "5c080fc3522f41bbb3f55a97cfecf21f882ce8cbb1e50ca6e67e56dc",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368059",
+- "706a46dc76dcb76798e60e6d89474788d16dc18032d268fd1a704fa6",
+- "e3d4895843da188fd58fb0567976d7b50359d6b78530c8f62d1b1746",
+- },
+- {
+- "26959946667150639794667015087019625940457807714424391721682722368060",
+- "b70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21",
+- "42c89c774a08dc04b3dd201932bc8a5ea5f8b89bbb2a7e667aff81cd",
+- },
+-}
+-
+-func TestBaseMult(t *testing.T) {
+- p224 := P224()
+- for i, e := range p224BaseMultTests {
+- k, ok := new(big.Int).SetString(e.k, 10)
+- if !ok {
+- t.Errorf("%d: bad value for k: %s", i, e.k)
+- }
+- x, y := p224.ScalarBaseMult(k.Bytes())
+- if fmt.Sprintf("%x", x) != e.x || fmt.Sprintf("%x", y) != e.y {
+- t.Errorf("%d: bad output for k=%s: got (%x, %x), want (%s, %s)", i, e.k, x, y, e.x, e.y)
+- }
+- if testing.Short() && i > 5 {
+- break
+- }
+- }
+-}
+-
+-func TestGenericBaseMult(t *testing.T) {
+- // We use the P224 CurveParams directly in order to test the generic implementation.
+- p224 := P224().Params()
+- for i, e := range p224BaseMultTests {
+- k, ok := new(big.Int).SetString(e.k, 10)
+- if !ok {
+- t.Errorf("%d: bad value for k: %s", i, e.k)
+- }
+- x, y := p224.ScalarBaseMult(k.Bytes())
+- if fmt.Sprintf("%x", x) != e.x || fmt.Sprintf("%x", y) != e.y {
+- t.Errorf("%d: bad output for k=%s: got (%x, %x), want (%s, %s)", i, e.k, x, y, e.x, e.y)
+- }
+- if testing.Short() && i > 5 {
+- break
+- }
+- }
+-}
+-
+ func TestInfinity(t *testing.T) {
+ tests := []struct {
+ name string
+ curve Curve
+ }{
+- {"p224", P224()},
+ {"p256", P256()},
+ }
+
+@@ -359,43 +44,3 @@ func TestInfinity(t *testing.T) {
+ }
+ }
+ }
+-
+-func BenchmarkBaseMult(b *testing.B) {
+- b.ResetTimer()
+- p224 := P224()
+- e := p224BaseMultTests[25]
+- k, _ := new(big.Int).SetString(e.k, 10)
+- b.StartTimer()
+- for i := 0; i < b.N; i++ {
+- p224.ScalarBaseMult(k.Bytes())
+- }
+-}
+-
+-func TestMarshal(t *testing.T) {
+- p224 := P224()
+- _, x, y, err := GenerateKey(p224, rand.Reader)
+- if err != nil {
+- t.Error(err)
+- return
+- }
+- serialized := Marshal(p224, x, y)
+- xx, yy := Unmarshal(p224, serialized)
+- if xx == nil {
+- t.Error("failed to unmarshal")
+- return
+- }
+- if xx.Cmp(x) != 0 || yy.Cmp(y) != 0 {
+- t.Error("unmarshal returned different values")
+- return
+- }
+-}
+-
+-func TestP224Overflow(t *testing.T) {
+- // This tests for a specific bug in the P224 implementation.
+- p224 := P224()
+- pointData, _ := hex.DecodeString("049B535B45FB0A2072398A6831834624C7E32CCFD5A4B933BCEAF77F1DD945E08BBE5178F5EDF5E733388F196D2A631D2E075BB16CBFEEA15B")
+- x, y := Unmarshal(p224, pointData)
+- if !p224.IsOnCurve(x, y) {
+- t.Error("P224 failed to validate a correct point")
+- }
+-}
+--- libgo/go/crypto/ecdsa/ecdsa_test.go.jj 2012-12-13 11:32:02.589039782 +0100
++++ libgo/go/crypto/ecdsa/ecdsa_test.go 2014-02-18 17:28:22.909692022 +0100
+@@ -33,7 +33,6 @@ func testKeyGeneration(t *testing.T, c e
+ }
+
+ func TestKeyGeneration(t *testing.T) {
+- testKeyGeneration(t, elliptic.P224(), "p224")
+ if testing.Short() {
+ return
+ }
+@@ -63,7 +62,6 @@ func testSignAndVerify(t *testing.T, c e
+ }
+
+ func TestSignAndVerify(t *testing.T) {
+- testSignAndVerify(t, elliptic.P224(), "p224")
+ if testing.Short() {
+ return
+ }
+@@ -129,8 +127,6 @@ func TestVectors(t *testing.T) {
+ parts := strings.SplitN(line, ",", 2)
+
+ switch parts[0] {
+- case "P-224":
+- pub.Curve = elliptic.P224()
+ case "P-256":
+ pub.Curve = elliptic.P256()
+ case "P-384":
+--- libgo/go/crypto/x509/x509.go.jj 2013-08-14 13:55:08.939843607 +0200
++++ libgo/go/crypto/x509/x509.go 2014-02-18 17:28:22.943691764 +0100
+@@ -283,9 +283,6 @@ func getPublicKeyAlgorithmFromOID(oid as
+
+ // RFC 5480, 2.1.1.1. Named Curve
+ //
+-// secp224r1 OBJECT IDENTIFIER ::= {
+-// iso(1) identified-organization(3) certicom(132) curve(0) 33 }
+-//
+ // secp256r1 OBJECT IDENTIFIER ::= {
+ // iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3)
+ // prime(1) 7 }
+@@ -298,7 +295,6 @@ func getPublicKeyAlgorithmFromOID(oid as
+ //
+ // NB: secp256r1 is equivalent to prime256v1
+ var (
+- oidNamedCurveP224 = asn1.ObjectIdentifier{1, 3, 132, 0, 33}
+ oidNamedCurveP256 = asn1.ObjectIdentifier{1, 2, 840, 10045, 3, 1, 7}
+ oidNamedCurveP384 = asn1.ObjectIdentifier{1, 3, 132, 0, 34}
+ oidNamedCurveP521 = asn1.ObjectIdentifier{1, 3, 132, 0, 35}
+@@ -306,8 +302,6 @@ var (
+
+ func namedCurveFromOID(oid asn1.ObjectIdentifier) elliptic.Curve {
+ switch {
+- case oid.Equal(oidNamedCurveP224):
+- return elliptic.P224()
+ case oid.Equal(oidNamedCurveP256):
+ return elliptic.P256()
+ case oid.Equal(oidNamedCurveP384):
+@@ -320,8 +314,6 @@ func namedCurveFromOID(oid asn1.ObjectId
+
+ func oidFromNamedCurve(curve elliptic.Curve) (asn1.ObjectIdentifier, bool) {
+ switch curve {
+- case elliptic.P224():
+- return oidNamedCurveP224, true
+ case elliptic.P256():
+ return oidNamedCurveP256, true
+ case elliptic.P384():
+@@ -1212,7 +1204,7 @@ func CreateCertificate(rand io.Reader, t
+ hashFunc = crypto.SHA1
+ case *ecdsa.PrivateKey:
+ switch priv.Curve {
+- case elliptic.P224(), elliptic.P256():
++ case elliptic.P256():
+ hashFunc = crypto.SHA256
+ signatureAlgorithm.Algorithm = oidSignatureECDSAWithSHA256
+ case elliptic.P384():
+--- libgo/go/crypto/elliptic/p224.go.jj 2012-12-13 11:32:02.641039533 +0100
++++ libgo/go/crypto/elliptic/p224.go 2014-02-15 11:40:56.191557928 +0100
+@@ -1,765 +0,0 @@
+-// Copyright 2012 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package elliptic
+-
+-// This is a constant-time, 32-bit implementation of P224. See FIPS 186-3,
+-// section D.2.2.
+-//
+-// See http://www.imperialviolet.org/2010/12/04/ecc.html ([1]) for background.
+-
+-import (
+- "math/big"
+-)
+-
+-var p224 p224Curve
+-
+-type p224Curve struct {
+- *CurveParams
+- gx, gy, b p224FieldElement
+-}
+-
+-func initP224() {
+- // See FIPS 186-3, section D.2.2
+- p224.CurveParams = new(CurveParams)
+- p224.P, _ = new(big.Int).SetString("26959946667150639794667015087019630673557916260026308143510066298881", 10)
+- p224.N, _ = new(big.Int).SetString("26959946667150639794667015087019625940457807714424391721682722368061", 10)
+- p224.B, _ = new(big.Int).SetString("b4050a850c04b3abf54132565044b0b7d7bfd8ba270b39432355ffb4", 16)
+- p224.Gx, _ = new(big.Int).SetString("b70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21", 16)
+- p224.Gy, _ = new(big.Int).SetString("bd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34", 16)
+- p224.BitSize = 224
+-
+- p224FromBig(&p224.gx, p224.Gx)
+- p224FromBig(&p224.gy, p224.Gy)
+- p224FromBig(&p224.b, p224.B)
+-}
+-
+-// P224 returns a Curve which implements P-224 (see FIPS 186-3, section D.2.2)
+-func P224() Curve {
+- initonce.Do(initAll)
+- return p224
+-}
+-
+-func (curve p224Curve) Params() *CurveParams {
+- return curve.CurveParams
+-}
+-
+-func (curve p224Curve) IsOnCurve(bigX, bigY *big.Int) bool {
+- var x, y p224FieldElement
+- p224FromBig(&x, bigX)
+- p224FromBig(&y, bigY)
+-
+- // y² = x³ - 3x + b
+- var tmp p224LargeFieldElement
+- var x3 p224FieldElement
+- p224Square(&x3, &x, &tmp)
+- p224Mul(&x3, &x3, &x, &tmp)
+-
+- for i := 0; i < 8; i++ {
+- x[i] *= 3
+- }
+- p224Sub(&x3, &x3, &x)
+- p224Reduce(&x3)
+- p224Add(&x3, &x3, &curve.b)
+- p224Contract(&x3, &x3)
+-
+- p224Square(&y, &y, &tmp)
+- p224Contract(&y, &y)
+-
+- for i := 0; i < 8; i++ {
+- if y[i] != x3[i] {
+- return false
+- }
+- }
+- return true
+-}
+-
+-func (p224Curve) Add(bigX1, bigY1, bigX2, bigY2 *big.Int) (x, y *big.Int) {
+- var x1, y1, z1, x2, y2, z2, x3, y3, z3 p224FieldElement
+-
+- p224FromBig(&x1, bigX1)
+- p224FromBig(&y1, bigY1)
+- if bigX1.Sign() != 0 || bigY1.Sign() != 0 {
+- z1[0] = 1
+- }
+- p224FromBig(&x2, bigX2)
+- p224FromBig(&y2, bigY2)
+- if bigX2.Sign() != 0 || bigY2.Sign() != 0 {
+- z2[0] = 1
+- }
+-
+- p224AddJacobian(&x3, &y3, &z3, &x1, &y1, &z1, &x2, &y2, &z2)
+- return p224ToAffine(&x3, &y3, &z3)
+-}
+-
+-func (p224Curve) Double(bigX1, bigY1 *big.Int) (x, y *big.Int) {
+- var x1, y1, z1, x2, y2, z2 p224FieldElement
+-
+- p224FromBig(&x1, bigX1)
+- p224FromBig(&y1, bigY1)
+- z1[0] = 1
+-
+- p224DoubleJacobian(&x2, &y2, &z2, &x1, &y1, &z1)
+- return p224ToAffine(&x2, &y2, &z2)
+-}
+-
+-func (p224Curve) ScalarMult(bigX1, bigY1 *big.Int, scalar []byte) (x, y *big.Int) {
+- var x1, y1, z1, x2, y2, z2 p224FieldElement
+-
+- p224FromBig(&x1, bigX1)
+- p224FromBig(&y1, bigY1)
+- z1[0] = 1
+-
+- p224ScalarMult(&x2, &y2, &z2, &x1, &y1, &z1, scalar)
+- return p224ToAffine(&x2, &y2, &z2)
+-}
+-
+-func (curve p224Curve) ScalarBaseMult(scalar []byte) (x, y *big.Int) {
+- var z1, x2, y2, z2 p224FieldElement
+-
+- z1[0] = 1
+- p224ScalarMult(&x2, &y2, &z2, &curve.gx, &curve.gy, &z1, scalar)
+- return p224ToAffine(&x2, &y2, &z2)
+-}
+-
+-// Field element functions.
+-//
+-// The field that we're dealing with is ℤ/pℤ where p = 2**224 - 2**96 + 1.
+-//
+-// Field elements are represented by a FieldElement, which is a typedef to an
+-// array of 8 uint32's. The value of a FieldElement, a, is:
+-// a[0] + 2**28·a[1] + 2**56·a[1] + ... + 2**196·a[7]
+-//
+-// Using 28-bit limbs means that there's only 4 bits of headroom, which is less
+-// than we would really like. But it has the useful feature that we hit 2**224
+-// exactly, making the reflections during a reduce much nicer.
+-type p224FieldElement [8]uint32
+-
+-// p224P is the order of the field, represented as a p224FieldElement.
+-var p224P = [8]uint32{1, 0, 0, 0xffff000, 0xfffffff, 0xfffffff, 0xfffffff, 0xfffffff}
+-
+-// p224IsZero returns 1 if a == 0 mod p and 0 otherwise.
+-//
+-// a[i] < 2**29
+-func p224IsZero(a *p224FieldElement) uint32 {
+- // Since a p224FieldElement contains 224 bits there are two possible
+- // representations of 0: 0 and p.
+- var minimal p224FieldElement
+- p224Contract(&minimal, a)
+-
+- var isZero, isP uint32
+- for i, v := range minimal {
+- isZero |= v
+- isP |= v - p224P[i]
+- }
+-
+- // If either isZero or isP is 0, then we should return 1.
+- isZero |= isZero >> 16
+- isZero |= isZero >> 8
+- isZero |= isZero >> 4
+- isZero |= isZero >> 2
+- isZero |= isZero >> 1
+-
+- isP |= isP >> 16
+- isP |= isP >> 8
+- isP |= isP >> 4
+- isP |= isP >> 2
+- isP |= isP >> 1
+-
+- // For isZero and isP, the LSB is 0 iff all the bits are zero.
+- result := isZero & isP
+- result = (^result) & 1
+-
+- return result
+-}
+-
+-// p224Add computes *out = a+b
+-//
+-// a[i] + b[i] < 2**32
+-func p224Add(out, a, b *p224FieldElement) {
+- for i := 0; i < 8; i++ {
+- out[i] = a[i] + b[i]
+- }
+-}
+-
+-const two31p3 = 1<<31 + 1<<3
+-const two31m3 = 1<<31 - 1<<3
+-const two31m15m3 = 1<<31 - 1<<15 - 1<<3
+-
+-// p224ZeroModP31 is 0 mod p where bit 31 is set in all limbs so that we can
+-// subtract smaller amounts without underflow. See the section "Subtraction" in
+-// [1] for reasoning.
+-var p224ZeroModP31 = []uint32{two31p3, two31m3, two31m3, two31m15m3, two31m3, two31m3, two31m3, two31m3}
+-
+-// p224Sub computes *out = a-b
+-//
+-// a[i], b[i] < 2**30
+-// out[i] < 2**32
+-func p224Sub(out, a, b *p224FieldElement) {
+- for i := 0; i < 8; i++ {
+- out[i] = a[i] + p224ZeroModP31[i] - b[i]
+- }
+-}
+-
+-// LargeFieldElement also represents an element of the field. The limbs are
+-// still spaced 28-bits apart and in little-endian order. So the limbs are at
+-// 0, 28, 56, ..., 392 bits, each 64-bits wide.
+-type p224LargeFieldElement [15]uint64
+-
+-const two63p35 = 1<<63 + 1<<35
+-const two63m35 = 1<<63 - 1<<35
+-const two63m35m19 = 1<<63 - 1<<35 - 1<<19
+-
+-// p224ZeroModP63 is 0 mod p where bit 63 is set in all limbs. See the section
+-// "Subtraction" in [1] for why.
+-var p224ZeroModP63 = [8]uint64{two63p35, two63m35, two63m35, two63m35, two63m35m19, two63m35, two63m35, two63m35}
+-
+-const bottom12Bits = 0xfff
+-const bottom28Bits = 0xfffffff
+-
+-// p224Mul computes *out = a*b
+-//
+-// a[i] < 2**29, b[i] < 2**30 (or vice versa)
+-// out[i] < 2**29
+-func p224Mul(out, a, b *p224FieldElement, tmp *p224LargeFieldElement) {
+- for i := 0; i < 15; i++ {
+- tmp[i] = 0
+- }
+-
+- for i := 0; i < 8; i++ {
+- for j := 0; j < 8; j++ {
+- tmp[i+j] += uint64(a[i]) * uint64(b[j])
+- }
+- }
+-
+- p224ReduceLarge(out, tmp)
+-}
+-
+-// Square computes *out = a*a
+-//
+-// a[i] < 2**29
+-// out[i] < 2**29
+-func p224Square(out, a *p224FieldElement, tmp *p224LargeFieldElement) {
+- for i := 0; i < 15; i++ {
+- tmp[i] = 0
+- }
+-
+- for i := 0; i < 8; i++ {
+- for j := 0; j <= i; j++ {
+- r := uint64(a[i]) * uint64(a[j])
+- if i == j {
+- tmp[i+j] += r
+- } else {
+- tmp[i+j] += r << 1
+- }
+- }
+- }
+-
+- p224ReduceLarge(out, tmp)
+-}
+-
+-// ReduceLarge converts a p224LargeFieldElement to a p224FieldElement.
+-//
+-// in[i] < 2**62
+-func p224ReduceLarge(out *p224FieldElement, in *p224LargeFieldElement) {
+- for i := 0; i < 8; i++ {
+- in[i] += p224ZeroModP63[i]
+- }
+-
+- // Eliminate the coefficients at 2**224 and greater.
+- for i := 14; i >= 8; i-- {
+- in[i-8] -= in[i]
+- in[i-5] += (in[i] & 0xffff) << 12
+- in[i-4] += in[i] >> 16
+- }
+- in[8] = 0
+- // in[0..8] < 2**64
+-
+- // As the values become small enough, we start to store them in |out|
+- // and use 32-bit operations.
+- for i := 1; i < 8; i++ {
+- in[i+1] += in[i] >> 28
+- out[i] = uint32(in[i] & bottom28Bits)
+- }
+- in[0] -= in[8]
+- out[3] += uint32(in[8]&0xffff) << 12
+- out[4] += uint32(in[8] >> 16)
+- // in[0] < 2**64
+- // out[3] < 2**29
+- // out[4] < 2**29
+- // out[1,2,5..7] < 2**28
+-
+- out[0] = uint32(in[0] & bottom28Bits)
+- out[1] += uint32((in[0] >> 28) & bottom28Bits)
+- out[2] += uint32(in[0] >> 56)
+- // out[0] < 2**28
+- // out[1..4] < 2**29
+- // out[5..7] < 2**28
+-}
+-
+-// Reduce reduces the coefficients of a to smaller bounds.
+-//
+-// On entry: a[i] < 2**31 + 2**30
+-// On exit: a[i] < 2**29
+-func p224Reduce(a *p224FieldElement) {
+- for i := 0; i < 7; i++ {
+- a[i+1] += a[i] >> 28
+- a[i] &= bottom28Bits
+- }
+- top := a[7] >> 28
+- a[7] &= bottom28Bits
+-
+- // top < 2**4
+- mask := top
+- mask |= mask >> 2
+- mask |= mask >> 1
+- mask <<= 31
+- mask = uint32(int32(mask) >> 31)
+- // Mask is all ones if top != 0, all zero otherwise
+-
+- a[0] -= top
+- a[3] += top << 12
+-
+- // We may have just made a[0] negative but, if we did, then we must
+- // have added something to a[3], this it's > 2**12. Therefore we can
+- // carry down to a[0].
+- a[3] -= 1 & mask
+- a[2] += mask & (1<<28 - 1)
+- a[1] += mask & (1<<28 - 1)
+- a[0] += mask & (1 << 28)
+-}
+-
+-// p224Invert calculates *out = in**-1 by computing in**(2**224 - 2**96 - 1),
+-// i.e. Fermat's little theorem.
+-func p224Invert(out, in *p224FieldElement) {
+- var f1, f2, f3, f4 p224FieldElement
+- var c p224LargeFieldElement
+-
+- p224Square(&f1, in, &c) // 2
+- p224Mul(&f1, &f1, in, &c) // 2**2 - 1
+- p224Square(&f1, &f1, &c) // 2**3 - 2
+- p224Mul(&f1, &f1, in, &c) // 2**3 - 1
+- p224Square(&f2, &f1, &c) // 2**4 - 2
+- p224Square(&f2, &f2, &c) // 2**5 - 4
+- p224Square(&f2, &f2, &c) // 2**6 - 8
+- p224Mul(&f1, &f1, &f2, &c) // 2**6 - 1
+- p224Square(&f2, &f1, &c) // 2**7 - 2
+- for i := 0; i < 5; i++ { // 2**12 - 2**6
+- p224Square(&f2, &f2, &c)
+- }
+- p224Mul(&f2, &f2, &f1, &c) // 2**12 - 1
+- p224Square(&f3, &f2, &c) // 2**13 - 2
+- for i := 0; i < 11; i++ { // 2**24 - 2**12
+- p224Square(&f3, &f3, &c)
+- }
+- p224Mul(&f2, &f3, &f2, &c) // 2**24 - 1
+- p224Square(&f3, &f2, &c) // 2**25 - 2
+- for i := 0; i < 23; i++ { // 2**48 - 2**24
+- p224Square(&f3, &f3, &c)
+- }
+- p224Mul(&f3, &f3, &f2, &c) // 2**48 - 1
+- p224Square(&f4, &f3, &c) // 2**49 - 2
+- for i := 0; i < 47; i++ { // 2**96 - 2**48
+- p224Square(&f4, &f4, &c)
+- }
+- p224Mul(&f3, &f3, &f4, &c) // 2**96 - 1
+- p224Square(&f4, &f3, &c) // 2**97 - 2
+- for i := 0; i < 23; i++ { // 2**120 - 2**24
+- p224Square(&f4, &f4, &c)
+- }
+- p224Mul(&f2, &f4, &f2, &c) // 2**120 - 1
+- for i := 0; i < 6; i++ { // 2**126 - 2**6
+- p224Square(&f2, &f2, &c)
+- }
+- p224Mul(&f1, &f1, &f2, &c) // 2**126 - 1
+- p224Square(&f1, &f1, &c) // 2**127 - 2
+- p224Mul(&f1, &f1, in, &c) // 2**127 - 1
+- for i := 0; i < 97; i++ { // 2**224 - 2**97
+- p224Square(&f1, &f1, &c)
+- }
+- p224Mul(out, &f1, &f3, &c) // 2**224 - 2**96 - 1
+-}
+-
+-// p224Contract converts a FieldElement to its unique, minimal form.
+-//
+-// On entry, in[i] < 2**29
+-// On exit, in[i] < 2**28
+-func p224Contract(out, in *p224FieldElement) {
+- copy(out[:], in[:])
+-
+- for i := 0; i < 7; i++ {
+- out[i+1] += out[i] >> 28
+- out[i] &= bottom28Bits
+- }
+- top := out[7] >> 28
+- out[7] &= bottom28Bits
+-
+- out[0] -= top
+- out[3] += top << 12
+-
+- // We may just have made out[i] negative. So we carry down. If we made
+- // out[0] negative then we know that out[3] is sufficiently positive
+- // because we just added to it.
+- for i := 0; i < 3; i++ {
+- mask := uint32(int32(out[i]) >> 31)
+- out[i] += (1 << 28) & mask
+- out[i+1] -= 1 & mask
+- }
+-
+- // We might have pushed out[3] over 2**28 so we perform another, partial,
+- // carry chain.
+- for i := 3; i < 7; i++ {
+- out[i+1] += out[i] >> 28
+- out[i] &= bottom28Bits
+- }
+- top = out[7] >> 28
+- out[7] &= bottom28Bits
+-
+- // Eliminate top while maintaining the same value mod p.
+- out[0] -= top
+- out[3] += top << 12
+-
+- // There are two cases to consider for out[3]:
+- // 1) The first time that we eliminated top, we didn't push out[3] over
+- // 2**28. In this case, the partial carry chain didn't change any values
+- // and top is zero.
+- // 2) We did push out[3] over 2**28 the first time that we eliminated top.
+- // The first value of top was in [0..16), therefore, prior to eliminating
+- // the first top, 0xfff1000 <= out[3] <= 0xfffffff. Therefore, after
+- // overflowing and being reduced by the second carry chain, out[3] <=
+- // 0xf000. Thus it cannot have overflowed when we eliminated top for the
+- // second time.
+-
+- // Again, we may just have made out[0] negative, so do the same carry down.
+- // As before, if we made out[0] negative then we know that out[3] is
+- // sufficiently positive.
+- for i := 0; i < 3; i++ {
+- mask := uint32(int32(out[i]) >> 31)
+- out[i] += (1 << 28) & mask
+- out[i+1] -= 1 & mask
+- }
+-
+- // Now we see if the value is >= p and, if so, subtract p.
+-
+- // First we build a mask from the top four limbs, which must all be
+- // equal to bottom28Bits if the whole value is >= p. If top4AllOnes
+- // ends up with any zero bits in the bottom 28 bits, then this wasn't
+- // true.
+- top4AllOnes := uint32(0xffffffff)
+- for i := 4; i < 8; i++ {
+- top4AllOnes &= out[i]
+- }
+- top4AllOnes |= 0xf0000000
+- // Now we replicate any zero bits to all the bits in top4AllOnes.
+- top4AllOnes &= top4AllOnes >> 16
+- top4AllOnes &= top4AllOnes >> 8
+- top4AllOnes &= top4AllOnes >> 4
+- top4AllOnes &= top4AllOnes >> 2
+- top4AllOnes &= top4AllOnes >> 1
+- top4AllOnes = uint32(int32(top4AllOnes<<31) >> 31)
+-
+- // Now we test whether the bottom three limbs are non-zero.
+- bottom3NonZero := out[0] | out[1] | out[2]
+- bottom3NonZero |= bottom3NonZero >> 16
+- bottom3NonZero |= bottom3NonZero >> 8
+- bottom3NonZero |= bottom3NonZero >> 4
+- bottom3NonZero |= bottom3NonZero >> 2
+- bottom3NonZero |= bottom3NonZero >> 1
+- bottom3NonZero = uint32(int32(bottom3NonZero<<31) >> 31)
+-
+- // Everything depends on the value of out[3].
+- // If it's > 0xffff000 and top4AllOnes != 0 then the whole value is >= p
+- // If it's = 0xffff000 and top4AllOnes != 0 and bottom3NonZero != 0,
+- // then the whole value is >= p
+- // If it's < 0xffff000, then the whole value is < p
+- n := out[3] - 0xffff000
+- out3Equal := n
+- out3Equal |= out3Equal >> 16
+- out3Equal |= out3Equal >> 8
+- out3Equal |= out3Equal >> 4
+- out3Equal |= out3Equal >> 2
+- out3Equal |= out3Equal >> 1
+- out3Equal = ^uint32(int32(out3Equal<<31) >> 31)
+-
+- // If out[3] > 0xffff000 then n's MSB will be zero.
+- out3GT := ^uint32(int32(n) >> 31)
+-
+- mask := top4AllOnes & ((out3Equal & bottom3NonZero) | out3GT)
+- out[0] -= 1 & mask
+- out[3] -= 0xffff000 & mask
+- out[4] -= 0xfffffff & mask
+- out[5] -= 0xfffffff & mask
+- out[6] -= 0xfffffff & mask
+- out[7] -= 0xfffffff & mask
+-}
+-
+-// Group element functions.
+-//
+-// These functions deal with group elements. The group is an elliptic curve
+-// group with a = -3 defined in FIPS 186-3, section D.2.2.
+-
+-// p224AddJacobian computes *out = a+b where a != b.
+-func p224AddJacobian(x3, y3, z3, x1, y1, z1, x2, y2, z2 *p224FieldElement) {
+- // See http://hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-3.html#addition-p224Add-2007-bl
+- var z1z1, z2z2, u1, u2, s1, s2, h, i, j, r, v p224FieldElement
+- var c p224LargeFieldElement
+-
+- z1IsZero := p224IsZero(z1)
+- z2IsZero := p224IsZero(z2)
+-
+- // Z1Z1 = Z1²
+- p224Square(&z1z1, z1, &c)
+- // Z2Z2 = Z2²
+- p224Square(&z2z2, z2, &c)
+- // U1 = X1*Z2Z2
+- p224Mul(&u1, x1, &z2z2, &c)
+- // U2 = X2*Z1Z1
+- p224Mul(&u2, x2, &z1z1, &c)
+- // S1 = Y1*Z2*Z2Z2
+- p224Mul(&s1, z2, &z2z2, &c)
+- p224Mul(&s1, y1, &s1, &c)
+- // S2 = Y2*Z1*Z1Z1
+- p224Mul(&s2, z1, &z1z1, &c)
+- p224Mul(&s2, y2, &s2, &c)
+- // H = U2-U1
+- p224Sub(&h, &u2, &u1)
+- p224Reduce(&h)
+- xEqual := p224IsZero(&h)
+- // I = (2*H)²
+- for j := 0; j < 8; j++ {
+- i[j] = h[j] << 1
+- }
+- p224Reduce(&i)
+- p224Square(&i, &i, &c)
+- // J = H*I
+- p224Mul(&j, &h, &i, &c)
+- // r = 2*(S2-S1)
+- p224Sub(&r, &s2, &s1)
+- p224Reduce(&r)
+- yEqual := p224IsZero(&r)
+- if xEqual == 1 && yEqual == 1 && z1IsZero == 0 && z2IsZero == 0 {
+- p224DoubleJacobian(x3, y3, z3, x1, y1, z1)
+- return
+- }
+- for i := 0; i < 8; i++ {
+- r[i] <<= 1
+- }
+- p224Reduce(&r)
+- // V = U1*I
+- p224Mul(&v, &u1, &i, &c)
+- // Z3 = ((Z1+Z2)²-Z1Z1-Z2Z2)*H
+- p224Add(&z1z1, &z1z1, &z2z2)
+- p224Add(&z2z2, z1, z2)
+- p224Reduce(&z2z2)
+- p224Square(&z2z2, &z2z2, &c)
+- p224Sub(z3, &z2z2, &z1z1)
+- p224Reduce(z3)
+- p224Mul(z3, z3, &h, &c)
+- // X3 = r²-J-2*V
+- for i := 0; i < 8; i++ {
+- z1z1[i] = v[i] << 1
+- }
+- p224Add(&z1z1, &j, &z1z1)
+- p224Reduce(&z1z1)
+- p224Square(x3, &r, &c)
+- p224Sub(x3, x3, &z1z1)
+- p224Reduce(x3)
+- // Y3 = r*(V-X3)-2*S1*J
+- for i := 0; i < 8; i++ {
+- s1[i] <<= 1
+- }
+- p224Mul(&s1, &s1, &j, &c)
+- p224Sub(&z1z1, &v, x3)
+- p224Reduce(&z1z1)
+- p224Mul(&z1z1, &z1z1, &r, &c)
+- p224Sub(y3, &z1z1, &s1)
+- p224Reduce(y3)
+-
+- p224CopyConditional(x3, x2, z1IsZero)
+- p224CopyConditional(x3, x1, z2IsZero)
+- p224CopyConditional(y3, y2, z1IsZero)
+- p224CopyConditional(y3, y1, z2IsZero)
+- p224CopyConditional(z3, z2, z1IsZero)
+- p224CopyConditional(z3, z1, z2IsZero)
+-}
+-
+-// p224DoubleJacobian computes *out = a+a.
+-func p224DoubleJacobian(x3, y3, z3, x1, y1, z1 *p224FieldElement) {
+- var delta, gamma, beta, alpha, t p224FieldElement
+- var c p224LargeFieldElement
+-
+- p224Square(&delta, z1, &c)
+- p224Square(&gamma, y1, &c)
+- p224Mul(&beta, x1, &gamma, &c)
+-
+- // alpha = 3*(X1-delta)*(X1+delta)
+- p224Add(&t, x1, &delta)
+- for i := 0; i < 8; i++ {
+- t[i] += t[i] << 1
+- }
+- p224Reduce(&t)
+- p224Sub(&alpha, x1, &delta)
+- p224Reduce(&alpha)
+- p224Mul(&alpha, &alpha, &t, &c)
+-
+- // Z3 = (Y1+Z1)²-gamma-delta
+- p224Add(z3, y1, z1)
+- p224Reduce(z3)
+- p224Square(z3, z3, &c)
+- p224Sub(z3, z3, &gamma)
+- p224Reduce(z3)
+- p224Sub(z3, z3, &delta)
+- p224Reduce(z3)
+-
+- // X3 = alpha²-8*beta
+- for i := 0; i < 8; i++ {
+- delta[i] = beta[i] << 3
+- }
+- p224Reduce(&delta)
+- p224Square(x3, &alpha, &c)
+- p224Sub(x3, x3, &delta)
+- p224Reduce(x3)
+-
+- // Y3 = alpha*(4*beta-X3)-8*gamma²
+- for i := 0; i < 8; i++ {
+- beta[i] <<= 2
+- }
+- p224Sub(&beta, &beta, x3)
+- p224Reduce(&beta)
+- p224Square(&gamma, &gamma, &c)
+- for i := 0; i < 8; i++ {
+- gamma[i] <<= 3
+- }
+- p224Reduce(&gamma)
+- p224Mul(y3, &alpha, &beta, &c)
+- p224Sub(y3, y3, &gamma)
+- p224Reduce(y3)
+-}
+-
+-// p224CopyConditional sets *out = *in iff the least-significant-bit of control
+-// is true, and it runs in constant time.
+-func p224CopyConditional(out, in *p224FieldElement, control uint32) {
+- control <<= 31
+- control = uint32(int32(control) >> 31)
+-
+- for i := 0; i < 8; i++ {
+- out[i] ^= (out[i] ^ in[i]) & control
+- }
+-}
+-
+-func p224ScalarMult(outX, outY, outZ, inX, inY, inZ *p224FieldElement, scalar []byte) {
+- var xx, yy, zz p224FieldElement
+- for i := 0; i < 8; i++ {
+- outX[i] = 0
+- outY[i] = 0
+- outZ[i] = 0
+- }
+-
+- for _, byte := range scalar {
+- for bitNum := uint(0); bitNum < 8; bitNum++ {
+- p224DoubleJacobian(outX, outY, outZ, outX, outY, outZ)
+- bit := uint32((byte >> (7 - bitNum)) & 1)
+- p224AddJacobian(&xx, &yy, &zz, inX, inY, inZ, outX, outY, outZ)
+- p224CopyConditional(outX, &xx, bit)
+- p224CopyConditional(outY, &yy, bit)
+- p224CopyConditional(outZ, &zz, bit)
+- }
+- }
+-}
+-
+-// p224ToAffine converts from Jacobian to affine form.
+-func p224ToAffine(x, y, z *p224FieldElement) (*big.Int, *big.Int) {
+- var zinv, zinvsq, outx, outy p224FieldElement
+- var tmp p224LargeFieldElement
+-
+- if isPointAtInfinity := p224IsZero(z); isPointAtInfinity == 1 {
+- return new(big.Int), new(big.Int)
+- }
+-
+- p224Invert(&zinv, z)
+- p224Square(&zinvsq, &zinv, &tmp)
+- p224Mul(x, x, &zinvsq, &tmp)
+- p224Mul(&zinvsq, &zinvsq, &zinv, &tmp)
+- p224Mul(y, y, &zinvsq, &tmp)
+-
+- p224Contract(&outx, x)
+- p224Contract(&outy, y)
+- return p224ToBig(&outx), p224ToBig(&outy)
+-}
+-
+-// get28BitsFromEnd returns the least-significant 28 bits from buf>>shift,
+-// where buf is interpreted as a big-endian number.
+-func get28BitsFromEnd(buf []byte, shift uint) (uint32, []byte) {
+- var ret uint32
+-
+- for i := uint(0); i < 4; i++ {
+- var b byte
+- if l := len(buf); l > 0 {
+- b = buf[l-1]
+- // We don't remove the byte if we're about to return and we're not
+- // reading all of it.
+- if i != 3 || shift == 4 {
+- buf = buf[:l-1]
+- }
+- }
+- ret |= uint32(b) << (8 * i) >> shift
+- }
+- ret &= bottom28Bits
+- return ret, buf
+-}
+-
+-// p224FromBig sets *out = *in.
+-func p224FromBig(out *p224FieldElement, in *big.Int) {
+- bytes := in.Bytes()
+- out[0], bytes = get28BitsFromEnd(bytes, 0)
+- out[1], bytes = get28BitsFromEnd(bytes, 4)
+- out[2], bytes = get28BitsFromEnd(bytes, 0)
+- out[3], bytes = get28BitsFromEnd(bytes, 4)
+- out[4], bytes = get28BitsFromEnd(bytes, 0)
+- out[5], bytes = get28BitsFromEnd(bytes, 4)
+- out[6], bytes = get28BitsFromEnd(bytes, 0)
+- out[7], bytes = get28BitsFromEnd(bytes, 4)
+-}
+-
+-// p224ToBig returns in as a big.Int.
+-func p224ToBig(in *p224FieldElement) *big.Int {
+- var buf [28]byte
+- buf[27] = byte(in[0])
+- buf[26] = byte(in[0] >> 8)
+- buf[25] = byte(in[0] >> 16)
+- buf[24] = byte(((in[0] >> 24) & 0x0f) | (in[1]<<4)&0xf0)
+-
+- buf[23] = byte(in[1] >> 4)
+- buf[22] = byte(in[1] >> 12)
+- buf[21] = byte(in[1] >> 20)
+-
+- buf[20] = byte(in[2])
+- buf[19] = byte(in[2] >> 8)
+- buf[18] = byte(in[2] >> 16)
+- buf[17] = byte(((in[2] >> 24) & 0x0f) | (in[3]<<4)&0xf0)
+-
+- buf[16] = byte(in[3] >> 4)
+- buf[15] = byte(in[3] >> 12)
+- buf[14] = byte(in[3] >> 20)
+-
+- buf[13] = byte(in[4])
+- buf[12] = byte(in[4] >> 8)
+- buf[11] = byte(in[4] >> 16)
+- buf[10] = byte(((in[4] >> 24) & 0x0f) | (in[5]<<4)&0xf0)
+-
+- buf[9] = byte(in[5] >> 4)
+- buf[8] = byte(in[5] >> 12)
+- buf[7] = byte(in[5] >> 20)
+-
+- buf[6] = byte(in[6])
+- buf[5] = byte(in[6] >> 8)
+- buf[4] = byte(in[6] >> 16)
+- buf[3] = byte(((in[6] >> 24) & 0x0f) | (in[7]<<4)&0xf0)
+-
+- buf[2] = byte(in[7] >> 4)
+- buf[1] = byte(in[7] >> 12)
+- buf[0] = byte(in[7] >> 20)
+-
+- return new(big.Int).SetBytes(buf[:])
+-}
+--- libgo/go/crypto/elliptic/p224_test.go.jj 2014-02-18 18:03:31.615598561 +0100
++++ libgo/go/crypto/elliptic/p224_test.go 2014-02-15 11:40:56.191557928 +0100
+@@ -1,47 +0,0 @@
+-// Copyright 2012 The Go Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style
+-// license that can be found in the LICENSE file.
+-
+-package elliptic
+-
+-import (
+- "math/big"
+- "testing"
+-)
+-
+-var toFromBigTests = []string{
+- "0",
+- "1",
+- "23",
+- "b70e0cb46bb4bf7f321390b94a03c1d356c01122343280d6105c1d21",
+- "706a46d476dcb76798e6046d89474788d164c18032d268fd10704fa6",
+-}
+-
+-func p224AlternativeToBig(in *p224FieldElement) *big.Int {
+- ret := new(big.Int)
+- tmp := new(big.Int)
+-
+- for i := uint(0); i < 8; i++ {
+- tmp.SetInt64(int64(in[i]))
+- tmp.Lsh(tmp, 28*i)
+- ret.Add(ret, tmp)
+- }
+- ret.Mod(ret, p224.P)
+- return ret
+-}
+-
+-func TestToFromBig(t *testing.T) {
+- for i, test := range toFromBigTests {
+- n, _ := new(big.Int).SetString(test, 16)
+- var x p224FieldElement
+- p224FromBig(&x, n)
+- m := p224ToBig(&x)
+- if n.Cmp(m) != 0 {
+- t.Errorf("#%d: %x != %x", i, n, m)
+- }
+- q := p224AlternativeToBig(&x)
+- if n.Cmp(q) != 0 {
+- t.Errorf("#%d: %x != %x (alternative)", i, n, m)
+- }
+- }
+-}
diff --git a/SOURCES/gcc48-libgomp-20160715.patch b/SOURCES/gcc48-libgomp-20160715.patch
new file mode 100644
index 0000000..9b6a61e
--- /dev/null
+++ b/SOURCES/gcc48-libgomp-20160715.patch
@@ -0,0 +1,10653 @@
+--- libgomp/config/linux/wait.h.jj 2013-01-31 20:29:10.091548989 +0100
++++ libgomp/config/linux/wait.h 2016-07-13 16:57:18.902355979 +0200
+@@ -34,13 +34,13 @@
+
+ #define FUTEX_WAIT 0
+ #define FUTEX_WAKE 1
+-#define FUTEX_PRIVATE_FLAG 128L
++#define FUTEX_PRIVATE_FLAG 128
+
+ #ifdef HAVE_ATTRIBUTE_VISIBILITY
+ # pragma GCC visibility push(hidden)
+ #endif
+
+-extern long int gomp_futex_wait, gomp_futex_wake;
++extern int gomp_futex_wait, gomp_futex_wake;
+
+ #include
+
+@@ -48,7 +48,9 @@ static inline int do_spin (int *addr, in
+ {
+ unsigned long long i, count = gomp_spin_count_var;
+
+- if (__builtin_expect (gomp_managed_threads > gomp_available_cpus, 0))
++ if (__builtin_expect (__atomic_load_n (&gomp_managed_threads,
++ MEMMODEL_RELAXED)
++ > gomp_available_cpus, 0))
+ count = gomp_throttled_spin_count_var;
+ for (i = 0; i < count; i++)
+ if (__builtin_expect (__atomic_load_n (addr, MEMMODEL_RELAXED) != val, 0))
+--- libgomp/config/linux/affinity.c.jj 2014-05-15 10:56:37.499502573 +0200
++++ libgomp/config/linux/affinity.c 2016-07-13 16:57:18.902355979 +0200
+@@ -352,6 +352,45 @@ gomp_affinity_print_place (void *p)
+ fprintf (stderr, ":%lu", len);
+ }
+
++int
++omp_get_place_num_procs (int place_num)
++{
++ if (place_num < 0 || place_num >= gomp_places_list_len)
++ return 0;
++
++ cpu_set_t *cpusetp = (cpu_set_t *) gomp_places_list[place_num];
++ return gomp_cpuset_popcount (gomp_cpuset_size, cpusetp);
++}
++
++void
++omp_get_place_proc_ids (int place_num, int *ids)
++{
++ if (place_num < 0 || place_num >= gomp_places_list_len)
++ return;
++
++ cpu_set_t *cpusetp = (cpu_set_t *) gomp_places_list[place_num];
++ unsigned long i, max = 8 * gomp_cpuset_size;
++ for (i = 0; i < max; i++)
++ if (CPU_ISSET_S (i, gomp_cpuset_size, cpusetp))
++ *ids++ = i;
++}
++
++void
++gomp_get_place_proc_ids_8 (int place_num, int64_t *ids)
++{
++ if (place_num < 0 || place_num >= gomp_places_list_len)
++ return;
++
++ cpu_set_t *cpusetp = (cpu_set_t *) gomp_places_list[place_num];
++ unsigned long i, max = 8 * gomp_cpuset_size;
++ for (i = 0; i < max; i++)
++ if (CPU_ISSET_S (i, gomp_cpuset_size, cpusetp))
++ *ids++ = i;
++}
++
++ialias(omp_get_place_num_procs)
++ialias(omp_get_place_proc_ids)
++
+ #else
+
+ #include "../posix/affinity.c"
+--- libgomp/config/linux/mutex.c.jj 2013-01-21 16:00:38.220917670 +0100
++++ libgomp/config/linux/mutex.c 2016-07-13 16:57:18.870356375 +0200
+@@ -28,8 +28,8 @@
+
+ #include "wait.h"
+
+-long int gomp_futex_wake = FUTEX_WAKE | FUTEX_PRIVATE_FLAG;
+-long int gomp_futex_wait = FUTEX_WAIT | FUTEX_PRIVATE_FLAG;
++int gomp_futex_wake = FUTEX_WAKE | FUTEX_PRIVATE_FLAG;
++int gomp_futex_wait = FUTEX_WAIT | FUTEX_PRIVATE_FLAG;
+
+ void
+ gomp_mutex_lock_slow (gomp_mutex_t *mutex, int oldval)
+--- libgomp/config/posix/affinity.c.jj 2014-05-15 10:56:37.987498844 +0200
++++ libgomp/config/posix/affinity.c 2016-07-15 12:08:28.410015743 +0200
+@@ -113,3 +113,27 @@ gomp_affinity_print_place (void *p)
+ {
+ (void) p;
+ }
++
++int
++omp_get_place_num_procs (int place_num)
++{
++ (void) place_num;
++ return 0;
++}
++
++void
++omp_get_place_proc_ids (int place_num, int *ids)
++{
++ (void) place_num;
++ (void) ids;
++}
++
++void
++gomp_get_place_proc_ids_8 (int place_num, int64_t *ids)
++{
++ (void) place_num;
++ (void) ids;
++}
++
++ialias(omp_get_place_num_procs)
++ialias(omp_get_place_proc_ids)
+--- libgomp/loop_ull.c.jj 2013-01-21 16:00:46.477871806 +0100
++++ libgomp/loop_ull.c 2016-07-13 16:57:18.918355780 +0200
+@@ -174,15 +174,15 @@ GOMP_loop_ull_runtime_start (bool up, go
+ {
+ case GFS_STATIC:
+ return gomp_loop_ull_static_start (up, start, end, incr,
+- icv->run_sched_modifier,
++ icv->run_sched_chunk_size,
+ istart, iend);
+ case GFS_DYNAMIC:
+ return gomp_loop_ull_dynamic_start (up, start, end, incr,
+- icv->run_sched_modifier,
++ icv->run_sched_chunk_size,
+ istart, iend);
+ case GFS_GUIDED:
+ return gomp_loop_ull_guided_start (up, start, end, incr,
+- icv->run_sched_modifier,
++ icv->run_sched_chunk_size,
+ istart, iend);
+ case GFS_AUTO:
+ /* For now map to schedule(static), later on we could play with feedback
+@@ -278,15 +278,15 @@ GOMP_loop_ull_ordered_runtime_start (boo
+ {
+ case GFS_STATIC:
+ return gomp_loop_ull_ordered_static_start (up, start, end, incr,
+- icv->run_sched_modifier,
++ icv->run_sched_chunk_size,
+ istart, iend);
+ case GFS_DYNAMIC:
+ return gomp_loop_ull_ordered_dynamic_start (up, start, end, incr,
+- icv->run_sched_modifier,
++ icv->run_sched_chunk_size,
+ istart, iend);
+ case GFS_GUIDED:
+ return gomp_loop_ull_ordered_guided_start (up, start, end, incr,
+- icv->run_sched_modifier,
++ icv->run_sched_chunk_size,
+ istart, iend);
+ case GFS_AUTO:
+ /* For now map to schedule(static), later on we could play with feedback
+@@ -298,6 +298,114 @@ GOMP_loop_ull_ordered_runtime_start (boo
+ }
+ }
+
++/* The *_doacross_*_start routines are similar. The only difference is that
++ this work-share construct is initialized to expect an ORDERED(N) - DOACROSS
++ section, and the worksharing loop iterates always from 0 to COUNTS[0] - 1
++ and other COUNTS array elements tell the library number of iterations
++ in the ordered inner loops. */
++
++static bool
++gomp_loop_ull_doacross_static_start (unsigned ncounts, gomp_ull *counts,
++ gomp_ull chunk_size, gomp_ull *istart,
++ gomp_ull *iend)
++{
++ struct gomp_thread *thr = gomp_thread ();
++
++ thr->ts.static_trip = 0;
++ if (gomp_work_share_start (false))
++ {
++ gomp_loop_ull_init (thr->ts.work_share, true, 0, counts[0], 1,
++ GFS_STATIC, chunk_size);
++ gomp_doacross_ull_init (ncounts, counts, chunk_size);
++ gomp_work_share_init_done ();
++ }
++
++ return !gomp_iter_ull_static_next (istart, iend);
++}
++
++static bool
++gomp_loop_ull_doacross_dynamic_start (unsigned ncounts, gomp_ull *counts,
++ gomp_ull chunk_size, gomp_ull *istart,
++ gomp_ull *iend)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ bool ret;
++
++ if (gomp_work_share_start (false))
++ {
++ gomp_loop_ull_init (thr->ts.work_share, true, 0, counts[0], 1,
++ GFS_DYNAMIC, chunk_size);
++ gomp_doacross_ull_init (ncounts, counts, chunk_size);
++ gomp_work_share_init_done ();
++ }
++
++#if defined HAVE_SYNC_BUILTINS && defined __LP64__
++ ret = gomp_iter_ull_dynamic_next (istart, iend);
++#else
++ gomp_mutex_lock (&thr->ts.work_share->lock);
++ ret = gomp_iter_ull_dynamic_next_locked (istart, iend);
++ gomp_mutex_unlock (&thr->ts.work_share->lock);
++#endif
++
++ return ret;
++}
++
++static bool
++gomp_loop_ull_doacross_guided_start (unsigned ncounts, gomp_ull *counts,
++ gomp_ull chunk_size, gomp_ull *istart,
++ gomp_ull *iend)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ bool ret;
++
++ if (gomp_work_share_start (false))
++ {
++ gomp_loop_ull_init (thr->ts.work_share, true, 0, counts[0], 1,
++ GFS_GUIDED, chunk_size);
++ gomp_doacross_ull_init (ncounts, counts, chunk_size);
++ gomp_work_share_init_done ();
++ }
++
++#if defined HAVE_SYNC_BUILTINS && defined __LP64__
++ ret = gomp_iter_ull_guided_next (istart, iend);
++#else
++ gomp_mutex_lock (&thr->ts.work_share->lock);
++ ret = gomp_iter_ull_guided_next_locked (istart, iend);
++ gomp_mutex_unlock (&thr->ts.work_share->lock);
++#endif
++
++ return ret;
++}
++
++bool
++GOMP_loop_ull_doacross_runtime_start (unsigned ncounts, gomp_ull *counts,
++ gomp_ull *istart, gomp_ull *iend)
++{
++ struct gomp_task_icv *icv = gomp_icv (false);
++ switch (icv->run_sched_var)
++ {
++ case GFS_STATIC:
++ return gomp_loop_ull_doacross_static_start (ncounts, counts,
++ icv->run_sched_chunk_size,
++ istart, iend);
++ case GFS_DYNAMIC:
++ return gomp_loop_ull_doacross_dynamic_start (ncounts, counts,
++ icv->run_sched_chunk_size,
++ istart, iend);
++ case GFS_GUIDED:
++ return gomp_loop_ull_doacross_guided_start (ncounts, counts,
++ icv->run_sched_chunk_size,
++ istart, iend);
++ case GFS_AUTO:
++ /* For now map to schedule(static), later on we could play with feedback
++ driven choice. */
++ return gomp_loop_ull_doacross_static_start (ncounts, counts,
++ 0, istart, iend);
++ default:
++ abort ();
++ }
++}
++
+ /* The *_next routines are called when the thread completes processing of
+ the iteration block currently assigned to it. If the work-share
+ construct is bound directly to a parallel construct, then the iteration
+@@ -457,6 +565,10 @@ extern __typeof(gomp_loop_ull_dynamic_st
+ __attribute__((alias ("gomp_loop_ull_dynamic_start")));
+ extern __typeof(gomp_loop_ull_guided_start) GOMP_loop_ull_guided_start
+ __attribute__((alias ("gomp_loop_ull_guided_start")));
++extern __typeof(gomp_loop_ull_dynamic_start) GOMP_loop_ull_nonmonotonic_dynamic_start
++ __attribute__((alias ("gomp_loop_ull_dynamic_start")));
++extern __typeof(gomp_loop_ull_guided_start) GOMP_loop_ull_nonmonotonic_guided_start
++ __attribute__((alias ("gomp_loop_ull_guided_start")));
+
+ extern __typeof(gomp_loop_ull_ordered_static_start) GOMP_loop_ull_ordered_static_start
+ __attribute__((alias ("gomp_loop_ull_ordered_static_start")));
+@@ -465,12 +577,23 @@ extern __typeof(gomp_loop_ull_ordered_dy
+ extern __typeof(gomp_loop_ull_ordered_guided_start) GOMP_loop_ull_ordered_guided_start
+ __attribute__((alias ("gomp_loop_ull_ordered_guided_start")));
+
++extern __typeof(gomp_loop_ull_doacross_static_start) GOMP_loop_ull_doacross_static_start
++ __attribute__((alias ("gomp_loop_ull_doacross_static_start")));
++extern __typeof(gomp_loop_ull_doacross_dynamic_start) GOMP_loop_ull_doacross_dynamic_start
++ __attribute__((alias ("gomp_loop_ull_doacross_dynamic_start")));
++extern __typeof(gomp_loop_ull_doacross_guided_start) GOMP_loop_ull_doacross_guided_start
++ __attribute__((alias ("gomp_loop_ull_doacross_guided_start")));
++
+ extern __typeof(gomp_loop_ull_static_next) GOMP_loop_ull_static_next
+ __attribute__((alias ("gomp_loop_ull_static_next")));
+ extern __typeof(gomp_loop_ull_dynamic_next) GOMP_loop_ull_dynamic_next
+ __attribute__((alias ("gomp_loop_ull_dynamic_next")));
+ extern __typeof(gomp_loop_ull_guided_next) GOMP_loop_ull_guided_next
+ __attribute__((alias ("gomp_loop_ull_guided_next")));
++extern __typeof(gomp_loop_ull_dynamic_next) GOMP_loop_ull_nonmonotonic_dynamic_next
++ __attribute__((alias ("gomp_loop_ull_dynamic_next")));
++extern __typeof(gomp_loop_ull_guided_next) GOMP_loop_ull_nonmonotonic_guided_next
++ __attribute__((alias ("gomp_loop_ull_guided_next")));
+
+ extern __typeof(gomp_loop_ull_ordered_static_next) GOMP_loop_ull_ordered_static_next
+ __attribute__((alias ("gomp_loop_ull_ordered_static_next")));
+@@ -507,6 +630,25 @@ GOMP_loop_ull_guided_start (bool up, gom
+ }
+
+ bool
++GOMP_loop_ull_nonmonotonic_dynamic_start (bool up, gomp_ull start,
++ gomp_ull end, gomp_ull incr,
++ gomp_ull chunk_size,
++ gomp_ull *istart, gomp_ull *iend)
++{
++ return gomp_loop_ull_dynamic_start (up, start, end, incr, chunk_size, istart,
++ iend);
++}
++
++bool
++GOMP_loop_ull_nonmonotonic_guided_start (bool up, gomp_ull start, gomp_ull end,
++ gomp_ull incr, gomp_ull chunk_size,
++ gomp_ull *istart, gomp_ull *iend)
++{
++ return gomp_loop_ull_guided_start (up, start, end, incr, chunk_size, istart,
++ iend);
++}
++
++bool
+ GOMP_loop_ull_ordered_static_start (bool up, gomp_ull start, gomp_ull end,
+ gomp_ull incr, gomp_ull chunk_size,
+ gomp_ull *istart, gomp_ull *iend)
+@@ -534,6 +676,33 @@ GOMP_loop_ull_ordered_guided_start (bool
+ }
+
+ bool
++GOMP_loop_ull_doacross_static_start (unsigned ncounts, gomp_ull *counts,
++ gomp_ull chunk_size, gomp_ull *istart,
++ gomp_ull *iend)
++{
++ return gomp_loop_ull_doacross_static_start (ncounts, counts, chunk_size,
++ istart, iend);
++}
++
++bool
++GOMP_loop_ull_doacross_dynamic_start (unsigned ncounts, gomp_ull *counts,
++ gomp_ull chunk_size, gomp_ull *istart,
++ gomp_ull *iend)
++{
++ return gomp_loop_ull_doacross_dynamic_start (ncounts, counts, chunk_size,
++ istart, iend);
++}
++
++bool
++GOMP_loop_ull_doacross_guided_start (unsigned ncounts, gomp_ull *counts,
++ gomp_ull chunk_size, gomp_ull *istart,
++ gomp_ull *iend)
++{
++ return gomp_loop_ull_doacross_guided_start (ncounts, counts, chunk_size,
++ istart, iend);
++}
++
++bool
+ GOMP_loop_ull_static_next (gomp_ull *istart, gomp_ull *iend)
+ {
+ return gomp_loop_ull_static_next (istart, iend);
+@@ -550,6 +719,18 @@ GOMP_loop_ull_guided_next (gomp_ull *ist
+ {
+ return gomp_loop_ull_guided_next (istart, iend);
+ }
++
++bool
++GOMP_loop_ull_nonmonotonic_dynamic_next (gomp_ull *istart, gomp_ull *iend)
++{
++ return gomp_loop_ull_dynamic_next (istart, iend);
++}
++
++bool
++GOMP_loop_ull_nonmonotonic_guided_next (gomp_ull *istart, gomp_ull *iend)
++{
++ return gomp_loop_ull_guided_next (istart, iend);
++}
+
+ bool
+ GOMP_loop_ull_ordered_static_next (gomp_ull *istart, gomp_ull *iend)
+--- libgomp/team.c.jj 2014-05-15 10:56:32.092524669 +0200
++++ libgomp/team.c 2016-07-13 17:58:01.907291111 +0200
+@@ -133,6 +133,25 @@ gomp_thread_start (void *xdata)
+ return NULL;
+ }
+
++static inline struct gomp_team *
++get_last_team (unsigned nthreads)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ if (thr->ts.team == NULL)
++ {
++ struct gomp_thread_pool *pool = thr->thread_pool;
++ if (pool != NULL)
++ {
++ struct gomp_team *last_team = pool->last_team;
++ if (last_team != NULL && last_team->nthreads == nthreads)
++ {
++ pool->last_team = NULL;
++ return last_team;
++ }
++ }
++ }
++ return NULL;
++}
+
+ /* Create a new team data structure. */
+
+@@ -140,18 +159,27 @@ struct gomp_team *
+ gomp_new_team (unsigned nthreads)
+ {
+ struct gomp_team *team;
+- size_t size;
+ int i;
+
+- size = sizeof (*team) + nthreads * (sizeof (team->ordered_release[0])
+- + sizeof (team->implicit_task[0]));
+- team = gomp_malloc (size);
++ team = get_last_team (nthreads);
++ if (team == NULL)
++ {
++ size_t extra = sizeof (team->ordered_release[0])
++ + sizeof (team->implicit_task[0]);
++ team = gomp_malloc (sizeof (*team) + nthreads * extra);
++
++#ifndef HAVE_SYNC_BUILTINS
++ gomp_mutex_init (&team->work_share_list_free_lock);
++#endif
++ gomp_barrier_init (&team->barrier, nthreads);
++ gomp_mutex_init (&team->task_lock);
++
++ team->nthreads = nthreads;
++ }
+
+ team->work_share_chunk = 8;
+ #ifdef HAVE_SYNC_BUILTINS
+ team->single_count = 0;
+-#else
+- gomp_mutex_init (&team->work_share_list_free_lock);
+ #endif
+ team->work_shares_to_free = &team->work_shares[0];
+ gomp_init_work_share (&team->work_shares[0], false, nthreads);
+@@ -162,15 +190,11 @@ gomp_new_team (unsigned nthreads)
+ team->work_shares[i].next_free = &team->work_shares[i + 1];
+ team->work_shares[i].next_free = NULL;
+
+- team->nthreads = nthreads;
+- gomp_barrier_init (&team->barrier, nthreads);
+-
+ gomp_sem_init (&team->master_release, 0);
+ team->ordered_release = (void *) &team->implicit_task[nthreads];
+ team->ordered_release[0] = &team->master_release;
+
+- gomp_mutex_init (&team->task_lock);
+- team->task_queue = NULL;
++ priority_queue_init (&team->task_queue);
+ team->task_count = 0;
+ team->task_queued_count = 0;
+ team->task_running_count = 0;
+@@ -186,8 +210,12 @@ gomp_new_team (unsigned nthreads)
+ static void
+ free_team (struct gomp_team *team)
+ {
++#ifndef HAVE_SYNC_BUILTINS
++ gomp_mutex_destroy (&team->work_share_list_free_lock);
++#endif
+ gomp_barrier_destroy (&team->barrier);
+ gomp_mutex_destroy (&team->task_lock);
++ priority_queue_free (&team->task_queue);
+ free (team);
+ }
+
+@@ -258,6 +286,8 @@ gomp_free_thread (void *arg __attribute_
+ free (pool);
+ thr->thread_pool = NULL;
+ }
++ if (thr->ts.level == 0 && __builtin_expect (thr->ts.team != NULL, 0))
++ gomp_team_end ();
+ if (thr->task != NULL)
+ {
+ struct gomp_task *task = thr->task;
+@@ -287,7 +317,7 @@ gomp_team_start (void (*fn) (void *), vo
+ struct gomp_thread **affinity_thr = NULL;
+
+ thr = gomp_thread ();
+- nested = thr->ts.team != NULL;
++ nested = thr->ts.level;
+ if (__builtin_expect (thr->thread_pool == NULL, 0))
+ {
+ thr->thread_pool = gomp_new_thread_pool ();
+@@ -894,9 +924,6 @@ gomp_team_end (void)
+ while (ws != NULL);
+ }
+ gomp_sem_destroy (&team->master_release);
+-#ifndef HAVE_SYNC_BUILTINS
+- gomp_mutex_destroy (&team->work_share_list_free_lock);
+-#endif
+
+ if (__builtin_expect (thr->ts.team != NULL, 0)
+ || __builtin_expect (team->nthreads == 1, 0))
+--- libgomp/target.c.jj 2014-05-15 10:56:38.313498020 +0200
++++ libgomp/target.c 2016-07-15 16:58:29.249328861 +0200
+@@ -22,14 +22,22 @@
+ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+ . */
+
+-/* This file handles the maintainence of threads in response to team
+- creation and termination. */
++/* This file contains the support of offloading. */
+
++#include "config.h"
+ #include "libgomp.h"
++#include "oacc-plugin.h"
++#include "oacc-int.h"
++#include "gomp-constants.h"
+ #include
+ #include
+ #include
++#ifdef HAVE_INTTYPES_H
++# include /* For PRIu64. */
++#endif
+ #include
++#include
++#include
+
+ attribute_hidden int
+ gomp_get_num_devices (void)
+@@ -37,22 +45,87 @@ gomp_get_num_devices (void)
+ return 0;
+ }
+
+-/* Called when encountering a target directive. If DEVICE
+- is -1, it means use device-var ICV. If it is -2 (or any other value
+- larger than last available hw device, use host fallback.
+- FN is address of host code, OPENMP_TARGET contains value of the
+- __OPENMP_TARGET__ symbol in the shared library or binary that invokes
+- GOMP_target. HOSTADDRS, SIZES and KINDS are arrays
+- with MAPNUM entries, with addresses of the host objects,
+- sizes of the host objects (resp. for pointer kind pointer bias
+- and assumed sizeof (void *) size) and kinds. */
++/* This function should be called from every offload image while loading.
++ It gets the descriptor of the host func and var tables HOST_TABLE, TYPE of
++ the target, and TARGET_DATA needed by target plugin. */
+
+ void
+-GOMP_target (int device, void (*fn) (void *), const void *openmp_target,
+- size_t mapnum, void **hostaddrs, size_t *sizes,
+- unsigned char *kinds)
++GOMP_offload_register_ver (unsigned version, const void *host_table,
++ int target_type, const void *target_data)
++{
++ (void) version;
++ (void) host_table;
++ (void) target_type;
++ (void) target_data;
++}
++
++void
++GOMP_offload_register (const void *host_table, int target_type,
++ const void *target_data)
++{
++ (void) host_table;
++ (void) target_type;
++ (void) target_data;
++}
++
++/* This function should be called from every offload image while unloading.
++ It gets the descriptor of the host func and var tables HOST_TABLE, TYPE of
++ the target, and TARGET_DATA needed by target plugin. */
++
++void
++GOMP_offload_unregister_ver (unsigned version, const void *host_table,
++ int target_type, const void *target_data)
++{
++ (void) version;
++ (void) host_table;
++ (void) target_type;
++ (void) target_data;
++}
++
++void
++GOMP_offload_unregister (const void *host_table, int target_type,
++ const void *target_data)
++{
++ (void) host_table;
++ (void) target_type;
++ (void) target_data;
++}
++
++/* This function initializes the target device, specified by DEVICEP. DEVICEP
++ must be locked on entry, and remains locked on return. */
++
++attribute_hidden void
++gomp_init_device (struct gomp_device_descr *devicep)
++{
++ devicep->state = GOMP_DEVICE_INITIALIZED;
++}
++
++attribute_hidden void
++gomp_unload_device (struct gomp_device_descr *devicep)
++{
++}
++
++/* Free address mapping tables. MM must be locked on entry, and remains locked
++ on return. */
++
++attribute_hidden void
++gomp_free_memmap (struct splay_tree_s *mem_map)
++{
++ while (mem_map->root)
++ {
++ struct target_mem_desc *tgt = mem_map->root->key.tgt;
++
++ splay_tree_remove (mem_map, &mem_map->root->key);
++ free (tgt->array);
++ free (tgt);
++ }
++}
++
++/* Host fallback for GOMP_target{,_ext} routines. */
++
++static void
++gomp_target_fallback (void (*fn) (void *), void **hostaddrs)
+ {
+- /* Host fallback. */
+ struct gomp_thread old_thr, *thr = gomp_thread ();
+ old_thr = *thr;
+ memset (thr, '\0', sizeof (*thr));
+@@ -66,10 +139,167 @@ GOMP_target (int device, void (*fn) (voi
+ *thr = old_thr;
+ }
+
++/* Calculate alignment and size requirements of a private copy of data shared
++ as GOMP_MAP_FIRSTPRIVATE and store them to TGT_ALIGN and TGT_SIZE. */
++
++static inline void
++calculate_firstprivate_requirements (size_t mapnum, size_t *sizes,
++ unsigned short *kinds, size_t *tgt_align,
++ size_t *tgt_size)
++{
++ size_t i;
++ for (i = 0; i < mapnum; i++)
++ if ((kinds[i] & 0xff) == GOMP_MAP_FIRSTPRIVATE)
++ {
++ size_t align = (size_t) 1 << (kinds[i] >> 8);
++ if (*tgt_align < align)
++ *tgt_align = align;
++ *tgt_size = (*tgt_size + align - 1) & ~(align - 1);
++ *tgt_size += sizes[i];
++ }
++}
++
++/* Copy data shared as GOMP_MAP_FIRSTPRIVATE to DST. */
++
++static inline void
++copy_firstprivate_data (char *tgt, size_t mapnum, void **hostaddrs,
++ size_t *sizes, unsigned short *kinds, size_t tgt_align,
++ size_t tgt_size)
++{
++ uintptr_t al = (uintptr_t) tgt & (tgt_align - 1);
++ if (al)
++ tgt += tgt_align - al;
++ tgt_size = 0;
++ size_t i;
++ for (i = 0; i < mapnum; i++)
++ if ((kinds[i] & 0xff) == GOMP_MAP_FIRSTPRIVATE)
++ {
++ size_t align = (size_t) 1 << (kinds[i] >> 8);
++ tgt_size = (tgt_size + align - 1) & ~(align - 1);
++ memcpy (tgt + tgt_size, hostaddrs[i], sizes[i]);
++ hostaddrs[i] = tgt + tgt_size;
++ tgt_size = tgt_size + sizes[i];
++ }
++}
++
++/* Called when encountering a target directive. If DEVICE
++ is GOMP_DEVICE_ICV, it means use device-var ICV. If it is
++ GOMP_DEVICE_HOST_FALLBACK (or any value
++ larger than last available hw device), use host fallback.
++ FN is address of host code, UNUSED is part of the current ABI, but
++ we're not actually using it. HOSTADDRS, SIZES and KINDS are arrays
++ with MAPNUM entries, with addresses of the host objects,
++ sizes of the host objects (resp. for pointer kind pointer bias
++ and assumed sizeof (void *) size) and kinds. */
++
++void
++GOMP_target (int device, void (*fn) (void *), const void *unused,
++ size_t mapnum, void **hostaddrs, size_t *sizes,
++ unsigned char *kinds)
++{
++ return gomp_target_fallback (fn, hostaddrs);
++}
++
++/* Like GOMP_target, but KINDS is 16-bit, UNUSED is no longer present,
++ and several arguments have been added:
++ FLAGS is a bitmask, see GOMP_TARGET_FLAG_* in gomp-constants.h.
++ DEPEND is array of dependencies, see GOMP_task for details.
++
++ ARGS is a pointer to an array consisting of a variable number of both
++ device-independent and device-specific arguments, which can take one two
++ elements where the first specifies for which device it is intended, the type
++ and optionally also the value. If the value is not present in the first
++ one, the whole second element the actual value. The last element of the
++ array is a single NULL. Among the device independent can be for example
++ NUM_TEAMS and THREAD_LIMIT.
++
++ NUM_TEAMS is positive if GOMP_teams will be called in the body with
++ that value, or 1 if teams construct is not present, or 0, if
++ teams construct does not have num_teams clause and so the choice is
++ implementation defined, and -1 if it can't be determined on the host
++ what value will GOMP_teams have on the device.
++ THREAD_LIMIT similarly is positive if GOMP_teams will be called in the
++ body with that value, or 0, if teams construct does not have thread_limit
++ clause or the teams construct is not present, or -1 if it can't be
++ determined on the host what value will GOMP_teams have on the device. */
++
++void
++GOMP_target_ext (int device, void (*fn) (void *), size_t mapnum,
++ void **hostaddrs, size_t *sizes, unsigned short *kinds,
++ unsigned int flags, void **depend, void **args)
++{
++ size_t tgt_align = 0, tgt_size = 0;
++ bool fpc_done = false;
++
++ if (flags & GOMP_TARGET_FLAG_NOWAIT)
++ {
++ struct gomp_thread *thr = gomp_thread ();
++ if (thr->ts.team
++ && !thr->task->final_task)
++ {
++ gomp_create_target_task (NULL, fn, mapnum, hostaddrs,
++ sizes, kinds, flags, depend, args,
++ GOMP_TARGET_TASK_BEFORE_MAP);
++ return;
++ }
++ }
++
++ /* If there are depend clauses, but nowait is not present
++ (or we are in a final task), block the parent task until the
++ dependencies are resolved and then just continue with the rest
++ of the function as if it is a merged task. */
++ if (depend != NULL)
++ {
++ struct gomp_thread *thr = gomp_thread ();
++ if (thr->task && thr->task->depend_hash)
++ {
++ /* If we might need to wait, copy firstprivate now. */
++ calculate_firstprivate_requirements (mapnum, sizes, kinds,
++ &tgt_align, &tgt_size);
++ if (tgt_align)
++ {
++ char *tgt = gomp_alloca (tgt_size + tgt_align - 1);
++ copy_firstprivate_data (tgt, mapnum, hostaddrs, sizes, kinds,
++ tgt_align, tgt_size);
++ }
++ fpc_done = true;
++ gomp_task_maybe_wait_for_dependencies (depend);
++ }
++ }
++
++ if (!fpc_done)
++ {
++ calculate_firstprivate_requirements (mapnum, sizes, kinds,
++ &tgt_align, &tgt_size);
++ if (tgt_align)
++ {
++ char *tgt = gomp_alloca (tgt_size + tgt_align - 1);
++ copy_firstprivate_data (tgt, mapnum, hostaddrs, sizes, kinds,
++ tgt_align, tgt_size);
++ }
++ }
++ gomp_target_fallback (fn, hostaddrs);
++}
++
++/* Host fallback for GOMP_target_data{,_ext} routines. */
++
++static void
++gomp_target_data_fallback (void)
++{
++}
++
+ void
+-GOMP_target_data (int device, const void *openmp_target, size_t mapnum,
++GOMP_target_data (int device, const void *unused, size_t mapnum,
+ void **hostaddrs, size_t *sizes, unsigned char *kinds)
+ {
++ return gomp_target_data_fallback ();
++}
++
++void
++GOMP_target_data_ext (int device, size_t mapnum, void **hostaddrs,
++ size_t *sizes, unsigned short *kinds)
++{
++ return gomp_target_data_fallback ();
+ }
+
+ void
+@@ -78,12 +308,112 @@ GOMP_target_end_data (void)
+ }
+
+ void
+-GOMP_target_update (int device, const void *openmp_target, size_t mapnum,
++GOMP_target_update (int device, const void *unused, size_t mapnum,
+ void **hostaddrs, size_t *sizes, unsigned char *kinds)
+ {
+ }
+
+ void
++GOMP_target_update_ext (int device, size_t mapnum, void **hostaddrs,
++ size_t *sizes, unsigned short *kinds,
++ unsigned int flags, void **depend)
++{
++ /* If there are depend clauses, but nowait is not present,
++ block the parent task until the dependencies are resolved
++ and then just continue with the rest of the function as if it
++ is a merged task. Until we are able to schedule task during
++ variable mapping or unmapping, ignore nowait if depend clauses
++ are not present. */
++ if (depend != NULL)
++ {
++ struct gomp_thread *thr = gomp_thread ();
++ if (thr->task && thr->task->depend_hash)
++ {
++ if ((flags & GOMP_TARGET_FLAG_NOWAIT)
++ && thr->ts.team
++ && !thr->task->final_task)
++ {
++ if (gomp_create_target_task (NULL, (void (*) (void *)) NULL,
++ mapnum, hostaddrs, sizes, kinds,
++ flags | GOMP_TARGET_FLAG_UPDATE,
++ depend, NULL, GOMP_TARGET_TASK_DATA))
++ return;
++ }
++ else
++ {
++ struct gomp_team *team = thr->ts.team;
++ /* If parallel or taskgroup has been cancelled, don't start new
++ tasks. */
++ if (team
++ && (gomp_team_barrier_cancelled (&team->barrier)
++ || (thr->task->taskgroup
++ && thr->task->taskgroup->cancelled)))
++ return;
++
++ gomp_task_maybe_wait_for_dependencies (depend);
++ }
++ }
++ }
++}
++
++void
++GOMP_target_enter_exit_data (int device, size_t mapnum, void **hostaddrs,
++ size_t *sizes, unsigned short *kinds,
++ unsigned int flags, void **depend)
++{
++ /* If there are depend clauses, but nowait is not present,
++ block the parent task until the dependencies are resolved
++ and then just continue with the rest of the function as if it
++ is a merged task. Until we are able to schedule task during
++ variable mapping or unmapping, ignore nowait if depend clauses
++ are not present. */
++ if (depend != NULL)
++ {
++ struct gomp_thread *thr = gomp_thread ();
++ if (thr->task && thr->task->depend_hash)
++ {
++ if ((flags & GOMP_TARGET_FLAG_NOWAIT)
++ && thr->ts.team
++ && !thr->task->final_task)
++ {
++ if (gomp_create_target_task (NULL, (void (*) (void *)) NULL,
++ mapnum, hostaddrs, sizes, kinds,
++ flags, depend, NULL,
++ GOMP_TARGET_TASK_DATA))
++ return;
++ }
++ else
++ {
++ struct gomp_team *team = thr->ts.team;
++ /* If parallel or taskgroup has been cancelled, don't start new
++ tasks. */
++ if (team
++ && (gomp_team_barrier_cancelled (&team->barrier)
++ || (thr->task->taskgroup
++ && thr->task->taskgroup->cancelled)))
++ return;
++
++ gomp_task_maybe_wait_for_dependencies (depend);
++ }
++ }
++ }
++}
++
++bool
++gomp_target_task_fn (void *data)
++{
++ struct gomp_target_task *ttask = (struct gomp_target_task *) data;
++
++ if (ttask->fn != NULL)
++ {
++ ttask->state = GOMP_TARGET_TASK_FALLBACK;
++ gomp_target_fallback (ttask->fn, ttask->hostaddrs);
++ return false;
++ }
++ return false;
++}
++
++void
+ GOMP_teams (unsigned int num_teams, unsigned int thread_limit)
+ {
+ if (thread_limit)
+@@ -94,3 +424,153 @@ GOMP_teams (unsigned int num_teams, unsi
+ }
+ (void) num_teams;
+ }
++
++void *
++omp_target_alloc (size_t size, int device_num)
++{
++ if (device_num == GOMP_DEVICE_HOST_FALLBACK)
++ return malloc (size);
++
++ return NULL;
++}
++
++void
++omp_target_free (void *device_ptr, int device_num)
++{
++ if (device_ptr == NULL)
++ return;
++
++ if (device_num == GOMP_DEVICE_HOST_FALLBACK)
++ {
++ free (device_ptr);
++ return;
++ }
++}
++
++int
++omp_target_is_present (void *ptr, int device_num)
++{
++ if (ptr == NULL)
++ return 1;
++
++ if (device_num == GOMP_DEVICE_HOST_FALLBACK)
++ return 1;
++
++ return 0;
++}
++
++int
++omp_target_memcpy (void *dst, void *src, size_t length, size_t dst_offset,
++ size_t src_offset, int dst_device_num, int src_device_num)
++{
++ if (dst_device_num != GOMP_DEVICE_HOST_FALLBACK)
++ return EINVAL;
++ if (src_device_num != GOMP_DEVICE_HOST_FALLBACK)
++ return EINVAL;
++ memcpy ((char *) dst + dst_offset, (char *) src + src_offset, length);
++ return 0;
++}
++
++#define HALF_SIZE_T (((size_t) 1) << (8 * sizeof (size_t) / 2))
++
++#define __builtin_mul_overflow(x, y, z) \
++ ({ bool retval = false; \
++ size_t xval = (x); \
++ size_t yval = (y); \
++ size_t zval = xval * yval; \
++ if (__builtin_expect ((xval | yval) >= HALF_SIZE_T, 0)) \
++ { \
++ if (xval && zval / xval != yval) \
++ retval = true; \
++ } \
++ *(z) = zval; \
++ retval; })
++
++static int
++omp_target_memcpy_rect_worker (void *dst, void *src, size_t element_size,
++ int num_dims, const size_t *volume,
++ const size_t *dst_offsets,
++ const size_t *src_offsets,
++ const size_t *dst_dimensions,
++ const size_t *src_dimensions)
++{
++ size_t dst_slice = element_size;
++ size_t src_slice = element_size;
++ size_t j, dst_off, src_off, length;
++ int i, ret;
++
++
++ if (num_dims == 1)
++ {
++ if (__builtin_mul_overflow (element_size, volume[0], &length)
++ || __builtin_mul_overflow (element_size, dst_offsets[0], &dst_off)
++ || __builtin_mul_overflow (element_size, src_offsets[0], &src_off))
++ return EINVAL;
++ memcpy ((char *) dst + dst_off, (char *) src + src_off, length);
++ ret = 1;
++ return ret ? 0 : EINVAL;
++ }
++
++ /* FIXME: it would be nice to have some plugin function to handle
++ num_dims == 2 and num_dims == 3 more efficiently. Larger ones can
++ be handled in the generic recursion below, and for host-host it
++ should be used even for any num_dims >= 2. */
++
++ for (i = 1; i < num_dims; i++)
++ if (__builtin_mul_overflow (dst_slice, dst_dimensions[i], &dst_slice)
++ || __builtin_mul_overflow (src_slice, src_dimensions[i], &src_slice))
++ return EINVAL;
++ if (__builtin_mul_overflow (dst_slice, dst_offsets[0], &dst_off)
++ || __builtin_mul_overflow (src_slice, src_offsets[0], &src_off))
++ return EINVAL;
++ for (j = 0; j < volume[0]; j++)
++ {
++ ret = omp_target_memcpy_rect_worker ((char *) dst + dst_off,
++ (char *) src + src_off,
++ element_size, num_dims - 1,
++ volume + 1, dst_offsets + 1,
++ src_offsets + 1, dst_dimensions + 1,
++ src_dimensions + 1);
++ if (ret)
++ return ret;
++ dst_off += dst_slice;
++ src_off += src_slice;
++ }
++ return 0;
++}
++
++int
++omp_target_memcpy_rect (void *dst, void *src, size_t element_size,
++ int num_dims, const size_t *volume,
++ const size_t *dst_offsets,
++ const size_t *src_offsets,
++ const size_t *dst_dimensions,
++ const size_t *src_dimensions,
++ int dst_device_num, int src_device_num)
++{
++ if (!dst && !src)
++ return INT_MAX;
++
++ if (dst_device_num != GOMP_DEVICE_HOST_FALLBACK)
++ return EINVAL;
++ if (src_device_num != GOMP_DEVICE_HOST_FALLBACK)
++ return EINVAL;
++
++ int ret = omp_target_memcpy_rect_worker (dst, src, element_size, num_dims,
++ volume, dst_offsets, src_offsets,
++ dst_dimensions, src_dimensions);
++ return ret;
++}
++
++int
++omp_target_associate_ptr (void *host_ptr, void *device_ptr, size_t size,
++ size_t device_offset, int device_num)
++{
++ return EINVAL;
++}
++
++int
++omp_target_disassociate_ptr (void *ptr, int device_num)
++{
++ return EINVAL;
++}
+--- libgomp/fortran.c.jj 2014-05-15 10:56:31.593531223 +0200
++++ libgomp/fortran.c 2016-07-13 16:57:04.432535397 +0200
+@@ -67,12 +67,20 @@ ialias_redirect (omp_get_active_level)
+ ialias_redirect (omp_in_final)
+ ialias_redirect (omp_get_cancellation)
+ ialias_redirect (omp_get_proc_bind)
++ialias_redirect (omp_get_num_places)
++ialias_redirect (omp_get_place_num_procs)
++ialias_redirect (omp_get_place_proc_ids)
++ialias_redirect (omp_get_place_num)
++ialias_redirect (omp_get_partition_num_places)
++ialias_redirect (omp_get_partition_place_nums)
+ ialias_redirect (omp_set_default_device)
+ ialias_redirect (omp_get_default_device)
+ ialias_redirect (omp_get_num_devices)
+ ialias_redirect (omp_get_num_teams)
+ ialias_redirect (omp_get_team_num)
+ ialias_redirect (omp_is_initial_device)
++ialias_redirect (omp_get_initial_device)
++ialias_redirect (omp_get_max_task_priority)
+ #endif
+
+ #ifndef LIBGOMP_GNU_SYMBOL_VERSIONING
+@@ -342,35 +350,35 @@ omp_get_wtime_ (void)
+ }
+
+ void
+-omp_set_schedule_ (const int32_t *kind, const int32_t *modifier)
++omp_set_schedule_ (const int32_t *kind, const int32_t *chunk_size)
+ {
+- omp_set_schedule (*kind, *modifier);
++ omp_set_schedule (*kind, *chunk_size);
+ }
+
+ void
+-omp_set_schedule_8_ (const int32_t *kind, const int64_t *modifier)
++omp_set_schedule_8_ (const int32_t *kind, const int64_t *chunk_size)
+ {
+- omp_set_schedule (*kind, TO_INT (*modifier));
++ omp_set_schedule (*kind, TO_INT (*chunk_size));
+ }
+
+ void
+-omp_get_schedule_ (int32_t *kind, int32_t *modifier)
++omp_get_schedule_ (int32_t *kind, int32_t *chunk_size)
+ {
+ omp_sched_t k;
+- int m;
+- omp_get_schedule (&k, &m);
++ int cs;
++ omp_get_schedule (&k, &cs);
+ *kind = k;
+- *modifier = m;
++ *chunk_size = cs;
+ }
+
+ void
+-omp_get_schedule_8_ (int32_t *kind, int64_t *modifier)
++omp_get_schedule_8_ (int32_t *kind, int64_t *chunk_size)
+ {
+ omp_sched_t k;
+- int m;
+- omp_get_schedule (&k, &m);
++ int cs;
++ omp_get_schedule (&k, &cs);
+ *kind = k;
+- *modifier = m;
++ *chunk_size = cs;
+ }
+
+ int32_t
+@@ -451,6 +459,69 @@ omp_get_proc_bind_ (void)
+ return omp_get_proc_bind ();
+ }
+
++int32_t
++omp_get_num_places_ (void)
++{
++ return omp_get_num_places ();
++}
++
++int32_t
++omp_get_place_num_procs_ (const int32_t *place_num)
++{
++ return omp_get_place_num_procs (*place_num);
++}
++
++int32_t
++omp_get_place_num_procs_8_ (const int64_t *place_num)
++{
++ return omp_get_place_num_procs (TO_INT (*place_num));
++}
++
++void
++omp_get_place_proc_ids_ (const int32_t *place_num, int32_t *ids)
++{
++ omp_get_place_proc_ids (*place_num, (int *) ids);
++}
++
++void
++omp_get_place_proc_ids_8_ (const int64_t *place_num, int64_t *ids)
++{
++ gomp_get_place_proc_ids_8 (TO_INT (*place_num), ids);
++}
++
++int32_t
++omp_get_place_num_ (void)
++{
++ return omp_get_place_num ();
++}
++
++int32_t
++omp_get_partition_num_places_ (void)
++{
++ return omp_get_partition_num_places ();
++}
++
++void
++omp_get_partition_place_nums_ (int32_t *place_nums)
++{
++ omp_get_partition_place_nums ((int *) place_nums);
++}
++
++void
++omp_get_partition_place_nums_8_ (int64_t *place_nums)
++{
++ if (gomp_places_list == NULL)
++ return;
++
++ struct gomp_thread *thr = gomp_thread ();
++ if (thr->place == 0)
++ gomp_init_affinity ();
++
++ unsigned int i;
++ for (i = 0; i < thr->ts.place_partition_len; i++)
++ *place_nums++ = (int64_t) thr->ts.place_partition_off + i;
++}
++
+ void
+ omp_set_default_device_ (const int32_t *device_num)
+ {
+@@ -492,3 +563,15 @@ omp_is_initial_device_ (void)
+ {
+ return omp_is_initial_device ();
+ }
++
++int32_t
++omp_get_initial_device_ (void)
++{
++ return omp_get_initial_device ();
++}
++
++int32_t
++omp_get_max_task_priority_ (void)
++{
++ return omp_get_max_task_priority ();
++}
+--- libgomp/libgomp.map.jj 2014-05-15 10:56:31.927533549 +0200
++++ libgomp/libgomp.map 2016-07-13 16:57:04.434535373 +0200
+@@ -134,6 +134,36 @@ OMP_4.0 {
+ omp_is_initial_device_;
+ } OMP_3.1;
+
++OMP_4.5 {
++ global:
++ omp_get_max_task_priority;
++ omp_get_max_task_priority_;
++ omp_get_num_places;
++ omp_get_num_places_;
++ omp_get_place_num_procs;
++ omp_get_place_num_procs_;
++ omp_get_place_num_procs_8_;
++ omp_get_place_proc_ids;
++ omp_get_place_proc_ids_;
++ omp_get_place_proc_ids_8_;
++ omp_get_place_num;
++ omp_get_place_num_;
++ omp_get_partition_num_places;
++ omp_get_partition_num_places_;
++ omp_get_partition_place_nums;
++ omp_get_partition_place_nums_;
++ omp_get_partition_place_nums_8_;
++ omp_get_initial_device;
++ omp_get_initial_device_;
++ omp_target_alloc;
++ omp_target_free;
++ omp_target_is_present;
++ omp_target_memcpy;
++ omp_target_memcpy_rect;
++ omp_target_associate_ptr;
++ omp_target_disassociate_ptr;
++} OMP_4.0;
++
+ GOMP_1.0 {
+ global:
+ GOMP_atomic_end;
+@@ -227,3 +257,158 @@ GOMP_4.0 {
+ GOMP_target_update;
+ GOMP_teams;
+ } GOMP_3.0;
++
++GOMP_4.0.1 {
++ global:
++ GOMP_offload_register;
++ GOMP_offload_unregister;
++} GOMP_4.0;
++
++GOMP_4.5 {
++ global:
++ GOMP_target_ext;
++ GOMP_target_data_ext;
++ GOMP_target_update_ext;
++ GOMP_target_enter_exit_data;
++ GOMP_taskloop;
++ GOMP_taskloop_ull;
++ GOMP_offload_register_ver;
++ GOMP_offload_unregister_ver;
++ GOMP_loop_doacross_dynamic_start;
++ GOMP_loop_doacross_guided_start;
++ GOMP_loop_doacross_runtime_start;
++ GOMP_loop_doacross_static_start;
++ GOMP_doacross_post;
++ GOMP_doacross_wait;
++ GOMP_loop_ull_doacross_dynamic_start;
++ GOMP_loop_ull_doacross_guided_start;
++ GOMP_loop_ull_doacross_runtime_start;
++ GOMP_loop_ull_doacross_static_start;
++ GOMP_doacross_ull_post;
++ GOMP_doacross_ull_wait;
++ GOMP_loop_nonmonotonic_dynamic_next;
++ GOMP_loop_nonmonotonic_dynamic_start;
++ GOMP_loop_nonmonotonic_guided_next;
++ GOMP_loop_nonmonotonic_guided_start;
++ GOMP_loop_ull_nonmonotonic_dynamic_next;
++ GOMP_loop_ull_nonmonotonic_dynamic_start;
++ GOMP_loop_ull_nonmonotonic_guided_next;
++ GOMP_loop_ull_nonmonotonic_guided_start;
++ GOMP_parallel_loop_nonmonotonic_dynamic;
++ GOMP_parallel_loop_nonmonotonic_guided;
++} GOMP_4.0.1;
++
++OACC_2.0 {
++ global:
++ acc_get_num_devices;
++ acc_get_num_devices_h_;
++ acc_set_device_type;
++ acc_set_device_type_h_;
++ acc_get_device_type;
++ acc_get_device_type_h_;
++ acc_set_device_num;
++ acc_set_device_num_h_;
++ acc_get_device_num;
++ acc_get_device_num_h_;
++ acc_async_test;
++ acc_async_test_h_;
++ acc_async_test_all;
++ acc_async_test_all_h_;
++ acc_wait;
++ acc_wait_h_;
++ acc_wait_async;
++ acc_wait_async_h_;
++ acc_wait_all;
++ acc_wait_all_h_;
++ acc_wait_all_async;
++ acc_wait_all_async_h_;
++ acc_init;
++ acc_init_h_;
++ acc_shutdown;
++ acc_shutdown_h_;
++ acc_on_device;
++ acc_on_device_h_;
++ acc_malloc;
++ acc_free;
++ acc_copyin;
++ acc_copyin_32_h_;
++ acc_copyin_64_h_;
++ acc_copyin_array_h_;
++ acc_present_or_copyin;
++ acc_present_or_copyin_32_h_;
++ acc_present_or_copyin_64_h_;
++ acc_present_or_copyin_array_h_;
++ acc_create;
++ acc_create_32_h_;
++ acc_create_64_h_;
++ acc_create_array_h_;
++ acc_present_or_create;
++ acc_present_or_create_32_h_;
++ acc_present_or_create_64_h_;
++ acc_present_or_create_array_h_;
++ acc_copyout;
++ acc_copyout_32_h_;
++ acc_copyout_64_h_;
++ acc_copyout_array_h_;
++ acc_delete;
++ acc_delete_32_h_;
++ acc_delete_64_h_;
++ acc_delete_array_h_;
++ acc_update_device;
++ acc_update_device_32_h_;
++ acc_update_device_64_h_;
++ acc_update_device_array_h_;
++ acc_update_self;
++ acc_update_self_32_h_;
++ acc_update_self_64_h_;
++ acc_update_self_array_h_;
++ acc_map_data;
++ acc_unmap_data;
++ acc_deviceptr;
++ acc_hostptr;
++ acc_is_present;
++ acc_is_present_32_h_;
++ acc_is_present_64_h_;
++ acc_is_present_array_h_;
++ acc_memcpy_to_device;
++ acc_memcpy_from_device;
++ acc_get_current_cuda_device;
++ acc_get_current_cuda_context;
++ acc_get_cuda_stream;
++ acc_set_cuda_stream;
++};
++
++GOACC_2.0 {
++ global:
++ GOACC_data_end;
++ GOACC_data_start;
++ GOACC_enter_exit_data;
++ GOACC_parallel;
++ GOACC_update;
++ GOACC_wait;
++ GOACC_get_thread_num;
++ GOACC_get_num_threads;
++};
++
++GOACC_2.0.1 {
++ global:
++ GOACC_declare;
++ GOACC_parallel_keyed;
++} GOACC_2.0;
++
++GOMP_PLUGIN_1.0 {
++ global:
++ GOMP_PLUGIN_malloc;
++ GOMP_PLUGIN_malloc_cleared;
++ GOMP_PLUGIN_realloc;
++ GOMP_PLUGIN_debug;
++ GOMP_PLUGIN_error;
++ GOMP_PLUGIN_fatal;
++ GOMP_PLUGIN_async_unmap_vars;
++ GOMP_PLUGIN_acc_thread;
++};
++
++GOMP_PLUGIN_1.1 {
++ global:
++ GOMP_PLUGIN_target_task_completion;
++} GOMP_PLUGIN_1.0;
+--- libgomp/ordered.c.jj 2013-01-21 16:00:46.137873657 +0100
++++ libgomp/ordered.c 2016-07-13 16:57:18.918355780 +0200
+@@ -25,6 +25,9 @@
+ /* This file handles the ORDERED construct. */
+
+ #include "libgomp.h"
++#include
++#include
++#include "doacross.h"
+
+
+ /* This function is called when first allocating an iteration block. That
+@@ -249,3 +252,533 @@ void
+ GOMP_ordered_end (void)
+ {
+ }
++
++/* DOACROSS initialization. */
++
++#define MAX_COLLAPSED_BITS (__SIZEOF_LONG__ * __CHAR_BIT__)
++
++void
++gomp_doacross_init (unsigned ncounts, long *counts, long chunk_size)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ struct gomp_team *team = thr->ts.team;
++ struct gomp_work_share *ws = thr->ts.work_share;
++ unsigned int i, bits[MAX_COLLAPSED_BITS], num_bits = 0;
++ unsigned long ent, num_ents, elt_sz, shift_sz;
++ struct gomp_doacross_work_share *doacross;
++
++ if (team == NULL || team->nthreads == 1)
++ return;
++
++ for (i = 0; i < ncounts; i++)
++ {
++ /* If any count is 0, GOMP_doacross_{post,wait} can't be called. */
++ if (counts[i] == 0)
++ return;
++
++ if (num_bits <= MAX_COLLAPSED_BITS)
++ {
++ unsigned int this_bits;
++ if (counts[i] == 1)
++ this_bits = 1;
++ else
++ this_bits = __SIZEOF_LONG__ * __CHAR_BIT__
++ - __builtin_clzl (counts[i] - 1);
++ if (num_bits + this_bits <= MAX_COLLAPSED_BITS)
++ {
++ bits[i] = this_bits;
++ num_bits += this_bits;
++ }
++ else
++ num_bits = MAX_COLLAPSED_BITS + 1;
++ }
++ }
++
++ if (ws->sched == GFS_STATIC)
++ num_ents = team->nthreads;
++ else if (ws->sched == GFS_GUIDED)
++ num_ents = counts[0];
++ else
++ num_ents = (counts[0] - 1) / chunk_size + 1;
++ if (num_bits <= MAX_COLLAPSED_BITS)
++ {
++ elt_sz = sizeof (unsigned long);
++ shift_sz = ncounts * sizeof (unsigned int);
++ }
++ else
++ {
++ elt_sz = sizeof (unsigned long) * ncounts;
++ shift_sz = 0;
++ }
++ elt_sz = (elt_sz + 63) & ~63UL;
++
++ doacross = gomp_malloc (sizeof (*doacross) + 63 + num_ents * elt_sz
++ + shift_sz);
++ doacross->chunk_size = chunk_size;
++ doacross->elt_sz = elt_sz;
++ doacross->ncounts = ncounts;
++ doacross->flattened = false;
++ doacross->array = (unsigned char *)
++ ((((uintptr_t) (doacross + 1)) + 63 + shift_sz)
++ & ~(uintptr_t) 63);
++ if (num_bits <= MAX_COLLAPSED_BITS)
++ {
++ unsigned int shift_count = 0;
++ doacross->flattened = true;
++ for (i = ncounts; i > 0; i--)
++ {
++ doacross->shift_counts[i - 1] = shift_count;
++ shift_count += bits[i - 1];
++ }
++ for (ent = 0; ent < num_ents; ent++)
++ *(unsigned long *) (doacross->array + ent * elt_sz) = 0;
++ }
++ else
++ for (ent = 0; ent < num_ents; ent++)
++ memset (doacross->array + ent * elt_sz, '\0',
++ sizeof (unsigned long) * ncounts);
++ if (ws->sched == GFS_STATIC && chunk_size == 0)
++ {
++ unsigned long q = counts[0] / num_ents;
++ unsigned long t = counts[0] % num_ents;
++ doacross->boundary = t * (q + 1);
++ doacross->q = q;
++ doacross->t = t;
++ }
++ ws->doacross = doacross;
++}
++
++/* DOACROSS POST operation. */
++
++void
++GOMP_doacross_post (long *counts)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ struct gomp_work_share *ws = thr->ts.work_share;
++ struct gomp_doacross_work_share *doacross = ws->doacross;
++ unsigned long ent;
++ unsigned int i;
++
++ if (__builtin_expect (doacross == NULL, 0))
++ {
++ __sync_synchronize ();
++ return;
++ }
++
++ if (__builtin_expect (ws->sched == GFS_STATIC, 1))
++ ent = thr->ts.team_id;
++ else if (ws->sched == GFS_GUIDED)
++ ent = counts[0];
++ else
++ ent = counts[0] / doacross->chunk_size;
++ unsigned long *array = (unsigned long *) (doacross->array
++ + ent * doacross->elt_sz);
++
++ if (__builtin_expect (doacross->flattened, 1))
++ {
++ unsigned long flattened
++ = (unsigned long) counts[0] << doacross->shift_counts[0];
++
++ for (i = 1; i < doacross->ncounts; i++)
++ flattened |= (unsigned long) counts[i]
++ << doacross->shift_counts[i];
++ flattened++;
++ if (flattened == __atomic_load_n (array, MEMMODEL_ACQUIRE))
++ __atomic_thread_fence (MEMMODEL_RELEASE);
++ else
++ __atomic_store_n (array, flattened, MEMMODEL_RELEASE);
++ return;
++ }
++
++ __atomic_thread_fence (MEMMODEL_ACQUIRE);
++ for (i = doacross->ncounts; i-- > 0; )
++ {
++ if (counts[i] + 1UL != __atomic_load_n (&array[i], MEMMODEL_RELAXED))
++ __atomic_store_n (&array[i], counts[i] + 1UL, MEMMODEL_RELEASE);
++ }
++}
++
++/* DOACROSS WAIT operation. */
++
++void
++GOMP_doacross_wait (long first, ...)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ struct gomp_work_share *ws = thr->ts.work_share;
++ struct gomp_doacross_work_share *doacross = ws->doacross;
++ va_list ap;
++ unsigned long ent;
++ unsigned int i;
++
++ if (__builtin_expect (doacross == NULL, 0))
++ {
++ __sync_synchronize ();
++ return;
++ }
++
++ if (__builtin_expect (ws->sched == GFS_STATIC, 1))
++ {
++ if (ws->chunk_size == 0)
++ {
++ if (first < doacross->boundary)
++ ent = first / (doacross->q + 1);
++ else
++ ent = (first - doacross->boundary) / doacross->q
++ + doacross->t;
++ }
++ else
++ ent = first / ws->chunk_size % thr->ts.team->nthreads;
++ }
++ else if (ws->sched == GFS_GUIDED)
++ ent = first;
++ else
++ ent = first / doacross->chunk_size;
++ unsigned long *array = (unsigned long *) (doacross->array
++ + ent * doacross->elt_sz);
++
++ if (__builtin_expect (doacross->flattened, 1))
++ {
++ unsigned long flattened
++ = (unsigned long) first << doacross->shift_counts[0];
++ unsigned long cur;
++
++ va_start (ap, first);
++ for (i = 1; i < doacross->ncounts; i++)
++ flattened |= (unsigned long) va_arg (ap, long)
++ << doacross->shift_counts[i];
++ cur = __atomic_load_n (array, MEMMODEL_ACQUIRE);
++ if (flattened < cur)
++ {
++ __atomic_thread_fence (MEMMODEL_RELEASE);
++ va_end (ap);
++ return;
++ }
++ doacross_spin (array, flattened, cur);
++ __atomic_thread_fence (MEMMODEL_RELEASE);
++ va_end (ap);
++ return;
++ }
++
++ do
++ {
++ va_start (ap, first);
++ for (i = 0; i < doacross->ncounts; i++)
++ {
++ unsigned long thisv
++ = (unsigned long) (i ? va_arg (ap, long) : first) + 1;
++ unsigned long cur = __atomic_load_n (&array[i], MEMMODEL_RELAXED);
++ if (thisv < cur)
++ {
++ i = doacross->ncounts;
++ break;
++ }
++ if (thisv > cur)
++ break;
++ }
++ va_end (ap);
++ if (i == doacross->ncounts)
++ break;
++ cpu_relax ();
++ }
++ while (1);
++ __sync_synchronize ();
++}
++
++typedef unsigned long long gomp_ull;
++
++void
++gomp_doacross_ull_init (unsigned ncounts, gomp_ull *counts, gomp_ull chunk_size)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ struct gomp_team *team = thr->ts.team;
++ struct gomp_work_share *ws = thr->ts.work_share;
++ unsigned int i, bits[MAX_COLLAPSED_BITS], num_bits = 0;
++ unsigned long ent, num_ents, elt_sz, shift_sz;
++ struct gomp_doacross_work_share *doacross;
++
++ if (team == NULL || team->nthreads == 1)
++ return;
++
++ for (i = 0; i < ncounts; i++)
++ {
++ /* If any count is 0, GOMP_doacross_{post,wait} can't be called. */
++ if (counts[i] == 0)
++ return;
++
++ if (num_bits <= MAX_COLLAPSED_BITS)
++ {
++ unsigned int this_bits;
++ if (counts[i] == 1)
++ this_bits = 1;
++ else
++ this_bits = __SIZEOF_LONG_LONG__ * __CHAR_BIT__
++ - __builtin_clzll (counts[i] - 1);
++ if (num_bits + this_bits <= MAX_COLLAPSED_BITS)
++ {
++ bits[i] = this_bits;
++ num_bits += this_bits;
++ }
++ else
++ num_bits = MAX_COLLAPSED_BITS + 1;
++ }
++ }
++
++ if (ws->sched == GFS_STATIC)
++ num_ents = team->nthreads;
++ else if (ws->sched == GFS_GUIDED)
++ num_ents = counts[0];
++ else
++ num_ents = (counts[0] - 1) / chunk_size + 1;
++ if (num_bits <= MAX_COLLAPSED_BITS)
++ {
++ elt_sz = sizeof (unsigned long);
++ shift_sz = ncounts * sizeof (unsigned int);
++ }
++ else
++ {
++ if (sizeof (gomp_ull) == sizeof (unsigned long))
++ elt_sz = sizeof (gomp_ull) * ncounts;
++ else if (sizeof (gomp_ull) == 2 * sizeof (unsigned long))
++ elt_sz = sizeof (unsigned long) * 2 * ncounts;
++ else
++ abort ();
++ shift_sz = 0;
++ }
++ elt_sz = (elt_sz + 63) & ~63UL;
++
++ doacross = gomp_malloc (sizeof (*doacross) + 63 + num_ents * elt_sz
++ + shift_sz);
++ doacross->chunk_size_ull = chunk_size;
++ doacross->elt_sz = elt_sz;
++ doacross->ncounts = ncounts;
++ doacross->flattened = false;
++ doacross->boundary = 0;
++ doacross->array = (unsigned char *)
++ ((((uintptr_t) (doacross + 1)) + 63 + shift_sz)
++ & ~(uintptr_t) 63);
++ if (num_bits <= MAX_COLLAPSED_BITS)
++ {
++ unsigned int shift_count = 0;
++ doacross->flattened = true;
++ for (i = ncounts; i > 0; i--)
++ {
++ doacross->shift_counts[i - 1] = shift_count;
++ shift_count += bits[i - 1];
++ }
++ for (ent = 0; ent < num_ents; ent++)
++ *(unsigned long *) (doacross->array + ent * elt_sz) = 0;
++ }
++ else
++ for (ent = 0; ent < num_ents; ent++)
++ memset (doacross->array + ent * elt_sz, '\0',
++ sizeof (unsigned long) * ncounts);
++ if (ws->sched == GFS_STATIC && chunk_size == 0)
++ {
++ gomp_ull q = counts[0] / num_ents;
++ gomp_ull t = counts[0] % num_ents;
++ doacross->boundary_ull = t * (q + 1);
++ doacross->q_ull = q;
++ doacross->t = t;
++ }
++ ws->doacross = doacross;
++}
++
++/* DOACROSS POST operation. */
++
++void
++GOMP_doacross_ull_post (gomp_ull *counts)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ struct gomp_work_share *ws = thr->ts.work_share;
++ struct gomp_doacross_work_share *doacross = ws->doacross;
++ unsigned long ent;
++ unsigned int i;
++
++ if (__builtin_expect (doacross == NULL, 0))
++ {
++ __sync_synchronize ();
++ return;
++ }
++
++ if (__builtin_expect (ws->sched == GFS_STATIC, 1))
++ ent = thr->ts.team_id;
++ else if (ws->sched == GFS_GUIDED)
++ ent = counts[0];
++ else
++ ent = counts[0] / doacross->chunk_size_ull;
++
++ if (__builtin_expect (doacross->flattened, 1))
++ {
++ unsigned long *array = (unsigned long *) (doacross->array
++ + ent * doacross->elt_sz);
++ gomp_ull flattened
++ = counts[0] << doacross->shift_counts[0];
++
++ for (i = 1; i < doacross->ncounts; i++)
++ flattened |= counts[i] << doacross->shift_counts[i];
++ flattened++;
++ if (flattened == __atomic_load_n (array, MEMMODEL_ACQUIRE))
++ __atomic_thread_fence (MEMMODEL_RELEASE);
++ else
++ __atomic_store_n (array, flattened, MEMMODEL_RELEASE);
++ return;
++ }
++
++ __atomic_thread_fence (MEMMODEL_ACQUIRE);
++ if (sizeof (gomp_ull) == sizeof (unsigned long))
++ {
++ gomp_ull *array = (gomp_ull *) (doacross->array
++ + ent * doacross->elt_sz);
++
++ for (i = doacross->ncounts; i-- > 0; )
++ {
++ if (counts[i] + 1UL != __atomic_load_n (&array[i], MEMMODEL_RELAXED))
++ __atomic_store_n (&array[i], counts[i] + 1UL, MEMMODEL_RELEASE);
++ }
++ }
++ else
++ {
++ unsigned long *array = (unsigned long *) (doacross->array
++ + ent * doacross->elt_sz);
++
++ for (i = doacross->ncounts; i-- > 0; )
++ {
++ gomp_ull cull = counts[i] + 1UL;
++ unsigned long c = (unsigned long) cull;
++ if (c != __atomic_load_n (&array[2 * i + 1], MEMMODEL_RELAXED))
++ __atomic_store_n (&array[2 * i + 1], c, MEMMODEL_RELEASE);
++ c = cull >> (__SIZEOF_LONG_LONG__ * __CHAR_BIT__ / 2);
++ if (c != __atomic_load_n (&array[2 * i], MEMMODEL_RELAXED))
++ __atomic_store_n (&array[2 * i], c, MEMMODEL_RELEASE);
++ }
++ }
++}
++
++/* DOACROSS WAIT operation. */
++
++void
++GOMP_doacross_ull_wait (gomp_ull first, ...)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ struct gomp_work_share *ws = thr->ts.work_share;
++ struct gomp_doacross_work_share *doacross = ws->doacross;
++ va_list ap;
++ unsigned long ent;
++ unsigned int i;
++
++ if (__builtin_expect (doacross == NULL, 0))
++ {
++ __sync_synchronize ();
++ return;
++ }
++
++ if (__builtin_expect (ws->sched == GFS_STATIC, 1))
++ {
++ if (ws->chunk_size_ull == 0)
++ {
++ if (first < doacross->boundary_ull)
++ ent = first / (doacross->q_ull + 1);
++ else
++ ent = (first - doacross->boundary_ull) / doacross->q_ull
++ + doacross->t;
++ }
++ else
++ ent = first / ws->chunk_size_ull % thr->ts.team->nthreads;
++ }
++ else if (ws->sched == GFS_GUIDED)
++ ent = first;
++ else
++ ent = first / doacross->chunk_size_ull;
++
++ if (__builtin_expect (doacross->flattened, 1))
++ {
++ unsigned long *array = (unsigned long *) (doacross->array
++ + ent * doacross->elt_sz);
++ gomp_ull flattened = first << doacross->shift_counts[0];
++ unsigned long cur;
++
++ va_start (ap, first);
++ for (i = 1; i < doacross->ncounts; i++)
++ flattened |= va_arg (ap, gomp_ull)
++ << doacross->shift_counts[i];
++ cur = __atomic_load_n (array, MEMMODEL_ACQUIRE);
++ if (flattened < cur)
++ {
++ __atomic_thread_fence (MEMMODEL_RELEASE);
++ va_end (ap);
++ return;
++ }
++ doacross_spin (array, flattened, cur);
++ __atomic_thread_fence (MEMMODEL_RELEASE);
++ va_end (ap);
++ return;
++ }
++
++ if (sizeof (gomp_ull) == sizeof (unsigned long))
++ {
++ gomp_ull *array = (gomp_ull *) (doacross->array
++ + ent * doacross->elt_sz);
++ do
++ {
++ va_start (ap, first);
++ for (i = 0; i < doacross->ncounts; i++)
++ {
++ gomp_ull thisv
++ = (i ? va_arg (ap, gomp_ull) : first) + 1;
++ gomp_ull cur = __atomic_load_n (&array[i], MEMMODEL_RELAXED);
++ if (thisv < cur)
++ {
++ i = doacross->ncounts;
++ break;
++ }
++ if (thisv > cur)
++ break;
++ }
++ va_end (ap);
++ if (i == doacross->ncounts)
++ break;
++ cpu_relax ();
++ }
++ while (1);
++ }
++ else
++ {
++ unsigned long *array = (unsigned long *) (doacross->array
++ + ent * doacross->elt_sz);
++ do
++ {
++ va_start (ap, first);
++ for (i = 0; i < doacross->ncounts; i++)
++ {
++ gomp_ull thisv
++ = (i ? va_arg (ap, gomp_ull) : first) + 1;
++ unsigned long t
++ = thisv >> (__SIZEOF_LONG_LONG__ * __CHAR_BIT__ / 2);
++ unsigned long cur
++ = __atomic_load_n (&array[2 * i], MEMMODEL_RELAXED);
++ if (t < cur)
++ {
++ i = doacross->ncounts;
++ break;
++ }
++ if (t > cur)
++ break;
++ t = thisv;
++ cur = __atomic_load_n (&array[2 * i + 1], MEMMODEL_RELAXED);
++ if (t < cur)
++ {
++ i = doacross->ncounts;
++ break;
++ }
++ if (t > cur)
++ break;
++ }
++ va_end (ap);
++ if (i == doacross->ncounts)
++ break;
++ cpu_relax ();
++ }
++ while (1);
++ }
++ __sync_synchronize ();
++}
+--- libgomp/loop.c.jj 2014-05-15 10:56:36.487505570 +0200
++++ libgomp/loop.c 2016-07-13 16:57:13.488423109 +0200
+@@ -110,6 +110,11 @@ gomp_loop_static_start (long start, long
+ return !gomp_iter_static_next (istart, iend);
+ }
+
++/* The current dynamic implementation is always monotonic. The
++ entrypoints without nonmonotonic in them have to be always monotonic,
++ but the nonmonotonic ones could be changed to use work-stealing for
++ improved scalability. */
++
+ static bool
+ gomp_loop_dynamic_start (long start, long end, long incr, long chunk_size,
+ long *istart, long *iend)
+@@ -135,6 +140,9 @@ gomp_loop_dynamic_start (long start, lon
+ return ret;
+ }
+
++/* Similarly as for dynamic, though the question is how can the chunk sizes
++ be decreased without a central locking or atomics. */
++
+ static bool
+ gomp_loop_guided_start (long start, long end, long incr, long chunk_size,
+ long *istart, long *iend)
+@@ -168,13 +176,16 @@ GOMP_loop_runtime_start (long start, lon
+ switch (icv->run_sched_var)
+ {
+ case GFS_STATIC:
+- return gomp_loop_static_start (start, end, incr, icv->run_sched_modifier,
++ return gomp_loop_static_start (start, end, incr,
++ icv->run_sched_chunk_size,
+ istart, iend);
+ case GFS_DYNAMIC:
+- return gomp_loop_dynamic_start (start, end, incr, icv->run_sched_modifier,
++ return gomp_loop_dynamic_start (start, end, incr,
++ icv->run_sched_chunk_size,
+ istart, iend);
+ case GFS_GUIDED:
+- return gomp_loop_guided_start (start, end, incr, icv->run_sched_modifier,
++ return gomp_loop_guided_start (start, end, incr,
++ icv->run_sched_chunk_size,
+ istart, iend);
+ case GFS_AUTO:
+ /* For now map to schedule(static), later on we could play with feedback
+@@ -265,15 +276,15 @@ GOMP_loop_ordered_runtime_start (long st
+ {
+ case GFS_STATIC:
+ return gomp_loop_ordered_static_start (start, end, incr,
+- icv->run_sched_modifier,
++ icv->run_sched_chunk_size,
+ istart, iend);
+ case GFS_DYNAMIC:
+ return gomp_loop_ordered_dynamic_start (start, end, incr,
+- icv->run_sched_modifier,
++ icv->run_sched_chunk_size,
+ istart, iend);
+ case GFS_GUIDED:
+ return gomp_loop_ordered_guided_start (start, end, incr,
+- icv->run_sched_modifier,
++ icv->run_sched_chunk_size,
+ istart, iend);
+ case GFS_AUTO:
+ /* For now map to schedule(static), later on we could play with feedback
+@@ -285,6 +296,111 @@ GOMP_loop_ordered_runtime_start (long st
+ }
+ }
+
++/* The *_doacross_*_start routines are similar. The only difference is that
++ this work-share construct is initialized to expect an ORDERED(N) - DOACROSS
++ section, and the worksharing loop iterates always from 0 to COUNTS[0] - 1
++ and other COUNTS array elements tell the library number of iterations
++ in the ordered inner loops. */
++
++static bool
++gomp_loop_doacross_static_start (unsigned ncounts, long *counts,
++ long chunk_size, long *istart, long *iend)
++{
++ struct gomp_thread *thr = gomp_thread ();
++
++ thr->ts.static_trip = 0;
++ if (gomp_work_share_start (false))
++ {
++ gomp_loop_init (thr->ts.work_share, 0, counts[0], 1,
++ GFS_STATIC, chunk_size);
++ gomp_doacross_init (ncounts, counts, chunk_size);
++ gomp_work_share_init_done ();
++ }
++
++ return !gomp_iter_static_next (istart, iend);
++}
++
++static bool
++gomp_loop_doacross_dynamic_start (unsigned ncounts, long *counts,
++ long chunk_size, long *istart, long *iend)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ bool ret;
++
++ if (gomp_work_share_start (false))
++ {
++ gomp_loop_init (thr->ts.work_share, 0, counts[0], 1,
++ GFS_DYNAMIC, chunk_size);
++ gomp_doacross_init (ncounts, counts, chunk_size);
++ gomp_work_share_init_done ();
++ }
++
++#ifdef HAVE_SYNC_BUILTINS
++ ret = gomp_iter_dynamic_next (istart, iend);
++#else
++ gomp_mutex_lock (&thr->ts.work_share->lock);
++ ret = gomp_iter_dynamic_next_locked (istart, iend);
++ gomp_mutex_unlock (&thr->ts.work_share->lock);
++#endif
++
++ return ret;
++}
++
++static bool
++gomp_loop_doacross_guided_start (unsigned ncounts, long *counts,
++ long chunk_size, long *istart, long *iend)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ bool ret;
++
++ if (gomp_work_share_start (false))
++ {
++ gomp_loop_init (thr->ts.work_share, 0, counts[0], 1,
++ GFS_GUIDED, chunk_size);
++ gomp_doacross_init (ncounts, counts, chunk_size);
++ gomp_work_share_init_done ();
++ }
++
++#ifdef HAVE_SYNC_BUILTINS
++ ret = gomp_iter_guided_next (istart, iend);
++#else
++ gomp_mutex_lock (&thr->ts.work_share->lock);
++ ret = gomp_iter_guided_next_locked (istart, iend);
++ gomp_mutex_unlock (&thr->ts.work_share->lock);
++#endif
++
++ return ret;
++}
++
++bool
++GOMP_loop_doacross_runtime_start (unsigned ncounts, long *counts,
++ long *istart, long *iend)
++{
++ struct gomp_task_icv *icv = gomp_icv (false);
++ switch (icv->run_sched_var)
++ {
++ case GFS_STATIC:
++ return gomp_loop_doacross_static_start (ncounts, counts,
++ icv->run_sched_chunk_size,
++ istart, iend);
++ case GFS_DYNAMIC:
++ return gomp_loop_doacross_dynamic_start (ncounts, counts,
++ icv->run_sched_chunk_size,
++ istart, iend);
++ case GFS_GUIDED:
++ return gomp_loop_doacross_guided_start (ncounts, counts,
++ icv->run_sched_chunk_size,
++ istart, iend);
++ case GFS_AUTO:
++ /* For now map to schedule(static), later on we could play with feedback
++ driven choice. */
++ return gomp_loop_doacross_static_start (ncounts, counts,
++ 0, istart, iend);
++ default:
++ abort ();
++ }
++}
++
+ /* The *_next routines are called when the thread completes processing of
+ the iteration block currently assigned to it. If the work-share
+ construct is bound directly to a parallel construct, then the iteration
+@@ -483,7 +599,7 @@ GOMP_parallel_loop_runtime_start (void (
+ {
+ struct gomp_task_icv *icv = gomp_icv (false);
+ gomp_parallel_loop_start (fn, data, num_threads, start, end, incr,
+- icv->run_sched_var, icv->run_sched_modifier, 0);
++ icv->run_sched_var, icv->run_sched_chunk_size, 0);
+ }
+
+ ialias_redirect (GOMP_parallel_end)
+@@ -521,6 +637,37 @@ GOMP_parallel_loop_guided (void (*fn) (v
+ GOMP_parallel_end ();
+ }
+
++#ifdef HAVE_ATTRIBUTE_ALIAS
++extern __typeof(GOMP_parallel_loop_dynamic) GOMP_parallel_loop_nonmonotonic_dynamic
++ __attribute__((alias ("GOMP_parallel_loop_dynamic")));
++extern __typeof(GOMP_parallel_loop_guided) GOMP_parallel_loop_nonmonotonic_guided
++ __attribute__((alias ("GOMP_parallel_loop_guided")));
++#else
++void
++GOMP_parallel_loop_nonmonotonic_dynamic (void (*fn) (void *), void *data,
++ unsigned num_threads, long start,
++ long end, long incr, long chunk_size,
++ unsigned flags)
++{
++ gomp_parallel_loop_start (fn, data, num_threads, start, end, incr,
++ GFS_DYNAMIC, chunk_size, flags);
++ fn (data);
++ GOMP_parallel_end ();
++}
++
++void
++GOMP_parallel_loop_nonmonotonic_guided (void (*fn) (void *), void *data,
++ unsigned num_threads, long start,
++ long end, long incr, long chunk_size,
++ unsigned flags)
++{
++ gomp_parallel_loop_start (fn, data, num_threads, start, end, incr,
++ GFS_GUIDED, chunk_size, flags);
++ fn (data);
++ GOMP_parallel_end ();
++}
++#endif
++
+ void
+ GOMP_parallel_loop_runtime (void (*fn) (void *), void *data,
+ unsigned num_threads, long start, long end,
+@@ -528,7 +675,7 @@ GOMP_parallel_loop_runtime (void (*fn) (
+ {
+ struct gomp_task_icv *icv = gomp_icv (false);
+ gomp_parallel_loop_start (fn, data, num_threads, start, end, incr,
+- icv->run_sched_var, icv->run_sched_modifier,
++ icv->run_sched_var, icv->run_sched_chunk_size,
+ flags);
+ fn (data);
+ GOMP_parallel_end ();
+@@ -569,6 +716,10 @@ extern __typeof(gomp_loop_dynamic_start)
+ __attribute__((alias ("gomp_loop_dynamic_start")));
+ extern __typeof(gomp_loop_guided_start) GOMP_loop_guided_start
+ __attribute__((alias ("gomp_loop_guided_start")));
++extern __typeof(gomp_loop_dynamic_start) GOMP_loop_nonmonotonic_dynamic_start
++ __attribute__((alias ("gomp_loop_dynamic_start")));
++extern __typeof(gomp_loop_guided_start) GOMP_loop_nonmonotonic_guided_start
++ __attribute__((alias ("gomp_loop_guided_start")));
+
+ extern __typeof(gomp_loop_ordered_static_start) GOMP_loop_ordered_static_start
+ __attribute__((alias ("gomp_loop_ordered_static_start")));
+@@ -577,12 +728,23 @@ extern __typeof(gomp_loop_ordered_dynami
+ extern __typeof(gomp_loop_ordered_guided_start) GOMP_loop_ordered_guided_start
+ __attribute__((alias ("gomp_loop_ordered_guided_start")));
+
++extern __typeof(gomp_loop_doacross_static_start) GOMP_loop_doacross_static_start
++ __attribute__((alias ("gomp_loop_doacross_static_start")));
++extern __typeof(gomp_loop_doacross_dynamic_start) GOMP_loop_doacross_dynamic_start
++ __attribute__((alias ("gomp_loop_doacross_dynamic_start")));
++extern __typeof(gomp_loop_doacross_guided_start) GOMP_loop_doacross_guided_start
++ __attribute__((alias ("gomp_loop_doacross_guided_start")));
++
+ extern __typeof(gomp_loop_static_next) GOMP_loop_static_next
+ __attribute__((alias ("gomp_loop_static_next")));
+ extern __typeof(gomp_loop_dynamic_next) GOMP_loop_dynamic_next
+ __attribute__((alias ("gomp_loop_dynamic_next")));
+ extern __typeof(gomp_loop_guided_next) GOMP_loop_guided_next
+ __attribute__((alias ("gomp_loop_guided_next")));
++extern __typeof(gomp_loop_dynamic_next) GOMP_loop_nonmonotonic_dynamic_next
++ __attribute__((alias ("gomp_loop_dynamic_next")));
++extern __typeof(gomp_loop_guided_next) GOMP_loop_nonmonotonic_guided_next
++ __attribute__((alias ("gomp_loop_guided_next")));
+
+ extern __typeof(gomp_loop_ordered_static_next) GOMP_loop_ordered_static_next
+ __attribute__((alias ("gomp_loop_ordered_static_next")));
+@@ -613,6 +775,21 @@ GOMP_loop_guided_start (long start, long
+ }
+
+ bool
++GOMP_loop_nonmonotonic_dynamic_start (long start, long end, long incr,
++ long chunk_size, long *istart,
++ long *iend)
++{
++ return gomp_loop_dynamic_start (start, end, incr, chunk_size, istart, iend);
++}
++
++bool
++GOMP_loop_nonmonotonic_guided_start (long start, long end, long incr,
++ long chunk_size, long *istart, long *iend)
++{
++ return gomp_loop_guided_start (start, end, incr, chunk_size, istart, iend);
++}
++
++bool
+ GOMP_loop_ordered_static_start (long start, long end, long incr,
+ long chunk_size, long *istart, long *iend)
+ {
+@@ -637,6 +814,30 @@ GOMP_loop_ordered_guided_start (long sta
+ }
+
+ bool
++GOMP_loop_doacross_static_start (unsigned ncounts, long *counts,
++ long chunk_size, long *istart, long *iend)
++{
++ return gomp_loop_doacross_static_start (ncounts, counts, chunk_size,
++ istart, iend);
++}
++
++bool
++GOMP_loop_doacross_dynamic_start (unsigned ncounts, long *counts,
++ long chunk_size, long *istart, long *iend)
++{
++ return gomp_loop_doacross_dynamic_start (ncounts, counts, chunk_size,
++ istart, iend);
++}
++
++bool
++GOMP_loop_doacross_guided_start (unsigned ncounts, long *counts,
++ long chunk_size, long *istart, long *iend)
++{
++ return gomp_loop_doacross_guided_start (ncounts, counts, chunk_size,
++ istart, iend);
++}
++
++bool
+ GOMP_loop_static_next (long *istart, long *iend)
+ {
+ return gomp_loop_static_next (istart, iend);
+@@ -653,6 +854,18 @@ GOMP_loop_guided_next (long *istart, lon
+ {
+ return gomp_loop_guided_next (istart, iend);
+ }
++
++bool
++GOMP_loop_nonmonotonic_dynamic_next (long *istart, long *iend)
++{
++ return gomp_loop_dynamic_next (istart, iend);
++}
++
++bool
++GOMP_loop_nonmonotonic_guided_next (long *istart, long *iend)
++{
++ return gomp_loop_guided_next (istart, iend);
++}
+
+ bool
+ GOMP_loop_ordered_static_next (long *istart, long *iend)
+--- libgomp/error.c.jj 2013-01-21 16:00:31.834953566 +0100
++++ libgomp/error.c 2016-07-13 16:57:04.437535335 +0200
+@@ -35,7 +35,26 @@
+ #include
+
+
+-static void
++#undef gomp_vdebug
++void
++gomp_vdebug (int kind __attribute__ ((unused)), const char *msg, va_list list)
++{
++ if (gomp_debug_var)
++ vfprintf (stderr, msg, list);
++}
++
++#undef gomp_debug
++void
++gomp_debug (int kind, const char *msg, ...)
++{
++ va_list list;
++
++ va_start (list, msg);
++ gomp_vdebug (kind, msg, list);
++ va_end (list);
++}
++
++void
+ gomp_verror (const char *fmt, va_list list)
+ {
+ fputs ("\nlibgomp: ", stderr);
+@@ -54,13 +73,18 @@ gomp_error (const char *fmt, ...)
+ }
+
+ void
++gomp_vfatal (const char *fmt, va_list list)
++{
++ gomp_verror (fmt, list);
++ exit (EXIT_FAILURE);
++}
++
++void
+ gomp_fatal (const char *fmt, ...)
+ {
+ va_list list;
+
+ va_start (list, fmt);
+- gomp_verror (fmt, list);
++ gomp_vfatal (fmt, list);
+ va_end (list);
+-
+- exit (EXIT_FAILURE);
+ }
+--- libgomp/Makefile.am.jj 2014-05-15 11:12:10.000000000 +0200
++++ libgomp/Makefile.am 2016-07-14 16:10:51.968202878 +0200
+@@ -60,7 +60,13 @@ libgomp_la_LINK = $(LINK) $(libgomp_la_L
+ libgomp_la_SOURCES = alloc.c barrier.c critical.c env.c error.c iter.c \
+ iter_ull.c loop.c loop_ull.c ordered.c parallel.c sections.c single.c \
+ task.c team.c work.c lock.c mutex.c proc.c sem.c bar.c ptrlock.c \
+- time.c fortran.c affinity.c target.c
++ time.c fortran.c affinity.c target.c splay-tree.c libgomp-plugin.c \
++ oacc-parallel.c oacc-host.c oacc-init.c oacc-mem.c oacc-async.c \
++ oacc-plugin.c oacc-cuda.c priority_queue.c
++
++if USE_FORTRAN
++libgomp_la_SOURCES += openacc.f90
++endif
+
+ nodist_noinst_HEADERS = libgomp_f.h
+ nodist_libsubinclude_HEADERS = omp.h
+--- libgomp/Makefile.in.jj 2014-05-15 11:12:10.000000000 +0200
++++ libgomp/Makefile.in 2016-07-14 16:11:10.981954087 +0200
+@@ -36,6 +36,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++@USE_FORTRAN_TRUE@am__append_1 = openacc.f90
+ subdir = .
+ DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+@@ -92,11 +93,15 @@ am__installdirs = "$(DESTDIR)$(toolexecl
+ "$(DESTDIR)$(toolexeclibdir)"
+ LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
+ libgomp_la_LIBADD =
++@USE_FORTRAN_TRUE@am__objects_1 = openacc.lo
+ am_libgomp_la_OBJECTS = alloc.lo barrier.lo critical.lo env.lo \
+ error.lo iter.lo iter_ull.lo loop.lo loop_ull.lo ordered.lo \
+ parallel.lo sections.lo single.lo task.lo team.lo work.lo \
+ lock.lo mutex.lo proc.lo sem.lo bar.lo ptrlock.lo time.lo \
+- fortran.lo affinity.lo target.lo
++ fortran.lo affinity.lo target.lo splay-tree.lo \
++ libgomp-plugin.lo oacc-parallel.lo oacc-host.lo oacc-init.lo \
++ oacc-mem.lo oacc-async.lo oacc-plugin.lo oacc-cuda.lo \
++ priority_queue.lo $(am__objects_1)
+ libgomp_la_OBJECTS = $(am_libgomp_la_OBJECTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/../depcomp
+@@ -108,6 +113,13 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
++FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS)
++LTFCCOMPILE = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS)
++FCLD = $(FC)
++FCLINK = $(LIBTOOL) --tag=FC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(libgomp_la_SOURCES)
+ MULTISRCTOP =
+ MULTIBUILDTOP =
+@@ -315,10 +327,12 @@ libgomp_la_LDFLAGS = $(libgomp_version_i
+ libgomp_la_DEPENDENCIES = $(libgomp_version_dep)
+ libgomp_la_LINK = $(LINK) $(libgomp_la_LDFLAGS)
+ libgomp_la_SOURCES = alloc.c barrier.c critical.c env.c error.c iter.c \
+- iter_ull.c loop.c loop_ull.c ordered.c parallel.c sections.c single.c \
+- task.c team.c work.c lock.c mutex.c proc.c sem.c bar.c ptrlock.c \
+- time.c fortran.c affinity.c target.c
+-
++ iter_ull.c loop.c loop_ull.c ordered.c parallel.c sections.c \
++ single.c task.c team.c work.c lock.c mutex.c proc.c sem.c \
++ bar.c ptrlock.c time.c fortran.c affinity.c target.c \
++ splay-tree.c libgomp-plugin.c oacc-parallel.c oacc-host.c \
++ oacc-init.c oacc-mem.c oacc-async.c oacc-plugin.c oacc-cuda.c \
++ priority_queue.c $(am__append_1)
+ nodist_noinst_HEADERS = libgomp_f.h
+ nodist_libsubinclude_HEADERS = omp.h
+ @USE_FORTRAN_TRUE@nodist_finclude_HEADERS = omp_lib.h omp_lib.f90 omp_lib.mod omp_lib_kinds.mod
+@@ -351,7 +365,7 @@ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+ .SUFFIXES:
+-.SUFFIXES: .c .dvi .lo .o .obj .ps
++.SUFFIXES: .c .dvi .f90 .lo .o .obj .ps
+ am--refresh:
+ @:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+@@ -463,17 +477,27 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fortran.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iter.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iter_ull.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgomp-plugin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lock.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loop.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loop_ull.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mutex.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oacc-async.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oacc-cuda.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oacc-host.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oacc-init.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oacc-mem.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oacc-parallel.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oacc-plugin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ordered.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parallel.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/priority_queue.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proc.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptrlock.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sections.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sem.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/single.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splay-tree.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/target.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/team.Plo@am__quote@
+@@ -501,6 +525,15 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
++.f90.o:
++ $(FCCOMPILE) -c -o $@ $<
++
++.f90.obj:
++ $(FCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++
++.f90.lo:
++ $(LTFCCOMPILE) -c -o $@ $<
++
+ mostlyclean-libtool:
+ -rm -f *.lo
+
+--- libgomp/task.c.jj 2014-08-06 16:25:16.575091658 +0200
++++ libgomp/task.c 2016-07-13 17:47:58.722758497 +0200
+@@ -28,6 +28,7 @@
+ #include "libgomp.h"
+ #include
+ #include
++#include "gomp-constants.h"
+
+ typedef struct gomp_task_depend_entry *hash_entry_type;
+
+@@ -63,6 +64,14 @@ void
+ gomp_init_task (struct gomp_task *task, struct gomp_task *parent_task,
+ struct gomp_task_icv *prev_icv)
+ {
++ /* It would seem that using memset here would be a win, but it turns
++ out that partially filling gomp_task allows us to keep the
++ overhead of task creation low. In the nqueens-1.c test, for a
++ sufficiently large N, we drop the overhead from 5-6% to 1%.
++
++ Note, the nqueens-1.c test in serial mode is a good test to
++ benchmark the overhead of creating tasks as there are millions of
++ tiny tasks created that all run undeferred. */
+ task->parent = parent_task;
+ task->icv = *prev_icv;
+ task->kind = GOMP_TASK_IMPLICIT;
+@@ -71,7 +80,7 @@ gomp_init_task (struct gomp_task *task,
+ task->final_task = false;
+ task->copy_ctors_done = false;
+ task->parent_depends_on = false;
+- task->children = NULL;
++ priority_queue_init (&task->children_queue);
+ task->taskgroup = NULL;
+ task->dependers = NULL;
+ task->depend_hash = NULL;
+@@ -90,30 +99,194 @@ gomp_end_task (void)
+ thr->task = task->parent;
+ }
+
++/* Clear the parent field of every task in LIST. */
++
+ static inline void
+-gomp_clear_parent (struct gomp_task *children)
++gomp_clear_parent_in_list (struct priority_list *list)
+ {
+- struct gomp_task *task = children;
+-
+- if (task)
++ struct priority_node *p = list->tasks;
++ if (p)
+ do
+ {
+- task->parent = NULL;
+- task = task->next_child;
++ priority_node_to_task (PQ_CHILDREN, p)->parent = NULL;
++ p = p->next;
+ }
+- while (task != children);
++ while (p != list->tasks);
++}
++
++/* Splay tree version of gomp_clear_parent_in_list.
++
++ Clear the parent field of every task in NODE within SP, and free
++ the node when done. */
++
++static void
++gomp_clear_parent_in_tree (prio_splay_tree sp, prio_splay_tree_node node)
++{
++ if (!node)
++ return;
++ prio_splay_tree_node left = node->left, right = node->right;
++ gomp_clear_parent_in_list (&node->key.l);
++#if _LIBGOMP_CHECKING_
++ memset (node, 0xaf, sizeof (*node));
++#endif
++ /* No need to remove the node from the tree. We're nuking
++ everything, so just free the nodes and our caller can clear the
++ entire splay tree. */
++ free (node);
++ gomp_clear_parent_in_tree (sp, left);
++ gomp_clear_parent_in_tree (sp, right);
++}
++
++/* Clear the parent field of every task in Q and remove every task
++ from Q. */
++
++static inline void
++gomp_clear_parent (struct priority_queue *q)
++{
++ if (priority_queue_multi_p (q))
++ {
++ gomp_clear_parent_in_tree (&q->t, q->t.root);
++ /* All the nodes have been cleared in gomp_clear_parent_in_tree.
++ No need to remove anything. We can just nuke everything. */
++ q->t.root = NULL;
++ }
++ else
++ gomp_clear_parent_in_list (&q->l);
+ }
+
+-static void gomp_task_maybe_wait_for_dependencies (void **depend);
++/* Helper function for GOMP_task and gomp_create_target_task.
++
++ For a TASK with in/out dependencies, fill in the various dependency
++ queues. PARENT is the parent of said task. DEPEND is as in
++ GOMP_task. */
++
++static void
++gomp_task_handle_depend (struct gomp_task *task, struct gomp_task *parent,
++ void **depend)
++{
++ size_t ndepend = (uintptr_t) depend[0];
++ size_t nout = (uintptr_t) depend[1];
++ size_t i;
++ hash_entry_type ent;
++
++ task->depend_count = ndepend;
++ task->num_dependees = 0;
++ if (parent->depend_hash == NULL)
++ parent->depend_hash = htab_create (2 * ndepend > 12 ? 2 * ndepend : 12);
++ for (i = 0; i < ndepend; i++)
++ {
++ task->depend[i].addr = depend[2 + i];
++ task->depend[i].next = NULL;
++ task->depend[i].prev = NULL;
++ task->depend[i].task = task;
++ task->depend[i].is_in = i >= nout;
++ task->depend[i].redundant = false;
++ task->depend[i].redundant_out = false;
++
++ hash_entry_type *slot = htab_find_slot (&parent->depend_hash,
++ &task->depend[i], INSERT);
++ hash_entry_type out = NULL, last = NULL;
++ if (*slot)
++ {
++ /* If multiple depends on the same task are the same, all but the
++ first one are redundant. As inout/out come first, if any of them
++ is inout/out, it will win, which is the right semantics. */
++ if ((*slot)->task == task)
++ {
++ task->depend[i].redundant = true;
++ continue;
++ }
++ for (ent = *slot; ent; ent = ent->next)
++ {
++ if (ent->redundant_out)
++ break;
++
++ last = ent;
++
++ /* depend(in:...) doesn't depend on earlier depend(in:...). */
++ if (i >= nout && ent->is_in)
++ continue;
++
++ if (!ent->is_in)
++ out = ent;
++
++ struct gomp_task *tsk = ent->task;
++ if (tsk->dependers == NULL)
++ {
++ tsk->dependers
++ = gomp_malloc (sizeof (struct gomp_dependers_vec)
++ + 6 * sizeof (struct gomp_task *));
++ tsk->dependers->n_elem = 1;
++ tsk->dependers->allocated = 6;
++ tsk->dependers->elem[0] = task;
++ task->num_dependees++;
++ continue;
++ }
++ /* We already have some other dependency on tsk from earlier
++ depend clause. */
++ else if (tsk->dependers->n_elem
++ && (tsk->dependers->elem[tsk->dependers->n_elem - 1]
++ == task))
++ continue;
++ else if (tsk->dependers->n_elem == tsk->dependers->allocated)
++ {
++ tsk->dependers->allocated
++ = tsk->dependers->allocated * 2 + 2;
++ tsk->dependers
++ = gomp_realloc (tsk->dependers,
++ sizeof (struct gomp_dependers_vec)
++ + (tsk->dependers->allocated
++ * sizeof (struct gomp_task *)));
++ }
++ tsk->dependers->elem[tsk->dependers->n_elem++] = task;
++ task->num_dependees++;
++ }
++ task->depend[i].next = *slot;
++ (*slot)->prev = &task->depend[i];
++ }
++ *slot = &task->depend[i];
++
++ /* There is no need to store more than one depend({,in}out:) task per
++ address in the hash table chain for the purpose of creation of
++ deferred tasks, because each out depends on all earlier outs, thus it
++ is enough to record just the last depend({,in}out:). For depend(in:),
++ we need to keep all of the previous ones not terminated yet, because
++ a later depend({,in}out:) might need to depend on all of them. So, if
++ the new task's clause is depend({,in}out:), we know there is at most
++ one other depend({,in}out:) clause in the list (out). For
++ non-deferred tasks we want to see all outs, so they are moved to the
++ end of the chain, after first redundant_out entry all following
++ entries should be redundant_out. */
++ if (!task->depend[i].is_in && out)
++ {
++ if (out != last)
++ {
++ out->next->prev = out->prev;
++ out->prev->next = out->next;
++ out->next = last->next;
++ out->prev = last;
++ last->next = out;
++ if (out->next)
++ out->next->prev = out;
++ }
++ out->redundant_out = true;
++ }
++ }
++}
+
+ /* Called when encountering an explicit task directive. If IF_CLAUSE is
+ false, then we must not delay in executing the task. If UNTIED is true,
+- then the task may be executed by any member of the team. */
++ then the task may be executed by any member of the team.
++
++ DEPEND is an array containing:
++ depend[0]: number of depend elements.
++ depend[1]: number of depend elements of type "out".
++ depend[2..N+1]: address of [1..N]th depend element. */
+
+ void
+ GOMP_task (void (*fn) (void *), void *data, void (*cpyfn) (void *, void *),
+ long arg_size, long arg_align, bool if_clause, unsigned flags,
+- void **depend)
++ void **depend, int priority)
+ {
+ struct gomp_thread *thr = gomp_thread ();
+ struct gomp_team *team = thr->ts.team;
+@@ -125,8 +298,7 @@ GOMP_task (void (*fn) (void *), void *da
+ might be running on different thread than FN. */
+ if (cpyfn)
+ if_clause = false;
+- if (flags & 1)
+- flags &= ~1;
++ flags &= ~GOMP_TASK_FLAG_UNTIED;
+ #endif
+
+ /* If parallel or taskgroup has been cancelled, don't start new tasks. */
+@@ -135,6 +307,11 @@ GOMP_task (void (*fn) (void *), void *da
+ || (thr->task->taskgroup && thr->task->taskgroup->cancelled)))
+ return;
+
++ if ((flags & GOMP_TASK_FLAG_PRIORITY) == 0)
++ priority = 0;
++ else if (priority > gomp_max_task_priority_var)
++ priority = gomp_max_task_priority_var;
++
+ if (!if_clause || team == NULL
+ || (thr->task && thr->task->final_task)
+ || team->task_count > 64 * team->nthreads)
+@@ -147,12 +324,15 @@ GOMP_task (void (*fn) (void *), void *da
+ depend clauses for non-deferred tasks other than this, because
+ the parent task is suspended until the child task finishes and thus
+ it can't start further child tasks. */
+- if ((flags & 8) && thr->task && thr->task->depend_hash)
++ if ((flags & GOMP_TASK_FLAG_DEPEND)
++ && thr->task && thr->task->depend_hash)
+ gomp_task_maybe_wait_for_dependencies (depend);
+
+ gomp_init_task (&task, thr->task, gomp_icv (false));
+- task.kind = GOMP_TASK_IFFALSE;
+- task.final_task = (thr->task && thr->task->final_task) || (flags & 2);
++ task.kind = GOMP_TASK_UNDEFERRED;
++ task.final_task = (thr->task && thr->task->final_task)
++ || (flags & GOMP_TASK_FLAG_FINAL);
++ task.priority = priority;
+ if (thr->task)
+ {
+ task.in_tied_task = thr->task->in_tied_task;
+@@ -178,10 +358,10 @@ GOMP_task (void (*fn) (void *), void *da
+ child thread, but seeing a stale non-NULL value is not a
+ problem. Once past the task_lock acquisition, this thread
+ will see the real value of task.children. */
+- if (task.children != NULL)
++ if (!priority_queue_empty_p (&task.children_queue, MEMMODEL_RELAXED))
+ {
+ gomp_mutex_lock (&team->task_lock);
+- gomp_clear_parent (task.children);
++ gomp_clear_parent (&task.children_queue);
+ gomp_mutex_unlock (&team->task_lock);
+ }
+ gomp_end_task ();
+@@ -195,7 +375,7 @@ GOMP_task (void (*fn) (void *), void *da
+ bool do_wake;
+ size_t depend_size = 0;
+
+- if (flags & 8)
++ if (flags & GOMP_TASK_FLAG_DEPEND)
+ depend_size = ((uintptr_t) depend[0]
+ * sizeof (struct gomp_task_depend_entry));
+ task = gomp_malloc (sizeof (*task) + depend_size
+@@ -203,7 +383,8 @@ GOMP_task (void (*fn) (void *), void *da
+ arg = (char *) (((uintptr_t) (task + 1) + depend_size + arg_align - 1)
+ & ~(uintptr_t) (arg_align - 1));
+ gomp_init_task (task, parent, gomp_icv (false));
+- task->kind = GOMP_TASK_IFFALSE;
++ task->priority = priority;
++ task->kind = GOMP_TASK_UNDEFERRED;
+ task->in_tied_task = parent->in_tied_task;
+ task->taskgroup = taskgroup;
+ thr->task = task;
+@@ -218,7 +399,7 @@ GOMP_task (void (*fn) (void *), void *da
+ task->kind = GOMP_TASK_WAITING;
+ task->fn = fn;
+ task->fn_data = arg;
+- task->final_task = (flags & 2) >> 1;
++ task->final_task = (flags & GOMP_TASK_FLAG_FINAL) >> 1;
+ gomp_mutex_lock (&team->task_lock);
+ /* If parallel or taskgroup has been cancelled, don't start new
+ tasks. */
+@@ -235,171 +416,39 @@ GOMP_task (void (*fn) (void *), void *da
+ taskgroup->num_children++;
+ if (depend_size)
+ {
+- size_t ndepend = (uintptr_t) depend[0];
+- size_t nout = (uintptr_t) depend[1];
+- size_t i;
+- hash_entry_type ent;
+-
+- task->depend_count = ndepend;
+- task->num_dependees = 0;
+- if (parent->depend_hash == NULL)
+- parent->depend_hash
+- = htab_create (2 * ndepend > 12 ? 2 * ndepend : 12);
+- for (i = 0; i < ndepend; i++)
+- {
+- task->depend[i].addr = depend[2 + i];
+- task->depend[i].next = NULL;
+- task->depend[i].prev = NULL;
+- task->depend[i].task = task;
+- task->depend[i].is_in = i >= nout;
+- task->depend[i].redundant = false;
+- task->depend[i].redundant_out = false;
+-
+- hash_entry_type *slot
+- = htab_find_slot (&parent->depend_hash, &task->depend[i],
+- INSERT);
+- hash_entry_type out = NULL, last = NULL;
+- if (*slot)
+- {
+- /* If multiple depends on the same task are the
+- same, all but the first one are redundant.
+- As inout/out come first, if any of them is
+- inout/out, it will win, which is the right
+- semantics. */
+- if ((*slot)->task == task)
+- {
+- task->depend[i].redundant = true;
+- continue;
+- }
+- for (ent = *slot; ent; ent = ent->next)
+- {
+- if (ent->redundant_out)
+- break;
+-
+- last = ent;
+-
+- /* depend(in:...) doesn't depend on earlier
+- depend(in:...). */
+- if (i >= nout && ent->is_in)
+- continue;
+-
+- if (!ent->is_in)
+- out = ent;
+-
+- struct gomp_task *tsk = ent->task;
+- if (tsk->dependers == NULL)
+- {
+- tsk->dependers
+- = gomp_malloc (sizeof (struct gomp_dependers_vec)
+- + 6 * sizeof (struct gomp_task *));
+- tsk->dependers->n_elem = 1;
+- tsk->dependers->allocated = 6;
+- tsk->dependers->elem[0] = task;
+- task->num_dependees++;
+- continue;
+- }
+- /* We already have some other dependency on tsk
+- from earlier depend clause. */
+- else if (tsk->dependers->n_elem
+- && (tsk->dependers->elem[tsk->dependers->n_elem
+- - 1]
+- == task))
+- continue;
+- else if (tsk->dependers->n_elem
+- == tsk->dependers->allocated)
+- {
+- tsk->dependers->allocated
+- = tsk->dependers->allocated * 2 + 2;
+- tsk->dependers
+- = gomp_realloc (tsk->dependers,
+- sizeof (struct gomp_dependers_vec)
+- + (tsk->dependers->allocated
+- * sizeof (struct gomp_task *)));
+- }
+- tsk->dependers->elem[tsk->dependers->n_elem++] = task;
+- task->num_dependees++;
+- }
+- task->depend[i].next = *slot;
+- (*slot)->prev = &task->depend[i];
+- }
+- *slot = &task->depend[i];
+-
+- /* There is no need to store more than one depend({,in}out:)
+- task per address in the hash table chain for the purpose
+- of creation of deferred tasks, because each out
+- depends on all earlier outs, thus it is enough to record
+- just the last depend({,in}out:). For depend(in:), we need
+- to keep all of the previous ones not terminated yet, because
+- a later depend({,in}out:) might need to depend on all of
+- them. So, if the new task's clause is depend({,in}out:),
+- we know there is at most one other depend({,in}out:) clause
+- in the list (out). For non-deferred tasks we want to see
+- all outs, so they are moved to the end of the chain,
+- after first redundant_out entry all following entries
+- should be redundant_out. */
+- if (!task->depend[i].is_in && out)
+- {
+- if (out != last)
+- {
+- out->next->prev = out->prev;
+- out->prev->next = out->next;
+- out->next = last->next;
+- out->prev = last;
+- last->next = out;
+- if (out->next)
+- out->next->prev = out;
+- }
+- out->redundant_out = true;
+- }
+- }
++ gomp_task_handle_depend (task, parent, depend);
+ if (task->num_dependees)
+ {
++ /* Tasks that depend on other tasks are not put into the
++ various waiting queues, so we are done for now. Said
++ tasks are instead put into the queues via
++ gomp_task_run_post_handle_dependers() after their
++ dependencies have been satisfied. After which, they
++ can be picked up by the various scheduling
++ points. */
+ gomp_mutex_unlock (&team->task_lock);
+ return;
+ }
+ }
+- if (parent->children)
+- {
+- task->next_child = parent->children;
+- task->prev_child = parent->children->prev_child;
+- task->next_child->prev_child = task;
+- task->prev_child->next_child = task;
+- }
+- else
+- {
+- task->next_child = task;
+- task->prev_child = task;
+- }
+- parent->children = task;
++
++ priority_queue_insert (PQ_CHILDREN, &parent->children_queue,
++ task, priority,
++ PRIORITY_INSERT_BEGIN,
++ /*adjust_parent_depends_on=*/false,
++ task->parent_depends_on);
+ if (taskgroup)
+- {
+- if (taskgroup->children)
+- {
+- task->next_taskgroup = taskgroup->children;
+- task->prev_taskgroup = taskgroup->children->prev_taskgroup;
+- task->next_taskgroup->prev_taskgroup = task;
+- task->prev_taskgroup->next_taskgroup = task;
+- }
+- else
+- {
+- task->next_taskgroup = task;
+- task->prev_taskgroup = task;
+- }
+- taskgroup->children = task;
+- }
+- if (team->task_queue)
+- {
+- task->next_queue = team->task_queue;
+- task->prev_queue = team->task_queue->prev_queue;
+- task->next_queue->prev_queue = task;
+- task->prev_queue->next_queue = task;
+- }
+- else
+- {
+- task->next_queue = task;
+- task->prev_queue = task;
+- team->task_queue = task;
+- }
++ priority_queue_insert (PQ_TASKGROUP, &taskgroup->taskgroup_queue,
++ task, priority,
++ PRIORITY_INSERT_BEGIN,
++ /*adjust_parent_depends_on=*/false,
++ task->parent_depends_on);
++
++ priority_queue_insert (PQ_TEAM, &team->task_queue,
++ task, priority,
++ PRIORITY_INSERT_END,
++ /*adjust_parent_depends_on=*/false,
++ task->parent_depends_on);
++
+ ++team->task_count;
+ ++team->task_queued_count;
+ gomp_team_barrier_set_task_pending (&team->barrier);
+@@ -411,36 +460,529 @@ GOMP_task (void (*fn) (void *), void *da
+ }
+ }
+
+-static inline bool
+-gomp_task_run_pre (struct gomp_task *child_task, struct gomp_task *parent,
+- struct gomp_taskgroup *taskgroup, struct gomp_team *team)
++ialias (GOMP_taskgroup_start)
++ialias (GOMP_taskgroup_end)
++
++#define TYPE long
++#define UTYPE unsigned long
++#define TYPE_is_long 1
++#include "taskloop.c"
++#undef TYPE
++#undef UTYPE
++#undef TYPE_is_long
++
++#define TYPE unsigned long long
++#define UTYPE TYPE
++#define GOMP_taskloop GOMP_taskloop_ull
++#include "taskloop.c"
++#undef TYPE
++#undef UTYPE
++#undef GOMP_taskloop
++
++static void inline
++priority_queue_move_task_first (enum priority_queue_type type,
++ struct priority_queue *head,
++ struct gomp_task *task)
+ {
++#if _LIBGOMP_CHECKING_
++ if (!priority_queue_task_in_queue_p (type, head, task))
++ gomp_fatal ("Attempt to move first missing task %p", task);
++#endif
++ struct priority_list *list;
++ if (priority_queue_multi_p (head))
++ {
++ list = priority_queue_lookup_priority (head, task->priority);
++#if _LIBGOMP_CHECKING_
++ if (!list)
++ gomp_fatal ("Unable to find priority %d", task->priority);
++#endif
++ }
++ else
++ list = &head->l;
++ priority_list_remove (list, task_to_priority_node (type, task), 0);
++ priority_list_insert (type, list, task, task->priority,
++ PRIORITY_INSERT_BEGIN, type == PQ_CHILDREN,
++ task->parent_depends_on);
++}
++
++/* Actual body of GOMP_PLUGIN_target_task_completion that is executed
++ with team->task_lock held, or is executed in the thread that called
++ gomp_target_task_fn if GOMP_PLUGIN_target_task_completion has been
++ run before it acquires team->task_lock. */
++
++static void
++gomp_target_task_completion (struct gomp_team *team, struct gomp_task *task)
++{
++ struct gomp_task *parent = task->parent;
+ if (parent)
++ priority_queue_move_task_first (PQ_CHILDREN, &parent->children_queue,
++ task);
++
++ struct gomp_taskgroup *taskgroup = task->taskgroup;
++ if (taskgroup)
++ priority_queue_move_task_first (PQ_TASKGROUP, &taskgroup->taskgroup_queue,
++ task);
++
++ priority_queue_insert (PQ_TEAM, &team->task_queue, task, task->priority,
++ PRIORITY_INSERT_BEGIN, false,
++ task->parent_depends_on);
++ task->kind = GOMP_TASK_WAITING;
++ if (parent && parent->taskwait)
+ {
+- if (parent->children == child_task)
+- parent->children = child_task->next_child;
+- if (__builtin_expect (child_task->parent_depends_on, 0)
+- && parent->taskwait->last_parent_depends_on == child_task)
+- {
+- if (child_task->prev_child->kind == GOMP_TASK_WAITING
+- && child_task->prev_child->parent_depends_on)
+- parent->taskwait->last_parent_depends_on = child_task->prev_child;
+- else
+- parent->taskwait->last_parent_depends_on = NULL;
++ if (parent->taskwait->in_taskwait)
++ {
++ /* One more task has had its dependencies met.
++ Inform any waiters. */
++ parent->taskwait->in_taskwait = false;
++ gomp_sem_post (&parent->taskwait->taskwait_sem);
+ }
++ else if (parent->taskwait->in_depend_wait)
++ {
++ /* One more task has had its dependencies met.
++ Inform any waiters. */
++ parent->taskwait->in_depend_wait = false;
++ gomp_sem_post (&parent->taskwait->taskwait_sem);
++ }
++ }
++ if (taskgroup && taskgroup->in_taskgroup_wait)
++ {
++ /* One more task has had its dependencies met.
++ Inform any waiters. */
++ taskgroup->in_taskgroup_wait = false;
++ gomp_sem_post (&taskgroup->taskgroup_sem);
+ }
+- if (taskgroup && taskgroup->children == child_task)
+- taskgroup->children = child_task->next_taskgroup;
+- child_task->prev_queue->next_queue = child_task->next_queue;
+- child_task->next_queue->prev_queue = child_task->prev_queue;
+- if (team->task_queue == child_task)
++
++ ++team->task_queued_count;
++ gomp_team_barrier_set_task_pending (&team->barrier);
++ /* I'm afraid this can't be done after releasing team->task_lock,
++ as gomp_target_task_completion is run from unrelated thread and
++ therefore in between gomp_mutex_unlock and gomp_team_barrier_wake
++ the team could be gone already. */
++ if (team->nthreads > team->task_running_count)
++ gomp_team_barrier_wake (&team->barrier, 1);
++}
++
++/* Signal that a target task TTASK has completed the asynchronously
++ running phase and should be requeued as a task to handle the
++ variable unmapping. */
++
++void
++GOMP_PLUGIN_target_task_completion (void *data)
++{
++ struct gomp_target_task *ttask = (struct gomp_target_task *) data;
++ struct gomp_task *task = ttask->task;
++ struct gomp_team *team = ttask->team;
++
++ gomp_mutex_lock (&team->task_lock);
++ if (ttask->state == GOMP_TARGET_TASK_READY_TO_RUN)
+ {
+- if (child_task->next_queue != child_task)
+- team->task_queue = child_task->next_queue;
++ ttask->state = GOMP_TARGET_TASK_FINISHED;
++ gomp_mutex_unlock (&team->task_lock);
++ return;
++ }
++ ttask->state = GOMP_TARGET_TASK_FINISHED;
++ gomp_target_task_completion (team, task);
++ gomp_mutex_unlock (&team->task_lock);
++}
++
++static void gomp_task_run_post_handle_depend_hash (struct gomp_task *);
++
++/* Called for nowait target tasks. */
++
++bool
++gomp_create_target_task (struct gomp_device_descr *devicep,
++ void (*fn) (void *), size_t mapnum, void **hostaddrs,
++ size_t *sizes, unsigned short *kinds,
++ unsigned int flags, void **depend, void **args,
++ enum gomp_target_task_state state)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ struct gomp_team *team = thr->ts.team;
++
++ /* If parallel or taskgroup has been cancelled, don't start new tasks. */
++ if (team
++ && (gomp_team_barrier_cancelled (&team->barrier)
++ || (thr->task->taskgroup && thr->task->taskgroup->cancelled)))
++ return true;
++
++ struct gomp_target_task *ttask;
++ struct gomp_task *task;
++ struct gomp_task *parent = thr->task;
++ struct gomp_taskgroup *taskgroup = parent->taskgroup;
++ bool do_wake;
++ size_t depend_size = 0;
++ uintptr_t depend_cnt = 0;
++ size_t tgt_align = 0, tgt_size = 0;
++
++ if (depend != NULL)
++ {
++ depend_cnt = (uintptr_t) depend[0];
++ depend_size = depend_cnt * sizeof (struct gomp_task_depend_entry);
++ }
++ if (fn)
++ {
++ /* GOMP_MAP_FIRSTPRIVATE need to be copied first, as they are
++ firstprivate on the target task. */
++ size_t i;
++ for (i = 0; i < mapnum; i++)
++ if ((kinds[i] & 0xff) == GOMP_MAP_FIRSTPRIVATE)
++ {
++ size_t align = (size_t) 1 << (kinds[i] >> 8);
++ if (tgt_align < align)
++ tgt_align = align;
++ tgt_size = (tgt_size + align - 1) & ~(align - 1);
++ tgt_size += sizes[i];
++ }
++ if (tgt_align)
++ tgt_size += tgt_align - 1;
+ else
+- team->task_queue = NULL;
++ tgt_size = 0;
+ }
++
++ task = gomp_malloc (sizeof (*task) + depend_size
++ + sizeof (*ttask)
++ + mapnum * (sizeof (void *) + sizeof (size_t)
++ + sizeof (unsigned short))
++ + tgt_size);
++ gomp_init_task (task, parent, gomp_icv (false));
++ task->priority = 0;
++ task->kind = GOMP_TASK_WAITING;
++ task->in_tied_task = parent->in_tied_task;
++ task->taskgroup = taskgroup;
++ ttask = (struct gomp_target_task *) &task->depend[depend_cnt];
++ ttask->devicep = devicep;
++ ttask->fn = fn;
++ ttask->mapnum = mapnum;
++ ttask->args = args;
++ memcpy (ttask->hostaddrs, hostaddrs, mapnum * sizeof (void *));
++ ttask->sizes = (size_t *) &ttask->hostaddrs[mapnum];
++ memcpy (ttask->sizes, sizes, mapnum * sizeof (size_t));
++ ttask->kinds = (unsigned short *) &ttask->sizes[mapnum];
++ memcpy (ttask->kinds, kinds, mapnum * sizeof (unsigned short));
++ if (tgt_align)
++ {
++ char *tgt = (char *) &ttask->kinds[mapnum];
++ size_t i;
++ uintptr_t al = (uintptr_t) tgt & (tgt_align - 1);
++ if (al)
++ tgt += tgt_align - al;
++ tgt_size = 0;
++ for (i = 0; i < mapnum; i++)
++ if ((kinds[i] & 0xff) == GOMP_MAP_FIRSTPRIVATE)
++ {
++ size_t align = (size_t) 1 << (kinds[i] >> 8);
++ tgt_size = (tgt_size + align - 1) & ~(align - 1);
++ memcpy (tgt + tgt_size, hostaddrs[i], sizes[i]);
++ ttask->hostaddrs[i] = tgt + tgt_size;
++ tgt_size = tgt_size + sizes[i];
++ }
++ }
++ ttask->flags = flags;
++ ttask->state = state;
++ ttask->task = task;
++ ttask->team = team;
++ task->fn = NULL;
++ task->fn_data = ttask;
++ task->final_task = 0;
++ gomp_mutex_lock (&team->task_lock);
++ /* If parallel or taskgroup has been cancelled, don't start new tasks. */
++ if (__builtin_expect (gomp_team_barrier_cancelled (&team->barrier)
++ || (taskgroup && taskgroup->cancelled), 0))
++ {
++ gomp_mutex_unlock (&team->task_lock);
++ gomp_finish_task (task);
++ free (task);
++ return true;
++ }
++ if (depend_size)
++ {
++ gomp_task_handle_depend (task, parent, depend);
++ if (task->num_dependees)
++ {
++ if (taskgroup)
++ taskgroup->num_children++;
++ gomp_mutex_unlock (&team->task_lock);
++ return true;
++ }
++ }
++ if (state == GOMP_TARGET_TASK_DATA)
++ {
++ gomp_task_run_post_handle_depend_hash (task);
++ gomp_mutex_unlock (&team->task_lock);
++ gomp_finish_task (task);
++ free (task);
++ return false;
++ }
++ if (taskgroup)
++ taskgroup->num_children++;
++ /* For async offloading, if we don't need to wait for dependencies,
++ run the gomp_target_task_fn right away, essentially schedule the
++ mapping part of the task in the current thread. */
++ if (devicep != NULL
++ && (devicep->capabilities & GOMP_OFFLOAD_CAP_OPENMP_400))
++ {
++ priority_queue_insert (PQ_CHILDREN, &parent->children_queue, task, 0,
++ PRIORITY_INSERT_END,
++ /*adjust_parent_depends_on=*/false,
++ task->parent_depends_on);
++ if (taskgroup)
++ priority_queue_insert (PQ_TASKGROUP, &taskgroup->taskgroup_queue,
++ task, 0, PRIORITY_INSERT_END,
++ /*adjust_parent_depends_on=*/false,
++ task->parent_depends_on);
++ task->pnode[PQ_TEAM].next = NULL;
++ task->pnode[PQ_TEAM].prev = NULL;
++ task->kind = GOMP_TASK_TIED;
++ ++team->task_count;
++ gomp_mutex_unlock (&team->task_lock);
++
++ thr->task = task;
++ gomp_target_task_fn (task->fn_data);
++ thr->task = parent;
++
++ gomp_mutex_lock (&team->task_lock);
++ task->kind = GOMP_TASK_ASYNC_RUNNING;
++ /* If GOMP_PLUGIN_target_task_completion has run already
++ in between gomp_target_task_fn and the mutex lock,
++ perform the requeuing here. */
++ if (ttask->state == GOMP_TARGET_TASK_FINISHED)
++ gomp_target_task_completion (team, task);
++ else
++ ttask->state = GOMP_TARGET_TASK_RUNNING;
++ gomp_mutex_unlock (&team->task_lock);
++ return true;
++ }
++ priority_queue_insert (PQ_CHILDREN, &parent->children_queue, task, 0,
++ PRIORITY_INSERT_BEGIN,
++ /*adjust_parent_depends_on=*/false,
++ task->parent_depends_on);
++ if (taskgroup)
++ priority_queue_insert (PQ_TASKGROUP, &taskgroup->taskgroup_queue, task, 0,
++ PRIORITY_INSERT_BEGIN,
++ /*adjust_parent_depends_on=*/false,
++ task->parent_depends_on);
++ priority_queue_insert (PQ_TEAM, &team->task_queue, task, 0,
++ PRIORITY_INSERT_END,
++ /*adjust_parent_depends_on=*/false,
++ task->parent_depends_on);
++ ++team->task_count;
++ ++team->task_queued_count;
++ gomp_team_barrier_set_task_pending (&team->barrier);
++ do_wake = team->task_running_count + !parent->in_tied_task
++ < team->nthreads;
++ gomp_mutex_unlock (&team->task_lock);
++ if (do_wake)
++ gomp_team_barrier_wake (&team->barrier, 1);
++ return true;
++}
++
++/* Given a parent_depends_on task in LIST, move it to the front of its
++ priority so it is run as soon as possible.
++
++ Care is taken to update the list's LAST_PARENT_DEPENDS_ON field.
++
++ We rearrange the queue such that all parent_depends_on tasks are
++ first, and last_parent_depends_on points to the last such task we
++ rearranged. For example, given the following tasks in a queue
++ where PD[123] are the parent_depends_on tasks:
++
++ task->children
++ |
++ V
++ C1 -> C2 -> C3 -> PD1 -> PD2 -> PD3 -> C4
++
++ We rearrange such that:
++
++ task->children
++ | +--- last_parent_depends_on
++ | |
++ V V
++ PD1 -> PD2 -> PD3 -> C1 -> C2 -> C3 -> C4. */
++
++static void inline
++priority_list_upgrade_task (struct priority_list *list,
++ struct priority_node *node)
++{
++ struct priority_node *last_parent_depends_on
++ = list->last_parent_depends_on;
++ if (last_parent_depends_on)
++ {
++ node->prev->next = node->next;
++ node->next->prev = node->prev;
++ node->prev = last_parent_depends_on;
++ node->next = last_parent_depends_on->next;
++ node->prev->next = node;
++ node->next->prev = node;
++ }
++ else if (node != list->tasks)
++ {
++ node->prev->next = node->next;
++ node->next->prev = node->prev;
++ node->prev = list->tasks->prev;
++ node->next = list->tasks;
++ list->tasks = node;
++ node->prev->next = node;
++ node->next->prev = node;
++ }
++ list->last_parent_depends_on = node;
++}
++
++/* Given a parent_depends_on TASK in its parent's children_queue, move
++ it to the front of its priority so it is run as soon as possible.
++
++ PARENT is passed as an optimization.
++
++ (This function could be defined in priority_queue.c, but we want it
++ inlined, and putting it in priority_queue.h is not an option, given
++ that gomp_task has not been properly defined at that point). */
++
++static void inline
++priority_queue_upgrade_task (struct gomp_task *task,
++ struct gomp_task *parent)
++{
++ struct priority_queue *head = &parent->children_queue;
++ struct priority_node *node = &task->pnode[PQ_CHILDREN];
++#if _LIBGOMP_CHECKING_
++ if (!task->parent_depends_on)
++ gomp_fatal ("priority_queue_upgrade_task: task must be a "
++ "parent_depends_on task");
++ if (!priority_queue_task_in_queue_p (PQ_CHILDREN, head, task))
++ gomp_fatal ("priority_queue_upgrade_task: cannot find task=%p", task);
++#endif
++ if (priority_queue_multi_p (head))
++ {
++ struct priority_list *list
++ = priority_queue_lookup_priority (head, task->priority);
++ priority_list_upgrade_task (list, node);
++ }
++ else
++ priority_list_upgrade_task (&head->l, node);
++}
++
++/* Given a CHILD_TASK in LIST that is about to be executed, move it out of
++ the way in LIST so that other tasks can be considered for
++ execution. LIST contains tasks of type TYPE.
++
++ Care is taken to update the queue's LAST_PARENT_DEPENDS_ON field
++ if applicable. */
++
++static void inline
++priority_list_downgrade_task (enum priority_queue_type type,
++ struct priority_list *list,
++ struct gomp_task *child_task)
++{
++ struct priority_node *node = task_to_priority_node (type, child_task);
++ if (list->tasks == node)
++ list->tasks = node->next;
++ else if (node->next != list->tasks)
++ {
++ /* The task in NODE is about to become TIED and TIED tasks
++ cannot come before WAITING tasks. If we're about to
++ leave the queue in such an indeterminate state, rewire
++ things appropriately. However, a TIED task at the end is
++ perfectly fine. */
++ struct gomp_task *next_task = priority_node_to_task (type, node->next);
++ if (next_task->kind == GOMP_TASK_WAITING)
++ {
++ /* Remove from list. */
++ node->prev->next = node->next;
++ node->next->prev = node->prev;
++ /* Rewire at the end. */
++ node->next = list->tasks;
++ node->prev = list->tasks->prev;
++ list->tasks->prev->next = node;
++ list->tasks->prev = node;
++ }
++ }
++
++ /* If the current task is the last_parent_depends_on for its
++ priority, adjust last_parent_depends_on appropriately. */
++ if (__builtin_expect (child_task->parent_depends_on, 0)
++ && list->last_parent_depends_on == node)
++ {
++ struct gomp_task *prev_child = priority_node_to_task (type, node->prev);
++ if (node->prev != node
++ && prev_child->kind == GOMP_TASK_WAITING
++ && prev_child->parent_depends_on)
++ list->last_parent_depends_on = node->prev;
++ else
++ {
++ /* There are no more parent_depends_on entries waiting
++ to run, clear the list. */
++ list->last_parent_depends_on = NULL;
++ }
++ }
++}
++
++/* Given a TASK in HEAD that is about to be executed, move it out of
++ the way so that other tasks can be considered for execution. HEAD
++ contains tasks of type TYPE.
++
++ Care is taken to update the queue's LAST_PARENT_DEPENDS_ON field
++ if applicable.
++
++ (This function could be defined in priority_queue.c, but we want it
++ inlined, and putting it in priority_queue.h is not an option, given
++ that gomp_task has not been properly defined at that point). */
++
++static void inline
++priority_queue_downgrade_task (enum priority_queue_type type,
++ struct priority_queue *head,
++ struct gomp_task *task)
++{
++#if _LIBGOMP_CHECKING_
++ if (!priority_queue_task_in_queue_p (type, head, task))
++ gomp_fatal ("Attempt to downgrade missing task %p", task);
++#endif
++ if (priority_queue_multi_p (head))
++ {
++ struct priority_list *list
++ = priority_queue_lookup_priority (head, task->priority);
++ priority_list_downgrade_task (type, list, task);
++ }
++ else
++ priority_list_downgrade_task (type, &head->l, task);
++}
++
++/* Setup CHILD_TASK to execute. This is done by setting the task to
++ TIED, and updating all relevant queues so that CHILD_TASK is no
++ longer chosen for scheduling. Also, remove CHILD_TASK from the
++ overall team task queue entirely.
++
++ Return TRUE if task or its containing taskgroup has been
++ cancelled. */
++
++static inline bool
++gomp_task_run_pre (struct gomp_task *child_task, struct gomp_task *parent,
++ struct gomp_team *team)
++{
++#if _LIBGOMP_CHECKING_
++ if (child_task->parent)
++ priority_queue_verify (PQ_CHILDREN,
++ &child_task->parent->children_queue, true);
++ if (child_task->taskgroup)
++ priority_queue_verify (PQ_TASKGROUP,
++ &child_task->taskgroup->taskgroup_queue, false);
++ priority_queue_verify (PQ_TEAM, &team->task_queue, false);
++#endif
++
++ /* Task is about to go tied, move it out of the way. */
++ if (parent)
++ priority_queue_downgrade_task (PQ_CHILDREN, &parent->children_queue,
++ child_task);
++
++ /* Task is about to go tied, move it out of the way. */
++ struct gomp_taskgroup *taskgroup = child_task->taskgroup;
++ if (taskgroup)
++ priority_queue_downgrade_task (PQ_TASKGROUP, &taskgroup->taskgroup_queue,
++ child_task);
++
++ priority_queue_remove (PQ_TEAM, &team->task_queue, child_task,
++ MEMMODEL_RELAXED);
++ child_task->pnode[PQ_TEAM].next = NULL;
++ child_task->pnode[PQ_TEAM].prev = NULL;
+ child_task->kind = GOMP_TASK_TIED;
++
+ if (--team->task_queued_count == 0)
+ gomp_team_barrier_clear_task_pending (&team->barrier);
+ if ((gomp_team_barrier_cancelled (&team->barrier)
+@@ -478,6 +1020,14 @@ gomp_task_run_post_handle_depend_hash (s
+ }
+ }
+
++/* After a CHILD_TASK has been run, adjust the dependency queue for
++ each task that depends on CHILD_TASK, to record the fact that there
++ is one less dependency to worry about. If a task that depended on
++ CHILD_TASK now has no dependencies, place it in the various queues
++ so it gets scheduled to run.
++
++ TEAM is the team to which CHILD_TASK belongs to. */
++
+ static size_t
+ gomp_task_run_post_handle_dependers (struct gomp_task *child_task,
+ struct gomp_team *team)
+@@ -487,91 +1037,60 @@ gomp_task_run_post_handle_dependers (str
+ for (i = 0; i < count; i++)
+ {
+ struct gomp_task *task = child_task->dependers->elem[i];
++
++ /* CHILD_TASK satisfies a dependency for TASK. Keep track of
++ TASK's remaining dependencies. Once TASK has no other
++ depenencies, put it into the various queues so it will get
++ scheduled for execution. */
+ if (--task->num_dependees != 0)
+ continue;
+
+ struct gomp_taskgroup *taskgroup = task->taskgroup;
+ if (parent)
+ {
+- if (parent->children)
+- {
+- /* If parent is in gomp_task_maybe_wait_for_dependencies
+- and it doesn't need to wait for this task, put it after
+- all ready to run tasks it needs to wait for. */
+- if (parent->taskwait && parent->taskwait->last_parent_depends_on
+- && !task->parent_depends_on)
+- {
+- struct gomp_task *last_parent_depends_on
+- = parent->taskwait->last_parent_depends_on;
+- task->next_child = last_parent_depends_on->next_child;
+- task->prev_child = last_parent_depends_on;
+- }
+- else
+- {
+- task->next_child = parent->children;
+- task->prev_child = parent->children->prev_child;
+- parent->children = task;
+- }
+- task->next_child->prev_child = task;
+- task->prev_child->next_child = task;
+- }
+- else
+- {
+- task->next_child = task;
+- task->prev_child = task;
+- parent->children = task;
+- }
++ priority_queue_insert (PQ_CHILDREN, &parent->children_queue,
++ task, task->priority,
++ PRIORITY_INSERT_BEGIN,
++ /*adjust_parent_depends_on=*/true,
++ task->parent_depends_on);
+ if (parent->taskwait)
+ {
+ if (parent->taskwait->in_taskwait)
+ {
++ /* One more task has had its dependencies met.
++ Inform any waiters. */
+ parent->taskwait->in_taskwait = false;
+ gomp_sem_post (&parent->taskwait->taskwait_sem);
+ }
+ else if (parent->taskwait->in_depend_wait)
+ {
++ /* One more task has had its dependencies met.
++ Inform any waiters. */
+ parent->taskwait->in_depend_wait = false;
+ gomp_sem_post (&parent->taskwait->taskwait_sem);
+ }
+- if (parent->taskwait->last_parent_depends_on == NULL
+- && task->parent_depends_on)
+- parent->taskwait->last_parent_depends_on = task;
+ }
+ }
+ if (taskgroup)
+ {
+- if (taskgroup->children)
+- {
+- task->next_taskgroup = taskgroup->children;
+- task->prev_taskgroup = taskgroup->children->prev_taskgroup;
+- task->next_taskgroup->prev_taskgroup = task;
+- task->prev_taskgroup->next_taskgroup = task;
+- }
+- else
+- {
+- task->next_taskgroup = task;
+- task->prev_taskgroup = task;
+- }
+- taskgroup->children = task;
++ priority_queue_insert (PQ_TASKGROUP, &taskgroup->taskgroup_queue,
++ task, task->priority,
++ PRIORITY_INSERT_BEGIN,
++ /*adjust_parent_depends_on=*/false,
++ task->parent_depends_on);
+ if (taskgroup->in_taskgroup_wait)
+ {
++ /* One more task has had its dependencies met.
++ Inform any waiters. */
+ taskgroup->in_taskgroup_wait = false;
+ gomp_sem_post (&taskgroup->taskgroup_sem);
+ }
+ }
+- if (team->task_queue)
+- {
+- task->next_queue = team->task_queue;
+- task->prev_queue = team->task_queue->prev_queue;
+- task->next_queue->prev_queue = task;
+- task->prev_queue->next_queue = task;
+- }
+- else
+- {
+- task->next_queue = task;
+- task->prev_queue = task;
+- team->task_queue = task;
+- }
++ priority_queue_insert (PQ_TEAM, &team->task_queue,
++ task, task->priority,
++ PRIORITY_INSERT_END,
++ /*adjust_parent_depends_on=*/false,
++ task->parent_depends_on);
+ ++team->task_count;
+ ++team->task_queued_count;
+ ++ret;
+@@ -601,12 +1120,18 @@ gomp_task_run_post_handle_depend (struct
+ return gomp_task_run_post_handle_dependers (child_task, team);
+ }
+
++/* Remove CHILD_TASK from its parent. */
++
+ static inline void
+ gomp_task_run_post_remove_parent (struct gomp_task *child_task)
+ {
+ struct gomp_task *parent = child_task->parent;
+ if (parent == NULL)
+ return;
++
++ /* If this was the last task the parent was depending on,
++ synchronize with gomp_task_maybe_wait_for_dependencies so it can
++ clean up and return. */
+ if (__builtin_expect (child_task->parent_depends_on, 0)
+ && --parent->taskwait->n_depend == 0
+ && parent->taskwait->in_depend_wait)
+@@ -614,36 +1139,31 @@ gomp_task_run_post_remove_parent (struct
+ parent->taskwait->in_depend_wait = false;
+ gomp_sem_post (&parent->taskwait->taskwait_sem);
+ }
+- child_task->prev_child->next_child = child_task->next_child;
+- child_task->next_child->prev_child = child_task->prev_child;
+- if (parent->children != child_task)
+- return;
+- if (child_task->next_child != child_task)
+- parent->children = child_task->next_child;
+- else
++
++ if (priority_queue_remove (PQ_CHILDREN, &parent->children_queue,
++ child_task, MEMMODEL_RELEASE)
++ && parent->taskwait && parent->taskwait->in_taskwait)
+ {
+- /* We access task->children in GOMP_taskwait
+- outside of the task lock mutex region, so
+- need a release barrier here to ensure memory
+- written by child_task->fn above is flushed
+- before the NULL is written. */
+- __atomic_store_n (&parent->children, NULL, MEMMODEL_RELEASE);
+- if (parent->taskwait && parent->taskwait->in_taskwait)
+- {
+- parent->taskwait->in_taskwait = false;
+- gomp_sem_post (&parent->taskwait->taskwait_sem);
+- }
++ parent->taskwait->in_taskwait = false;
++ gomp_sem_post (&parent->taskwait->taskwait_sem);
+ }
++ child_task->pnode[PQ_CHILDREN].next = NULL;
++ child_task->pnode[PQ_CHILDREN].prev = NULL;
+ }
+
++/* Remove CHILD_TASK from its taskgroup. */
++
+ static inline void
+ gomp_task_run_post_remove_taskgroup (struct gomp_task *child_task)
+ {
+ struct gomp_taskgroup *taskgroup = child_task->taskgroup;
+ if (taskgroup == NULL)
+ return;
+- child_task->prev_taskgroup->next_taskgroup = child_task->next_taskgroup;
+- child_task->next_taskgroup->prev_taskgroup = child_task->prev_taskgroup;
++ bool empty = priority_queue_remove (PQ_TASKGROUP,
++ &taskgroup->taskgroup_queue,
++ child_task, MEMMODEL_RELAXED);
++ child_task->pnode[PQ_TASKGROUP].next = NULL;
++ child_task->pnode[PQ_TASKGROUP].prev = NULL;
+ if (taskgroup->num_children > 1)
+ --taskgroup->num_children;
+ else
+@@ -655,18 +1175,10 @@ gomp_task_run_post_remove_taskgroup (str
+ before the NULL is written. */
+ __atomic_store_n (&taskgroup->num_children, 0, MEMMODEL_RELEASE);
+ }
+- if (taskgroup->children != child_task)
+- return;
+- if (child_task->next_taskgroup != child_task)
+- taskgroup->children = child_task->next_taskgroup;
+- else
++ if (empty && taskgroup->in_taskgroup_wait)
+ {
+- taskgroup->children = NULL;
+- if (taskgroup->in_taskgroup_wait)
+- {
+- taskgroup->in_taskgroup_wait = false;
+- gomp_sem_post (&taskgroup->taskgroup_sem);
+- }
++ taskgroup->in_taskgroup_wait = false;
++ gomp_sem_post (&taskgroup->taskgroup_sem);
+ }
+ }
+
+@@ -696,11 +1208,15 @@ gomp_barrier_handle_tasks (gomp_barrier_
+ while (1)
+ {
+ bool cancelled = false;
+- if (team->task_queue != NULL)
++ if (!priority_queue_empty_p (&team->task_queue, MEMMODEL_RELAXED))
+ {
+- child_task = team->task_queue;
++ bool ignored;
++ child_task
++ = priority_queue_next_task (PQ_TEAM, &team->task_queue,
++ PQ_IGNORED, NULL,
++ &ignored);
+ cancelled = gomp_task_run_pre (child_task, child_task->parent,
+- child_task->taskgroup, team);
++ team);
+ if (__builtin_expect (cancelled, 0))
+ {
+ if (to_free)
+@@ -729,7 +1245,29 @@ gomp_barrier_handle_tasks (gomp_barrier_
+ if (child_task)
+ {
+ thr->task = child_task;
+- child_task->fn (child_task->fn_data);
++ if (__builtin_expect (child_task->fn == NULL, 0))
++ {
++ if (gomp_target_task_fn (child_task->fn_data))
++ {
++ thr->task = task;
++ gomp_mutex_lock (&team->task_lock);
++ child_task->kind = GOMP_TASK_ASYNC_RUNNING;
++ team->task_running_count--;
++ struct gomp_target_task *ttask
++ = (struct gomp_target_task *) child_task->fn_data;
++ /* If GOMP_PLUGIN_target_task_completion has run already
++ in between gomp_target_task_fn and the mutex lock,
++ perform the requeuing here. */
++ if (ttask->state == GOMP_TARGET_TASK_FINISHED)
++ gomp_target_task_completion (team, child_task);
++ else
++ ttask->state = GOMP_TARGET_TASK_RUNNING;
++ child_task = NULL;
++ continue;
++ }
++ }
++ else
++ child_task->fn (child_task->fn_data);
+ thr->task = task;
+ }
+ else
+@@ -741,7 +1279,7 @@ gomp_barrier_handle_tasks (gomp_barrier_
+ size_t new_tasks
+ = gomp_task_run_post_handle_depend (child_task, team);
+ gomp_task_run_post_remove_parent (child_task);
+- gomp_clear_parent (child_task->children);
++ gomp_clear_parent (&child_task->children_queue);
+ gomp_task_run_post_remove_taskgroup (child_task);
+ to_free = child_task;
+ child_task = NULL;
+@@ -765,7 +1303,9 @@ gomp_barrier_handle_tasks (gomp_barrier_
+ }
+ }
+
+-/* Called when encountering a taskwait directive. */
++/* Called when encountering a taskwait directive.
++
++ Wait for all children of the current task. */
+
+ void
+ GOMP_taskwait (void)
+@@ -785,15 +1325,16 @@ GOMP_taskwait (void)
+ child thread task work function are seen before we exit from
+ GOMP_taskwait. */
+ if (task == NULL
+- || __atomic_load_n (&task->children, MEMMODEL_ACQUIRE) == NULL)
++ || priority_queue_empty_p (&task->children_queue, MEMMODEL_ACQUIRE))
+ return;
+
+ memset (&taskwait, 0, sizeof (taskwait));
++ bool child_q = false;
+ gomp_mutex_lock (&team->task_lock);
+ while (1)
+ {
+ bool cancelled = false;
+- if (task->children == NULL)
++ if (priority_queue_empty_p (&task->children_queue, MEMMODEL_RELAXED))
+ {
+ bool destroy_taskwait = task->taskwait != NULL;
+ task->taskwait = NULL;
+@@ -807,12 +1348,14 @@ GOMP_taskwait (void)
+ gomp_sem_destroy (&taskwait.taskwait_sem);
+ return;
+ }
+- if (task->children->kind == GOMP_TASK_WAITING)
++ struct gomp_task *next_task
++ = priority_queue_next_task (PQ_CHILDREN, &task->children_queue,
++ PQ_TEAM, &team->task_queue, &child_q);
++ if (next_task->kind == GOMP_TASK_WAITING)
+ {
+- child_task = task->children;
++ child_task = next_task;
+ cancelled
+- = gomp_task_run_pre (child_task, task, child_task->taskgroup,
+- team);
++ = gomp_task_run_pre (child_task, task, team);
+ if (__builtin_expect (cancelled, 0))
+ {
+ if (to_free)
+@@ -826,8 +1369,10 @@ GOMP_taskwait (void)
+ }
+ else
+ {
+- /* All tasks we are waiting for are already running
+- in other threads. Wait for them. */
++ /* All tasks we are waiting for are either running in other
++ threads, or they are tasks that have not had their
++ dependencies met (so they're not even in the queue). Wait
++ for them. */
+ if (task->taskwait == NULL)
+ {
+ taskwait.in_depend_wait = false;
+@@ -851,7 +1396,28 @@ GOMP_taskwait (void)
+ if (child_task)
+ {
+ thr->task = child_task;
+- child_task->fn (child_task->fn_data);
++ if (__builtin_expect (child_task->fn == NULL, 0))
++ {
++ if (gomp_target_task_fn (child_task->fn_data))
++ {
++ thr->task = task;
++ gomp_mutex_lock (&team->task_lock);
++ child_task->kind = GOMP_TASK_ASYNC_RUNNING;
++ struct gomp_target_task *ttask
++ = (struct gomp_target_task *) child_task->fn_data;
++ /* If GOMP_PLUGIN_target_task_completion has run already
++ in between gomp_target_task_fn and the mutex lock,
++ perform the requeuing here. */
++ if (ttask->state == GOMP_TARGET_TASK_FINISHED)
++ gomp_target_task_completion (team, child_task);
++ else
++ ttask->state = GOMP_TARGET_TASK_RUNNING;
++ child_task = NULL;
++ continue;
++ }
++ }
++ else
++ child_task->fn (child_task->fn_data);
+ thr->task = task;
+ }
+ else
+@@ -862,17 +1428,19 @@ GOMP_taskwait (void)
+ finish_cancelled:;
+ size_t new_tasks
+ = gomp_task_run_post_handle_depend (child_task, team);
+- child_task->prev_child->next_child = child_task->next_child;
+- child_task->next_child->prev_child = child_task->prev_child;
+- if (task->children == child_task)
+- {
+- if (child_task->next_child != child_task)
+- task->children = child_task->next_child;
+- else
+- task->children = NULL;
++
++ if (child_q)
++ {
++ priority_queue_remove (PQ_CHILDREN, &task->children_queue,
++ child_task, MEMMODEL_RELAXED);
++ child_task->pnode[PQ_CHILDREN].next = NULL;
++ child_task->pnode[PQ_CHILDREN].prev = NULL;
+ }
+- gomp_clear_parent (child_task->children);
++
++ gomp_clear_parent (&child_task->children_queue);
++
+ gomp_task_run_post_remove_taskgroup (child_task);
++
+ to_free = child_task;
+ child_task = NULL;
+ team->task_count--;
+@@ -887,10 +1455,20 @@ GOMP_taskwait (void)
+ }
+ }
+
+-/* This is like GOMP_taskwait, but we only wait for tasks that the
+- upcoming task depends on. */
++/* An undeferred task is about to run. Wait for all tasks that this
++ undeferred task depends on.
+
+-static void
++ This is done by first putting all known ready dependencies
++ (dependencies that have their own dependencies met) at the top of
++ the scheduling queues. Then we iterate through these imminently
++ ready tasks (and possibly other high priority tasks), and run them.
++ If we run out of ready dependencies to execute, we either wait for
++ the reamining dependencies to finish, or wait for them to get
++ scheduled so we can run them.
++
++ DEPEND is as in GOMP_task. */
++
++void
+ gomp_task_maybe_wait_for_dependencies (void **depend)
+ {
+ struct gomp_thread *thr = gomp_thread ();
+@@ -898,7 +1476,6 @@ gomp_task_maybe_wait_for_dependencies (v
+ struct gomp_team *team = thr->ts.team;
+ struct gomp_task_depend_entry elem, *ent = NULL;
+ struct gomp_taskwait taskwait;
+- struct gomp_task *last_parent_depends_on = NULL;
+ size_t ndepend = (uintptr_t) depend[0];
+ size_t nout = (uintptr_t) depend[1];
+ size_t i;
+@@ -922,32 +1499,11 @@ gomp_task_maybe_wait_for_dependencies (v
+ {
+ tsk->parent_depends_on = true;
+ ++num_awaited;
++ /* If depenency TSK itself has no dependencies and is
++ ready to run, move it up front so that we run it as
++ soon as possible. */
+ if (tsk->num_dependees == 0 && tsk->kind == GOMP_TASK_WAITING)
+- {
+- /* If a task we need to wait for is not already
+- running and is ready to be scheduled, move it
+- to front, so that we run it as soon as possible. */
+- if (last_parent_depends_on)
+- {
+- tsk->prev_child->next_child = tsk->next_child;
+- tsk->next_child->prev_child = tsk->prev_child;
+- tsk->prev_child = last_parent_depends_on;
+- tsk->next_child = last_parent_depends_on->next_child;
+- tsk->prev_child->next_child = tsk;
+- tsk->next_child->prev_child = tsk;
+- }
+- else if (tsk != task->children)
+- {
+- tsk->prev_child->next_child = tsk->next_child;
+- tsk->next_child->prev_child = tsk->prev_child;
+- tsk->prev_child = task->children;
+- tsk->next_child = task->children->next_child;
+- task->children = tsk;
+- tsk->prev_child->next_child = tsk;
+- tsk->next_child->prev_child = tsk;
+- }
+- last_parent_depends_on = tsk;
+- }
++ priority_queue_upgrade_task (tsk, task);
+ }
+ }
+ }
+@@ -959,7 +1515,6 @@ gomp_task_maybe_wait_for_dependencies (v
+
+ memset (&taskwait, 0, sizeof (taskwait));
+ taskwait.n_depend = num_awaited;
+- taskwait.last_parent_depends_on = last_parent_depends_on;
+ gomp_sem_init (&taskwait.taskwait_sem, 0);
+ task->taskwait = &taskwait;
+
+@@ -978,12 +1533,30 @@ gomp_task_maybe_wait_for_dependencies (v
+ gomp_sem_destroy (&taskwait.taskwait_sem);
+ return;
+ }
+- if (task->children->kind == GOMP_TASK_WAITING)
++
++ /* Theoretically when we have multiple priorities, we should
++ chose between the highest priority item in
++ task->children_queue and team->task_queue here, so we should
++ use priority_queue_next_task(). However, since we are
++ running an undeferred task, perhaps that makes all tasks it
++ depends on undeferred, thus a priority of INF? This would
++ make it unnecessary to take anything into account here,
++ but the dependencies.
++
++ On the other hand, if we want to use priority_queue_next_task(),
++ care should be taken to only use priority_queue_remove()
++ below if the task was actually removed from the children
++ queue. */
++ bool ignored;
++ struct gomp_task *next_task
++ = priority_queue_next_task (PQ_CHILDREN, &task->children_queue,
++ PQ_IGNORED, NULL, &ignored);
++
++ if (next_task->kind == GOMP_TASK_WAITING)
+ {
+- child_task = task->children;
++ child_task = next_task;
+ cancelled
+- = gomp_task_run_pre (child_task, task, child_task->taskgroup,
+- team);
++ = gomp_task_run_pre (child_task, task, team);
+ if (__builtin_expect (cancelled, 0))
+ {
+ if (to_free)
+@@ -996,8 +1569,10 @@ gomp_task_maybe_wait_for_dependencies (v
+ }
+ }
+ else
+- /* All tasks we are waiting for are already running
+- in other threads. Wait for them. */
++ /* All tasks we are waiting for are either running in other
++ threads, or they are tasks that have not had their
++ dependencies met (so they're not even in the queue). Wait
++ for them. */
+ taskwait.in_depend_wait = true;
+ gomp_mutex_unlock (&team->task_lock);
+ if (do_wake)
+@@ -1014,7 +1589,28 @@ gomp_task_maybe_wait_for_dependencies (v
+ if (child_task)
+ {
+ thr->task = child_task;
+- child_task->fn (child_task->fn_data);
++ if (__builtin_expect (child_task->fn == NULL, 0))
++ {
++ if (gomp_target_task_fn (child_task->fn_data))
++ {
++ thr->task = task;
++ gomp_mutex_lock (&team->task_lock);
++ child_task->kind = GOMP_TASK_ASYNC_RUNNING;
++ struct gomp_target_task *ttask
++ = (struct gomp_target_task *) child_task->fn_data;
++ /* If GOMP_PLUGIN_target_task_completion has run already
++ in between gomp_target_task_fn and the mutex lock,
++ perform the requeuing here. */
++ if (ttask->state == GOMP_TARGET_TASK_FINISHED)
++ gomp_target_task_completion (team, child_task);
++ else
++ ttask->state = GOMP_TARGET_TASK_RUNNING;
++ child_task = NULL;
++ continue;
++ }
++ }
++ else
++ child_task->fn (child_task->fn_data);
+ thr->task = task;
+ }
+ else
+@@ -1027,16 +1623,13 @@ gomp_task_maybe_wait_for_dependencies (v
+ = gomp_task_run_post_handle_depend (child_task, team);
+ if (child_task->parent_depends_on)
+ --taskwait.n_depend;
+- child_task->prev_child->next_child = child_task->next_child;
+- child_task->next_child->prev_child = child_task->prev_child;
+- if (task->children == child_task)
+- {
+- if (child_task->next_child != child_task)
+- task->children = child_task->next_child;
+- else
+- task->children = NULL;
+- }
+- gomp_clear_parent (child_task->children);
++
++ priority_queue_remove (PQ_CHILDREN, &task->children_queue,
++ child_task, MEMMODEL_RELAXED);
++ child_task->pnode[PQ_CHILDREN].next = NULL;
++ child_task->pnode[PQ_CHILDREN].prev = NULL;
++
++ gomp_clear_parent (&child_task->children_queue);
+ gomp_task_run_post_remove_taskgroup (child_task);
+ to_free = child_task;
+ child_task = NULL;
+@@ -1069,14 +1662,14 @@ GOMP_taskgroup_start (void)
+ struct gomp_taskgroup *taskgroup;
+
+ /* If team is NULL, all tasks are executed as
+- GOMP_TASK_IFFALSE tasks and thus all children tasks of
++ GOMP_TASK_UNDEFERRED tasks and thus all children tasks of
+ taskgroup and their descendant tasks will be finished
+ by the time GOMP_taskgroup_end is called. */
+ if (team == NULL)
+ return;
+ taskgroup = gomp_malloc (sizeof (struct gomp_taskgroup));
+ taskgroup->prev = task->taskgroup;
+- taskgroup->children = NULL;
++ priority_queue_init (&taskgroup->taskgroup_queue);
+ taskgroup->in_taskgroup_wait = false;
+ taskgroup->cancelled = false;
+ taskgroup->num_children = 0;
+@@ -1098,6 +1691,17 @@ GOMP_taskgroup_end (void)
+ if (team == NULL)
+ return;
+ taskgroup = task->taskgroup;
++ if (__builtin_expect (taskgroup == NULL, 0)
++ && thr->ts.level == 0)
++ {
++ /* This can happen if GOMP_taskgroup_start is called when
++ thr->ts.team == NULL, but inside of the taskgroup there
++ is #pragma omp target nowait that creates an implicit
++ team with a single thread. In this case, we want to wait
++ for all outstanding tasks in this team. */
++ gomp_team_barrier_wait (&team->barrier);
++ return;
++ }
+
+ /* The acquire barrier on load of taskgroup->num_children here
+ synchronizes with the write of 0 in gomp_task_run_post_remove_taskgroup.
+@@ -1108,19 +1712,25 @@ GOMP_taskgroup_end (void)
+ if (__atomic_load_n (&taskgroup->num_children, MEMMODEL_ACQUIRE) == 0)
+ goto finish;
+
++ bool unused;
+ gomp_mutex_lock (&team->task_lock);
+ while (1)
+ {
+ bool cancelled = false;
+- if (taskgroup->children == NULL)
++ if (priority_queue_empty_p (&taskgroup->taskgroup_queue,
++ MEMMODEL_RELAXED))
+ {
+ if (taskgroup->num_children)
+ {
+- if (task->children == NULL)
++ if (priority_queue_empty_p (&task->children_queue,
++ MEMMODEL_RELAXED))
+ goto do_wait;
+- child_task = task->children;
+- }
+- else
++ child_task
++ = priority_queue_next_task (PQ_CHILDREN, &task->children_queue,
++ PQ_TEAM, &team->task_queue,
++ &unused);
++ }
++ else
+ {
+ gomp_mutex_unlock (&team->task_lock);
+ if (to_free)
+@@ -1132,12 +1742,13 @@ GOMP_taskgroup_end (void)
+ }
+ }
+ else
+- child_task = taskgroup->children;
++ child_task
++ = priority_queue_next_task (PQ_TASKGROUP, &taskgroup->taskgroup_queue,
++ PQ_TEAM, &team->task_queue, &unused);
+ if (child_task->kind == GOMP_TASK_WAITING)
+ {
+ cancelled
+- = gomp_task_run_pre (child_task, child_task->parent, taskgroup,
+- team);
++ = gomp_task_run_pre (child_task, child_task->parent, team);
+ if (__builtin_expect (cancelled, 0))
+ {
+ if (to_free)
+@@ -1153,8 +1764,10 @@ GOMP_taskgroup_end (void)
+ {
+ child_task = NULL;
+ do_wait:
+- /* All tasks we are waiting for are already running
+- in other threads. Wait for them. */
++ /* All tasks we are waiting for are either running in other
++ threads, or they are tasks that have not had their
++ dependencies met (so they're not even in the queue). Wait
++ for them. */
+ taskgroup->in_taskgroup_wait = true;
+ }
+ gomp_mutex_unlock (&team->task_lock);
+@@ -1172,7 +1785,28 @@ GOMP_taskgroup_end (void)
+ if (child_task)
+ {
+ thr->task = child_task;
+- child_task->fn (child_task->fn_data);
++ if (__builtin_expect (child_task->fn == NULL, 0))
++ {
++ if (gomp_target_task_fn (child_task->fn_data))
++ {
++ thr->task = task;
++ gomp_mutex_lock (&team->task_lock);
++ child_task->kind = GOMP_TASK_ASYNC_RUNNING;
++ struct gomp_target_task *ttask
++ = (struct gomp_target_task *) child_task->fn_data;
++ /* If GOMP_PLUGIN_target_task_completion has run already
++ in between gomp_target_task_fn and the mutex lock,
++ perform the requeuing here. */
++ if (ttask->state == GOMP_TARGET_TASK_FINISHED)
++ gomp_target_task_completion (team, child_task);
++ else
++ ttask->state = GOMP_TARGET_TASK_RUNNING;
++ child_task = NULL;
++ continue;
++ }
++ }
++ else
++ child_task->fn (child_task->fn_data);
+ thr->task = task;
+ }
+ else
+@@ -1184,7 +1818,7 @@ GOMP_taskgroup_end (void)
+ size_t new_tasks
+ = gomp_task_run_post_handle_depend (child_task, team);
+ gomp_task_run_post_remove_parent (child_task);
+- gomp_clear_parent (child_task->children);
++ gomp_clear_parent (&child_task->children_queue);
+ gomp_task_run_post_remove_taskgroup (child_task);
+ to_free = child_task;
+ child_task = NULL;
+--- libgomp/libgomp_g.h.jj 2014-05-15 10:56:31.429532978 +0200
++++ libgomp/libgomp_g.h 2016-07-13 16:57:04.422535521 +0200
+@@ -29,6 +29,7 @@
+ #define LIBGOMP_G_H 1
+
+ #include
++#include
+
+ /* barrier.c */
+
+@@ -50,6 +51,10 @@ extern bool GOMP_loop_static_start (long
+ extern bool GOMP_loop_dynamic_start (long, long, long, long, long *, long *);
+ extern bool GOMP_loop_guided_start (long, long, long, long, long *, long *);
+ extern bool GOMP_loop_runtime_start (long, long, long, long *, long *);
++extern bool GOMP_loop_nonmonotonic_dynamic_start (long, long, long, long,
++ long *, long *);
++extern bool GOMP_loop_nonmonotonic_guided_start (long, long, long, long,
++ long *, long *);
+
+ extern bool GOMP_loop_ordered_static_start (long, long, long, long,
+ long *, long *);
+@@ -63,12 +68,23 @@ extern bool GOMP_loop_static_next (long
+ extern bool GOMP_loop_dynamic_next (long *, long *);
+ extern bool GOMP_loop_guided_next (long *, long *);
+ extern bool GOMP_loop_runtime_next (long *, long *);
++extern bool GOMP_loop_nonmonotonic_dynamic_next (long *, long *);
++extern bool GOMP_loop_nonmonotonic_guided_next (long *, long *);
+
+ extern bool GOMP_loop_ordered_static_next (long *, long *);
+ extern bool GOMP_loop_ordered_dynamic_next (long *, long *);
+ extern bool GOMP_loop_ordered_guided_next (long *, long *);
+ extern bool GOMP_loop_ordered_runtime_next (long *, long *);
+
++extern bool GOMP_loop_doacross_static_start (unsigned, long *, long, long *,
++ long *);
++extern bool GOMP_loop_doacross_dynamic_start (unsigned, long *, long, long *,
++ long *);
++extern bool GOMP_loop_doacross_guided_start (unsigned, long *, long, long *,
++ long *);
++extern bool GOMP_loop_doacross_runtime_start (unsigned, long *, long *,
++ long *);
++
+ extern void GOMP_parallel_loop_static_start (void (*)(void *), void *,
+ unsigned, long, long, long, long);
+ extern void GOMP_parallel_loop_dynamic_start (void (*)(void *), void *,
+@@ -89,6 +105,12 @@ extern void GOMP_parallel_loop_guided (v
+ extern void GOMP_parallel_loop_runtime (void (*)(void *), void *,
+ unsigned, long, long, long,
+ unsigned);
++extern void GOMP_parallel_loop_nonmonotonic_dynamic (void (*)(void *), void *,
++ unsigned, long, long,
++ long, long, unsigned);
++extern void GOMP_parallel_loop_nonmonotonic_guided (void (*)(void *), void *,
++ unsigned, long, long,
++ long, long, unsigned);
+
+ extern void GOMP_loop_end (void);
+ extern void GOMP_loop_end_nowait (void);
+@@ -119,6 +141,18 @@ extern bool GOMP_loop_ull_runtime_start
+ unsigned long long,
+ unsigned long long *,
+ unsigned long long *);
++extern bool GOMP_loop_ull_nonmonotonic_dynamic_start (bool, unsigned long long,
++ unsigned long long,
++ unsigned long long,
++ unsigned long long,
++ unsigned long long *,
++ unsigned long long *);
++extern bool GOMP_loop_ull_nonmonotonic_guided_start (bool, unsigned long long,
++ unsigned long long,
++ unsigned long long,
++ unsigned long long,
++ unsigned long long *,
++ unsigned long long *);
+
+ extern bool GOMP_loop_ull_ordered_static_start (bool, unsigned long long,
+ unsigned long long,
+@@ -152,6 +186,10 @@ extern bool GOMP_loop_ull_guided_next (u
+ unsigned long long *);
+ extern bool GOMP_loop_ull_runtime_next (unsigned long long *,
+ unsigned long long *);
++extern bool GOMP_loop_ull_nonmonotonic_dynamic_next (unsigned long long *,
++ unsigned long long *);
++extern bool GOMP_loop_ull_nonmonotonic_guided_next (unsigned long long *,
++ unsigned long long *);
+
+ extern bool GOMP_loop_ull_ordered_static_next (unsigned long long *,
+ unsigned long long *);
+@@ -162,10 +200,34 @@ extern bool GOMP_loop_ull_ordered_guided
+ extern bool GOMP_loop_ull_ordered_runtime_next (unsigned long long *,
+ unsigned long long *);
+
++extern bool GOMP_loop_ull_doacross_static_start (unsigned,
++ unsigned long long *,
++ unsigned long long,
++ unsigned long long *,
++ unsigned long long *);
++extern bool GOMP_loop_ull_doacross_dynamic_start (unsigned,
++ unsigned long long *,
++ unsigned long long,
++ unsigned long long *,
++ unsigned long long *);
++extern bool GOMP_loop_ull_doacross_guided_start (unsigned,
++ unsigned long long *,
++ unsigned long long,
++ unsigned long long *,
++ unsigned long long *);
++extern bool GOMP_loop_ull_doacross_runtime_start (unsigned,
++ unsigned long long *,
++ unsigned long long *,
++ unsigned long long *);
++
+ /* ordered.c */
+
+ extern void GOMP_ordered_start (void);
+ extern void GOMP_ordered_end (void);
++extern void GOMP_doacross_post (long *);
++extern void GOMP_doacross_wait (long, ...);
++extern void GOMP_doacross_ull_post (unsigned long long *);
++extern void GOMP_doacross_ull_wait (unsigned long long, ...);
+
+ /* parallel.c */
+
+@@ -178,7 +240,15 @@ extern bool GOMP_cancellation_point (int
+ /* task.c */
+
+ extern void GOMP_task (void (*) (void *), void *, void (*) (void *, void *),
+- long, long, bool, unsigned, void **);
++ long, long, bool, unsigned, void **, int);
++extern void GOMP_taskloop (void (*) (void *), void *,
++ void (*) (void *, void *), long, long, unsigned,
++ unsigned long, int, long, long, long);
++extern void GOMP_taskloop_ull (void (*) (void *), void *,
++ void (*) (void *, void *), long, long,
++ unsigned, unsigned long, int,
++ unsigned long long, unsigned long long,
++ unsigned long long);
+ extern void GOMP_taskwait (void);
+ extern void GOMP_taskyield (void);
+ extern void GOMP_taskgroup_start (void);
+@@ -206,11 +276,38 @@ extern void GOMP_single_copy_end (void *
+
+ extern void GOMP_target (int, void (*) (void *), const void *,
+ size_t, void **, size_t *, unsigned char *);
++extern void GOMP_target_ext (int, void (*) (void *), size_t, void **, size_t *,
++ unsigned short *, unsigned int, void **, void **);
+ extern void GOMP_target_data (int, const void *,
+ size_t, void **, size_t *, unsigned char *);
++extern void GOMP_target_data_ext (int, size_t, void **, size_t *,
++ unsigned short *);
+ extern void GOMP_target_end_data (void);
+ extern void GOMP_target_update (int, const void *,
+ size_t, void **, size_t *, unsigned char *);
++extern void GOMP_target_update_ext (int, size_t, void **, size_t *,
++ unsigned short *, unsigned int, void **);
++extern void GOMP_target_enter_exit_data (int, size_t, void **, size_t *,
++ unsigned short *, unsigned int,
++ void **);
+ extern void GOMP_teams (unsigned int, unsigned int);
+
++/* oacc-parallel.c */
++
++extern void GOACC_parallel_keyed (int, void (*) (void *), size_t,
++ void **, size_t *, unsigned short *, ...);
++extern void GOACC_parallel (int, void (*) (void *), size_t, void **, size_t *,
++ unsigned short *, int, int, int, int, int, ...);
++extern void GOACC_data_start (int, size_t, void **, size_t *,
++ unsigned short *);
++extern void GOACC_data_end (void);
++extern void GOACC_enter_exit_data (int, size_t, void **,
++ size_t *, unsigned short *, int, int, ...);
++extern void GOACC_update (int, size_t, void **, size_t *,
++ unsigned short *, int, int, ...);
++extern void GOACC_wait (int, int, ...);
++extern int GOACC_get_num_threads (void);
++extern int GOACC_get_thread_num (void);
++extern void GOACC_declare (int, size_t, void **, size_t *, unsigned short *);
++
+ #endif /* LIBGOMP_G_H */
+--- libgomp/libgomp.h.jj 2014-08-01 15:59:49.145188127 +0200
++++ libgomp/libgomp.h 2016-07-14 17:40:24.038243456 +0200
+@@ -34,12 +34,35 @@
+ #ifndef LIBGOMP_H
+ #define LIBGOMP_H 1
+
++#ifndef _LIBGOMP_CHECKING_
++/* Define to 1 to perform internal sanity checks. */
++#define _LIBGOMP_CHECKING_ 0
++#endif
++
+ #include "config.h"
+ #include "gstdint.h"
++#include "libgomp-plugin.h"
+
+ #include
+ #include
+ #include
++#include
++
++/* Needed for memset in priority_queue.c. */
++#if _LIBGOMP_CHECKING_
++# ifdef STRING_WITH_STRINGS
++# include
++# include
++# else
++# ifdef HAVE_STRING_H
++# include
++# else
++# ifdef HAVE_STRINGS_H
++# include
++# endif
++# endif
++# endif
++#endif
+
+ #ifdef HAVE_ATTRIBUTE_VISIBILITY
+ # pragma GCC visibility push(hidden)
+@@ -56,6 +79,44 @@ enum memmodel
+ MEMMODEL_SEQ_CST = 5
+ };
+
++/* alloc.c */
++
++extern void *gomp_malloc (size_t) __attribute__((malloc));
++extern void *gomp_malloc_cleared (size_t) __attribute__((malloc));
++extern void *gomp_realloc (void *, size_t);
++
++/* Avoid conflicting prototypes of alloca() in system headers by using
++ GCC's builtin alloca(). */
++#define gomp_alloca(x) __builtin_alloca(x)
++
++/* error.c */
++
++extern void gomp_vdebug (int, const char *, va_list);
++extern void gomp_debug (int, const char *, ...)
++ __attribute__ ((format (printf, 2, 3)));
++#define gomp_vdebug(KIND, FMT, VALIST) \
++ do { \
++ if (__builtin_expect (gomp_debug_var, 0)) \
++ (gomp_vdebug) ((KIND), (FMT), (VALIST)); \
++ } while (0)
++#define gomp_debug(KIND, ...) \
++ do { \
++ if (__builtin_expect (gomp_debug_var, 0)) \
++ (gomp_debug) ((KIND), __VA_ARGS__); \
++ } while (0)
++extern void gomp_verror (const char *, va_list);
++extern void gomp_error (const char *, ...)
++ __attribute__ ((format (printf, 1, 2)));
++extern void gomp_vfatal (const char *, va_list)
++ __attribute__ ((noreturn));
++extern void gomp_fatal (const char *, ...)
++ __attribute__ ((noreturn, format (printf, 1, 2)));
++
++struct gomp_task;
++struct gomp_taskgroup;
++struct htab;
++
++#include "priority_queue.h"
+ #include "sem.h"
+ #include "mutex.h"
+ #include "bar.h"
+@@ -74,6 +135,44 @@ enum gomp_schedule_type
+ GFS_AUTO
+ };
+
++struct gomp_doacross_work_share
++{
++ union {
++ /* chunk_size copy, as ws->chunk_size is multiplied by incr for
++ GFS_DYNAMIC. */
++ long chunk_size;
++ /* Likewise, but for ull implementation. */
++ unsigned long long chunk_size_ull;
++ /* For schedule(static,0) this is the number
++ of iterations assigned to the last thread, i.e. number of
++ iterations / number of threads. */
++ long q;
++ /* Likewise, but for ull implementation. */
++ unsigned long long q_ull;
++ };
++ /* Size of each array entry (padded to cache line size). */
++ unsigned long elt_sz;
++ /* Number of dimensions in sink vectors. */
++ unsigned int ncounts;
++ /* True if the iterations can be flattened. */
++ bool flattened;
++ /* Actual array (of elt_sz sized units), aligned to cache line size.
++ This is indexed by team_id for GFS_STATIC and outermost iteration
++ / chunk_size for other schedules. */
++ unsigned char *array;
++ /* These two are only used for schedule(static,0). */
++ /* This one is number of iterations % number of threads. */
++ long t;
++ union {
++ /* And this one is cached t * (q + 1). */
++ long boundary;
++ /* Likewise, but for the ull implementation. */
++ unsigned long long boundary_ull;
++ };
++ /* Array of shift counts for each dimension if they can be flattened. */
++ unsigned int shift_counts[];
++};
++
+ struct gomp_work_share
+ {
+ /* This member records the SCHEDULE clause to be used for this construct.
+@@ -105,13 +204,18 @@ struct gomp_work_share
+ };
+ };
+
+- /* This is a circular queue that details which threads will be allowed
+- into the ordered region and in which order. When a thread allocates
+- iterations on which it is going to work, it also registers itself at
+- the end of the array. When a thread reaches the ordered region, it
+- checks to see if it is the one at the head of the queue. If not, it
+- blocks on its RELEASE semaphore. */
+- unsigned *ordered_team_ids;
++ union {
++ /* This is a circular queue that details which threads will be allowed
++ into the ordered region and in which order. When a thread allocates
++ iterations on which it is going to work, it also registers itself at
++ the end of the array. When a thread reaches the ordered region, it
++ checks to see if it is the one at the head of the queue. If not, it
++ blocks on its RELEASE semaphore. */
++ unsigned *ordered_team_ids;
++
++ /* This is a pointer to DOACROSS work share data. */
++ struct gomp_doacross_work_share *doacross;
++ };
+
+ /* This is the number of threads that have registered themselves in
+ the circular queue ordered_team_ids. */
+@@ -230,7 +334,7 @@ struct gomp_task_icv
+ {
+ unsigned long nthreads_var;
+ enum gomp_schedule_type run_sched_var;
+- int run_sched_modifier;
++ int run_sched_chunk_size;
+ int default_device_var;
+ unsigned int thread_limit_var;
+ bool dyn_var;
+@@ -246,6 +350,7 @@ extern gomp_mutex_t gomp_managed_threads
+ #endif
+ extern unsigned long gomp_max_active_levels_var;
+ extern bool gomp_cancel_var;
++extern int gomp_max_task_priority_var;
+ extern unsigned long long gomp_spin_count_var, gomp_throttled_spin_count_var;
+ extern unsigned long gomp_available_cpus, gomp_managed_threads;
+ extern unsigned long *gomp_nthreads_var_list, gomp_nthreads_var_list_len;
+@@ -253,25 +358,36 @@ extern char *gomp_bind_var_list;
+ extern unsigned long gomp_bind_var_list_len;
+ extern void **gomp_places_list;
+ extern unsigned long gomp_places_list_len;
++extern int gomp_debug_var;
++extern int goacc_device_num;
++extern char *goacc_device_type;
+
+ enum gomp_task_kind
+ {
++ /* Implicit task. */
+ GOMP_TASK_IMPLICIT,
+- GOMP_TASK_IFFALSE,
++ /* Undeferred task. */
++ GOMP_TASK_UNDEFERRED,
++ /* Task created by GOMP_task and waiting to be run. */
+ GOMP_TASK_WAITING,
+- GOMP_TASK_TIED
++ /* Task currently executing or scheduled and about to execute. */
++ GOMP_TASK_TIED,
++ /* Used for target tasks that have vars mapped and async run started,
++ but not yet completed. Once that completes, they will be readded
++ into the queues as GOMP_TASK_WAITING in order to perform the var
++ unmapping. */
++ GOMP_TASK_ASYNC_RUNNING
+ };
+
+-struct gomp_task;
+-struct gomp_taskgroup;
+-struct htab;
+-
+ struct gomp_task_depend_entry
+ {
++ /* Address of dependency. */
+ void *addr;
+ struct gomp_task_depend_entry *next;
+ struct gomp_task_depend_entry *prev;
++ /* Task that provides the dependency in ADDR. */
+ struct gomp_task *task;
++ /* Depend entry is of type "IN". */
+ bool is_in;
+ bool redundant;
+ bool redundant_out;
+@@ -290,8 +406,8 @@ struct gomp_taskwait
+ {
+ bool in_taskwait;
+ bool in_depend_wait;
++ /* Number of tasks we are waiting for. */
+ size_t n_depend;
+- struct gomp_task *last_parent_depends_on;
+ gomp_sem_t taskwait_sem;
+ };
+
+@@ -299,20 +415,31 @@ struct gomp_taskwait
+
+ struct gomp_task
+ {
++ /* Parent of this task. */
+ struct gomp_task *parent;
+- struct gomp_task *children;
+- struct gomp_task *next_child;
+- struct gomp_task *prev_child;
+- struct gomp_task *next_queue;
+- struct gomp_task *prev_queue;
+- struct gomp_task *next_taskgroup;
+- struct gomp_task *prev_taskgroup;
++ /* Children of this task. */
++ struct priority_queue children_queue;
++ /* Taskgroup this task belongs in. */
+ struct gomp_taskgroup *taskgroup;
++ /* Tasks that depend on this task. */
+ struct gomp_dependers_vec *dependers;
+ struct htab *depend_hash;
+ struct gomp_taskwait *taskwait;
++ /* Number of items in DEPEND. */
+ size_t depend_count;
++ /* Number of tasks this task depends on. Once this counter reaches
++ 0, we have no unsatisfied dependencies, and this task can be put
++ into the various queues to be scheduled. */
+ size_t num_dependees;
++
++ /* Priority of this task. */
++ int priority;
++ /* The priority node for this task in each of the different queues.
++ We put this here to avoid allocating space for each priority
++ node. Then we play offsetof() games to convert between pnode[]
++ entries and the gomp_task in which they reside. */
++ struct priority_node pnode[3];
++
+ struct gomp_task_icv icv;
+ void (*fn) (void *);
+ void *fn_data;
+@@ -320,20 +447,58 @@ struct gomp_task
+ bool in_tied_task;
+ bool final_task;
+ bool copy_ctors_done;
++ /* Set for undeferred tasks with unsatisfied dependencies which
++ block further execution of their parent until the dependencies
++ are satisfied. */
+ bool parent_depends_on;
++ /* Dependencies provided and/or needed for this task. DEPEND_COUNT
++ is the number of items available. */
+ struct gomp_task_depend_entry depend[];
+ };
+
++/* This structure describes a single #pragma omp taskgroup. */
++
+ struct gomp_taskgroup
+ {
+ struct gomp_taskgroup *prev;
+- struct gomp_task *children;
++ /* Queue of tasks that belong in this taskgroup. */
++ struct priority_queue taskgroup_queue;
+ bool in_taskgroup_wait;
+ bool cancelled;
+ gomp_sem_t taskgroup_sem;
+ size_t num_children;
+ };
+
++/* Various state of OpenMP async offloading tasks. */
++enum gomp_target_task_state
++{
++ GOMP_TARGET_TASK_DATA,
++ GOMP_TARGET_TASK_BEFORE_MAP,
++ GOMP_TARGET_TASK_FALLBACK,
++ GOMP_TARGET_TASK_READY_TO_RUN,
++ GOMP_TARGET_TASK_RUNNING,
++ GOMP_TARGET_TASK_FINISHED
++};
++
++/* This structure describes a target task. */
++
++struct gomp_target_task
++{
++ struct gomp_device_descr *devicep;
++ void (*fn) (void *);
++ size_t mapnum;
++ size_t *sizes;
++ unsigned short *kinds;
++ unsigned int flags;
++ enum gomp_target_task_state state;
++ struct target_mem_desc *tgt;
++ struct gomp_task *task;
++ struct gomp_team *team;
++ /* Device-specific target arguments. */
++ void **args;
++ void *hostaddrs[];
++};
++
+ /* This structure describes a "team" of threads. These are the threads
+ that are spawned by a PARALLEL constructs, as well as the work sharing
+ constructs that the team encounters. */
+@@ -396,7 +561,8 @@ struct gomp_team
+ struct gomp_work_share work_shares[8];
+
+ gomp_mutex_t task_lock;
+- struct gomp_task *task_queue;
++ /* Scheduled tasks. */
++ struct priority_queue task_queue;
+ /* Number of all GOMP_TASK_{WAITING,TIED} tasks in the team. */
+ unsigned int task_count;
+ /* Number of GOMP_TASK_WAITING tasks currently waiting to be scheduled. */
+@@ -451,6 +617,9 @@ struct gomp_thread_pool
+ struct gomp_thread **threads;
+ unsigned threads_size;
+ unsigned threads_used;
++ /* The last team is used for non-nested teams to delay their destruction to
++ make sure all the threads in the team move on to the pool's barrier before
++ the team's barrier is destroyed. */
+ struct gomp_team *last_team;
+ /* Number of threads running in this contention group. */
+ unsigned long threads_busy;
+@@ -519,23 +688,7 @@ extern bool gomp_affinity_same_place (vo
+ extern bool gomp_affinity_finalize_place_list (bool);
+ extern bool gomp_affinity_init_level (int, unsigned long, bool);
+ extern void gomp_affinity_print_place (void *);
+-
+-/* alloc.c */
+-
+-extern void *gomp_malloc (size_t) __attribute__((malloc));
+-extern void *gomp_malloc_cleared (size_t) __attribute__((malloc));
+-extern void *gomp_realloc (void *, size_t);
+-
+-/* Avoid conflicting prototypes of alloca() in system headers by using
+- GCC's builtin alloca(). */
+-#define gomp_alloca(x) __builtin_alloca(x)
+-
+-/* error.c */
+-
+-extern void gomp_error (const char *, ...)
+- __attribute__((format (printf, 1, 2)));
+-extern void gomp_fatal (const char *, ...)
+- __attribute__((noreturn, format (printf, 1, 2)));
++extern void gomp_get_place_proc_ids_8 (int, int64_t *);
+
+ /* iter.c */
+
+@@ -572,6 +725,9 @@ extern void gomp_ordered_next (void);
+ extern void gomp_ordered_static_init (void);
+ extern void gomp_ordered_static_next (void);
+ extern void gomp_ordered_sync (void);
++extern void gomp_doacross_init (unsigned, long *, long);
++extern void gomp_doacross_ull_init (unsigned, unsigned long long *,
++ unsigned long long);
+
+ /* parallel.c */
+
+@@ -588,6 +744,12 @@ extern void gomp_init_task (struct gomp_
+ struct gomp_task_icv *);
+ extern void gomp_end_task (void);
+ extern void gomp_barrier_handle_tasks (gomp_barrier_state_t);
++extern void gomp_task_maybe_wait_for_dependencies (void **);
++extern bool gomp_create_target_task (struct gomp_device_descr *,
++ void (*) (void *), size_t, void **,
++ size_t *, unsigned short *, unsigned int,
++ void **, void **,
++ enum gomp_target_task_state);
+
+ static void inline
+ gomp_finish_task (struct gomp_task *task)
+@@ -606,7 +768,213 @@ extern void gomp_free_thread (void *);
+
+ /* target.c */
+
++extern void gomp_init_targets_once (void);
+ extern int gomp_get_num_devices (void);
++extern bool gomp_target_task_fn (void *);
++
++/* Splay tree definitions. */
++typedef struct splay_tree_node_s *splay_tree_node;
++typedef struct splay_tree_s *splay_tree;
++typedef struct splay_tree_key_s *splay_tree_key;
++
++struct target_var_desc {
++ /* Splay key. */
++ splay_tree_key key;
++ /* True if data should be copied from device to host at the end. */
++ bool copy_from;
++ /* True if data always should be copied from device to host at the end. */
++ bool always_copy_from;
++ /* Relative offset against key host_start. */
++ uintptr_t offset;
++ /* Actual length. */
++ uintptr_t length;
++};
++
++struct target_mem_desc {
++ /* Reference count. */
++ uintptr_t refcount;
++ /* All the splay nodes allocated together. */
++ splay_tree_node array;
++ /* Start of the target region. */
++ uintptr_t tgt_start;
++ /* End of the targer region. */
++ uintptr_t tgt_end;
++ /* Handle to free. */
++ void *to_free;
++ /* Previous target_mem_desc. */
++ struct target_mem_desc *prev;
++ /* Number of items in following list. */
++ size_t list_count;
++
++ /* Corresponding target device descriptor. */
++ struct gomp_device_descr *device_descr;
++
++ /* List of target items to remove (or decrease refcount)
++ at the end of region. */
++ struct target_var_desc list[];
++};
++
++/* Special value for refcount - infinity. */
++#define REFCOUNT_INFINITY (~(uintptr_t) 0)
++/* Special value for refcount - tgt_offset contains target address of the
++ artificial pointer to "omp declare target link" object. */
++#define REFCOUNT_LINK (~(uintptr_t) 1)
++
++struct splay_tree_key_s {
++ /* Address of the host object. */
++ uintptr_t host_start;
++ /* Address immediately after the host object. */
++ uintptr_t host_end;
++ /* Descriptor of the target memory. */
++ struct target_mem_desc *tgt;
++ /* Offset from tgt->tgt_start to the start of the target object. */
++ uintptr_t tgt_offset;
++ /* Reference count. */
++ uintptr_t refcount;
++ /* Pointer to the original mapping of "omp declare target link" object. */
++ splay_tree_key link_key;
++};
++
++/* The comparison function. */
++
++static inline int
++splay_compare (splay_tree_key x, splay_tree_key y)
++{
++ if (x->host_start == x->host_end
++ && y->host_start == y->host_end)
++ return 0;
++ if (x->host_end <= y->host_start)
++ return -1;
++ if (x->host_start >= y->host_end)
++ return 1;
++ return 0;
++}
++
++#include "splay-tree.h"
++
++typedef struct acc_dispatch_t
++{
++ /* This is a linked list of data mapped using the
++ acc_map_data/acc_unmap_data or "acc enter data"/"acc exit data" pragmas.
++ Unlike mapped_data in the goacc_thread struct, unmapping can
++ happen out-of-order with respect to mapping. */
++ /* This is guarded by the lock in the "outer" struct gomp_device_descr. */
++ struct target_mem_desc *data_environ;
++
++ /* Execute. */
++ void (*exec_func) (void (*) (void *), size_t, void **, void **, int,
++ unsigned *, void *);
++
++ /* Async cleanup callback registration. */
++ void (*register_async_cleanup_func) (void *, int);
++
++ /* Asynchronous routines. */
++ int (*async_test_func) (int);
++ int (*async_test_all_func) (void);
++ void (*async_wait_func) (int);
++ void (*async_wait_async_func) (int, int);
++ void (*async_wait_all_func) (void);
++ void (*async_wait_all_async_func) (int);
++ void (*async_set_async_func) (int);
++
++ /* Create/destroy TLS data. */
++ void *(*create_thread_data_func) (int);
++ void (*destroy_thread_data_func) (void *);
++
++ /* NVIDIA target specific routines. */
++ struct {
++ void *(*get_current_device_func) (void);
++ void *(*get_current_context_func) (void);
++ void *(*get_stream_func) (int);
++ int (*set_stream_func) (int, void *);
++ } cuda;
++} acc_dispatch_t;
++
++/* Various state of the accelerator device. */
++enum gomp_device_state
++{
++ GOMP_DEVICE_UNINITIALIZED,
++ GOMP_DEVICE_INITIALIZED,
++ GOMP_DEVICE_FINALIZED
++};
++
++/* This structure describes accelerator device.
++ It contains name of the corresponding libgomp plugin, function handlers for
++ interaction with the device, ID-number of the device, and information about
++ mapped memory. */
++struct gomp_device_descr
++{
++ /* Immutable data, which is only set during initialization, and which is not
++ guarded by the lock. */
++
++ /* The name of the device. */
++ const char *name;
++
++ /* Capabilities of device (supports OpenACC, OpenMP). */
++ unsigned int capabilities;
++
++ /* This is the ID number of device among devices of the same type. */
++ int target_id;
++
++ /* This is the TYPE of device. */
++ enum offload_target_type type;
++
++ /* Function handlers. */
++ const char *(*get_name_func) (void);
++ unsigned int (*get_caps_func) (void);
++ int (*get_type_func) (void);
++ int (*get_num_devices_func) (void);
++ bool (*init_device_func) (int);
++ bool (*fini_device_func) (int);
++ unsigned (*version_func) (void);
++ int (*load_image_func) (int, unsigned, const void *, struct addr_pair **);
++ bool (*unload_image_func) (int, unsigned, const void *);
++ void *(*alloc_func) (int, size_t);
++ bool (*free_func) (int, void *);
++ bool (*dev2host_func) (int, void *, const void *, size_t);
++ bool (*host2dev_func) (int, void *, const void *, size_t);
++ bool (*dev2dev_func) (int, void *, const void *, size_t);
++ bool (*can_run_func) (void *);
++ void (*run_func) (int, void *, void *, void **);
++ void (*async_run_func) (int, void *, void *, void **, void *);
++
++ /* Splay tree containing information about mapped memory regions. */
++ struct splay_tree_s mem_map;
++
++ /* Mutex for the mutable data. */
++ gomp_mutex_t lock;
++
++ /* Current state of the device. OpenACC allows to move from INITIALIZED state
++ back to UNINITIALIZED state. OpenMP allows only to move from INITIALIZED
++ to FINALIZED state (at program shutdown). */
++ enum gomp_device_state state;
++
++ /* OpenACC-specific data and functions. */
++ /* This is mutable because of its mutable data_environ and target_data
++ members. */
++ acc_dispatch_t openacc;
++};
++
++/* Kind of the pragma, for which gomp_map_vars () is called. */
++enum gomp_map_vars_kind
++{
++ GOMP_MAP_VARS_OPENACC,
++ GOMP_MAP_VARS_TARGET,
++ GOMP_MAP_VARS_DATA,
++ GOMP_MAP_VARS_ENTER_DATA
++};
++
++extern void gomp_acc_insert_pointer (size_t, void **, size_t *, void *);
++extern void gomp_acc_remove_pointer (void *, bool, int, int);
++
++extern struct target_mem_desc *gomp_map_vars (struct gomp_device_descr *,
++ size_t, void **, void **,
++ size_t *, void *, bool,
++ enum gomp_map_vars_kind);
++extern void gomp_unmap_vars (struct target_mem_desc *, bool);
++extern void gomp_init_device (struct gomp_device_descr *);
++extern void gomp_free_memmap (struct splay_tree_s *);
++extern void gomp_unload_device (struct gomp_device_descr *);
+
+ /* work.c */
+
+@@ -646,8 +1014,28 @@ typedef enum omp_proc_bind_t
+ omp_proc_bind_spread = 4
+ } omp_proc_bind_t;
+
++typedef enum omp_lock_hint_t
++{
++ omp_lock_hint_none = 0,
++ omp_lock_hint_uncontended = 1,
++ omp_lock_hint_contended = 2,
++ omp_lock_hint_nonspeculative = 4,
++ omp_lock_hint_speculative = 8,
++} omp_lock_hint_t;
++
++extern void omp_init_lock_with_hint (omp_lock_t *, omp_lock_hint_t)
++ __GOMP_NOTHROW;
++extern void omp_init_nest_lock_with_hint (omp_lock_t *, omp_lock_hint_t)
++ __GOMP_NOTHROW;
++
+ extern int omp_get_cancellation (void) __GOMP_NOTHROW;
+ extern omp_proc_bind_t omp_get_proc_bind (void) __GOMP_NOTHROW;
++extern int omp_get_num_places (void) __GOMP_NOTHROW;
++extern int omp_get_place_num_procs (int) __GOMP_NOTHROW;
++extern void omp_get_place_proc_ids (int, int *) __GOMP_NOTHROW;
++extern int omp_get_place_num (void) __GOMP_NOTHROW;
++extern int omp_get_partition_num_places (void) __GOMP_NOTHROW;
++extern void omp_get_partition_place_nums (int *) __GOMP_NOTHROW;
+
+ extern void omp_set_default_device (int) __GOMP_NOTHROW;
+ extern int omp_get_default_device (void) __GOMP_NOTHROW;
+@@ -656,6 +1044,24 @@ extern int omp_get_num_teams (void) __GO
+ extern int omp_get_team_num (void) __GOMP_NOTHROW;
+
+ extern int omp_is_initial_device (void) __GOMP_NOTHROW;
++extern int omp_get_initial_device (void) __GOMP_NOTHROW;
++extern int omp_get_max_task_priority (void) __GOMP_NOTHROW;
++
++extern void *omp_target_alloc (__SIZE_TYPE__, int) __GOMP_NOTHROW;
++extern void omp_target_free (void *, int) __GOMP_NOTHROW;
++extern int omp_target_is_present (void *, int) __GOMP_NOTHROW;
++extern int omp_target_memcpy (void *, void *, __SIZE_TYPE__, __SIZE_TYPE__,
++ __SIZE_TYPE__, int, int) __GOMP_NOTHROW;
++extern int omp_target_memcpy_rect (void *, void *, __SIZE_TYPE__, int,
++ const __SIZE_TYPE__ *,
++ const __SIZE_TYPE__ *,
++ const __SIZE_TYPE__ *,
++ const __SIZE_TYPE__ *,
++ const __SIZE_TYPE__ *, int, int)
++ __GOMP_NOTHROW;
++extern int omp_target_associate_ptr (void *, void *, __SIZE_TYPE__,
++ __SIZE_TYPE__, int) __GOMP_NOTHROW;
++extern int omp_target_disassociate_ptr (void *, int) __GOMP_NOTHROW;
+
+ #if !defined (HAVE_ATTRIBUTE_VISIBILITY) \
+ || !defined (HAVE_ATTRIBUTE_ALIAS) \
+@@ -728,4 +1134,34 @@ extern int gomp_test_nest_lock_25 (omp_n
+ # define ialias_call(fn) fn
+ #endif
+
++/* Helper function for priority_node_to_task() and
++ task_to_priority_node().
++
++ Return the offset from a task to its priority_node entry. The
++ priority_node entry is has a type of TYPE. */
++
++static inline size_t
++priority_queue_offset (enum priority_queue_type type)
++{
++ return offsetof (struct gomp_task, pnode[(int) type]);
++}
++
++/* Return the task associated with a priority NODE of type TYPE. */
++
++static inline struct gomp_task *
++priority_node_to_task (enum priority_queue_type type,
++ struct priority_node *node)
++{
++ return (struct gomp_task *) ((char *) node - priority_queue_offset (type));
++}
++
++/* Return the priority node of type TYPE for a given TASK. */
++
++static inline struct priority_node *
++task_to_priority_node (enum priority_queue_type type,
++ struct gomp_task *task)
++{
++ return (struct priority_node *) ((char *) task
++ + priority_queue_offset (type));
++}
+ #endif /* LIBGOMP_H */
+--- libgomp/env.c.jj 2014-05-15 10:56:32.420522486 +0200
++++ libgomp/env.c 2016-07-13 16:57:04.437535335 +0200
+@@ -27,6 +27,8 @@
+
+ #include "libgomp.h"
+ #include "libgomp_f.h"
++#include "oacc-int.h"
++#include "gomp-constants.h"
+ #include
+ #include
+ #include
+@@ -56,7 +58,7 @@ struct gomp_task_icv gomp_global_icv = {
+ .nthreads_var = 1,
+ .thread_limit_var = UINT_MAX,
+ .run_sched_var = GFS_DYNAMIC,
+- .run_sched_modifier = 1,
++ .run_sched_chunk_size = 1,
+ .default_device_var = 0,
+ .dyn_var = false,
+ .nest_var = false,
+@@ -66,6 +68,7 @@ struct gomp_task_icv gomp_global_icv = {
+
+ unsigned long gomp_max_active_levels_var = INT_MAX;
+ bool gomp_cancel_var = false;
++int gomp_max_task_priority_var = 0;
+ #ifndef HAVE_SYNC_BUILTINS
+ gomp_mutex_t gomp_managed_threads_lock;
+ #endif
+@@ -76,6 +79,9 @@ char *gomp_bind_var_list;
+ unsigned long gomp_bind_var_list_len;
+ void **gomp_places_list;
+ unsigned long gomp_places_list_len;
++int gomp_debug_var;
++char *goacc_device_type;
++int goacc_device_num;
+
+ /* Parse the OMP_SCHEDULE environment variable. */
+
+@@ -118,7 +124,7 @@ parse_schedule (void)
+ ++env;
+ if (*env == '\0')
+ {
+- gomp_global_icv.run_sched_modifier
++ gomp_global_icv.run_sched_chunk_size
+ = gomp_global_icv.run_sched_var != GFS_STATIC;
+ return;
+ }
+@@ -144,7 +150,7 @@ parse_schedule (void)
+
+ if (value == 0 && gomp_global_icv.run_sched_var != GFS_STATIC)
+ value = 1;
+- gomp_global_icv.run_sched_modifier = value;
++ gomp_global_icv.run_sched_chunk_size = value;
+ return;
+
+ unknown:
+@@ -1011,6 +1017,16 @@ parse_affinity (bool ignore)
+ return false;
+ }
+
++static void
++parse_acc_device_type (void)
++{
++ const char *env = getenv ("ACC_DEVICE_TYPE");
++
++ if (env && *env != '\0')
++ goacc_device_type = strdup (env);
++ else
++ goacc_device_type = NULL;
++}
+
+ static void
+ handle_omp_display_env (unsigned long stacksize, int wait_policy)
+@@ -1054,7 +1070,7 @@ handle_omp_display_env (unsigned long st
+
+ fputs ("\nOPENMP DISPLAY ENVIRONMENT BEGIN\n", stderr);
+
+- fputs (" _OPENMP = '201307'\n", stderr);
++ fputs (" _OPENMP = '201511'\n", stderr);
+ fprintf (stderr, " OMP_DYNAMIC = '%s'\n",
+ gomp_global_icv.dyn_var ? "TRUE" : "FALSE");
+ fprintf (stderr, " OMP_NESTED = '%s'\n",
+@@ -1142,6 +1158,8 @@ handle_omp_display_env (unsigned long st
+ gomp_cancel_var ? "TRUE" : "FALSE");
+ fprintf (stderr, " OMP_DEFAULT_DEVICE = '%d'\n",
+ gomp_global_icv.default_device_var);
++ fprintf (stderr, " OMP_MAX_TASK_PRIORITY = '%d'\n",
++ gomp_max_task_priority_var);
+
+ if (verbose)
+ {
+@@ -1174,6 +1192,7 @@ initialize_env (void)
+ parse_boolean ("OMP_NESTED", &gomp_global_icv.nest_var);
+ parse_boolean ("OMP_CANCELLATION", &gomp_cancel_var);
+ parse_int ("OMP_DEFAULT_DEVICE", &gomp_global_icv.default_device_var, true);
++ parse_int ("OMP_MAX_TASK_PRIORITY", &gomp_max_task_priority_var, true);
+ parse_unsigned_long ("OMP_MAX_ACTIVE_LEVELS", &gomp_max_active_levels_var,
+ true);
+ if (parse_unsigned_long ("OMP_THREAD_LIMIT", &thread_limit_var, false))
+@@ -1181,6 +1200,7 @@ initialize_env (void)
+ gomp_global_icv.thread_limit_var
+ = thread_limit_var > INT_MAX ? UINT_MAX : thread_limit_var;
+ }
++ parse_int ("GOMP_DEBUG", &gomp_debug_var, true);
+ #ifndef HAVE_SYNC_BUILTINS
+ gomp_mutex_init (&gomp_managed_threads_lock);
+ #endif
+@@ -1271,6 +1291,15 @@ initialize_env (void)
+ }
+
+ handle_omp_display_env (stacksize, wait_policy);
++
++ /* OpenACC. */
++
++ if (!parse_int ("ACC_DEVICE_NUM", &goacc_device_num, true))
++ goacc_device_num = 0;
++
++ parse_acc_device_type ();
++
++ goacc_runtime_initialize ();
+ }
+
+
+@@ -1312,21 +1341,21 @@ omp_get_nested (void)
+ }
+
+ void
+-omp_set_schedule (omp_sched_t kind, int modifier)
++omp_set_schedule (omp_sched_t kind, int chunk_size)
+ {
+ struct gomp_task_icv *icv = gomp_icv (true);
+ switch (kind)
+ {
+ case omp_sched_static:
+- if (modifier < 1)
+- modifier = 0;
+- icv->run_sched_modifier = modifier;
++ if (chunk_size < 1)
++ chunk_size = 0;
++ icv->run_sched_chunk_size = chunk_size;
+ break;
+ case omp_sched_dynamic:
+ case omp_sched_guided:
+- if (modifier < 1)
+- modifier = 1;
+- icv->run_sched_modifier = modifier;
++ if (chunk_size < 1)
++ chunk_size = 1;
++ icv->run_sched_chunk_size = chunk_size;
+ break;
+ case omp_sched_auto:
+ break;
+@@ -1337,11 +1366,11 @@ omp_set_schedule (omp_sched_t kind, int
+ }
+
+ void
+-omp_get_schedule (omp_sched_t *kind, int *modifier)
++omp_get_schedule (omp_sched_t *kind, int *chunk_size)
+ {
+ struct gomp_task_icv *icv = gomp_icv (false);
+ *kind = icv->run_sched_var;
+- *modifier = icv->run_sched_modifier;
++ *chunk_size = icv->run_sched_chunk_size;
+ }
+
+ int
+@@ -1377,6 +1406,12 @@ omp_get_cancellation (void)
+ return gomp_cancel_var;
+ }
+
++int
++omp_get_max_task_priority (void)
++{
++ return gomp_max_task_priority_var;
++}
++
+ omp_proc_bind_t
+ omp_get_proc_bind (void)
+ {
+@@ -1425,6 +1460,59 @@ omp_is_initial_device (void)
+ return 1;
+ }
+
++int
++omp_get_initial_device (void)
++{
++ return GOMP_DEVICE_HOST_FALLBACK;
++}
++
++int
++omp_get_num_places (void)
++{
++ return gomp_places_list_len;
++}
++
++int
++omp_get_place_num (void)
++{
++ if (gomp_places_list == NULL)
++ return -1;
++
++ struct gomp_thread *thr = gomp_thread ();
++ if (thr->place == 0)
++ gomp_init_affinity ();
++
++ return (int) thr->place - 1;
++}
++
++int
++omp_get_partition_num_places (void)
++{
++ if (gomp_places_list == NULL)
++ return 0;
++
++ struct gomp_thread *thr = gomp_thread ();
++ if (thr->place == 0)
++ gomp_init_affinity ();
++
++ return thr->ts.place_partition_len;
++}
++
++void
++omp_get_partition_place_nums (int *place_nums)
++{
++ if (gomp_places_list == NULL)
++ return;
++
++ struct gomp_thread *thr = gomp_thread ();
++ if (thr->place == 0)
++ gomp_init_affinity ();
++
++ unsigned int i;
++ for (i = 0; i < thr->ts.place_partition_len; i++)
++ *place_nums++ = thr->ts.place_partition_off + i;
++}
++
+ ialias (omp_set_dynamic)
+ ialias (omp_set_nested)
+ ialias (omp_set_num_threads)
+@@ -1444,3 +1532,9 @@ ialias (omp_get_num_devices)
+ ialias (omp_get_num_teams)
+ ialias (omp_get_team_num)
+ ialias (omp_is_initial_device)
++ialias (omp_get_initial_device)
++ialias (omp_get_max_task_priority)
++ialias (omp_get_num_places)
++ialias (omp_get_place_num)
++ialias (omp_get_partition_num_places)
++ialias (omp_get_partition_place_nums)
+--- libgomp/openacc.h.jj 2016-07-13 16:57:04.432535397 +0200
++++ libgomp/openacc.h 2016-07-13 16:57:04.432535397 +0200
+@@ -0,0 +1,131 @@
++/* OpenACC Runtime Library User-facing Declarations
++
++ Copyright (C) 2013-2016 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++#ifndef _OPENACC_H
++#define _OPENACC_H 1
++
++/* The OpenACC standard is silent on whether or not including
++ might or must not include other header files. We chose to include
++ some. */
++#include
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#if __cplusplus >= 201103
++# define __GOACC_NOTHROW noexcept
++#elif __cplusplus
++# define __GOACC_NOTHROW throw ()
++#else /* Not C++ */
++# define __GOACC_NOTHROW __attribute__ ((__nothrow__))
++#endif
++
++/* Types */
++typedef enum acc_device_t {
++ /* Keep in sync with include/gomp-constants.h. */
++ acc_device_none = 0,
++ acc_device_default = 1,
++ acc_device_host = 2,
++ /* acc_device_host_nonshm = 3 removed. */
++ acc_device_not_host = 4,
++ acc_device_nvidia = 5,
++ _ACC_device_hwm,
++ /* Ensure enumeration is layout compatible with int. */
++ _ACC_highest = __INT_MAX__,
++ _ACC_neg = -1
++} acc_device_t;
++
++typedef enum acc_async_t {
++ /* Keep in sync with include/gomp-constants.h. */
++ acc_async_noval = -1,
++ acc_async_sync = -2
++} acc_async_t;
++
++int acc_get_num_devices (acc_device_t) __GOACC_NOTHROW;
++void acc_set_device_type (acc_device_t) __GOACC_NOTHROW;
++acc_device_t acc_get_device_type (void) __GOACC_NOTHROW;
++void acc_set_device_num (int, acc_device_t) __GOACC_NOTHROW;
++int acc_get_device_num (acc_device_t) __GOACC_NOTHROW;
++int acc_async_test (int) __GOACC_NOTHROW;
++int acc_async_test_all (void) __GOACC_NOTHROW;
++void acc_wait (int) __GOACC_NOTHROW;
++void acc_wait_async (int, int) __GOACC_NOTHROW;
++void acc_wait_all (void) __GOACC_NOTHROW;
++void acc_wait_all_async (int) __GOACC_NOTHROW;
++void acc_init (acc_device_t) __GOACC_NOTHROW;
++void acc_shutdown (acc_device_t) __GOACC_NOTHROW;
++#ifdef __cplusplus
++int acc_on_device (int __arg) __GOACC_NOTHROW;
++#else
++int acc_on_device (acc_device_t __arg) __GOACC_NOTHROW;
++#endif
++void *acc_malloc (size_t) __GOACC_NOTHROW;
++void acc_free (void *) __GOACC_NOTHROW;
++/* Some of these would be more correct with const qualifiers, but
++ the standard specifies otherwise. */
++void *acc_copyin (void *, size_t) __GOACC_NOTHROW;
++void *acc_present_or_copyin (void *, size_t) __GOACC_NOTHROW;
++void *acc_create (void *, size_t) __GOACC_NOTHROW;
++void *acc_present_or_create (void *, size_t) __GOACC_NOTHROW;
++void acc_copyout (void *, size_t) __GOACC_NOTHROW;
++void acc_delete (void *, size_t) __GOACC_NOTHROW;
++void acc_update_device (void *, size_t) __GOACC_NOTHROW;
++void acc_update_self (void *, size_t) __GOACC_NOTHROW;
++void acc_map_data (void *, void *, size_t) __GOACC_NOTHROW;
++void acc_unmap_data (void *) __GOACC_NOTHROW;
++void *acc_deviceptr (void *) __GOACC_NOTHROW;
++void *acc_hostptr (void *) __GOACC_NOTHROW;
++int acc_is_present (void *, size_t) __GOACC_NOTHROW;
++void acc_memcpy_to_device (void *, void *, size_t) __GOACC_NOTHROW;
++void acc_memcpy_from_device (void *, void *, size_t) __GOACC_NOTHROW;
++
++/* Old names. OpenACC does not specify whether these can or must
++ not be macros, inlines or aliases for the new names. */
++#define acc_pcreate acc_present_or_create
++#define acc_pcopyin acc_present_or_copyin
++
++/* CUDA-specific routines. */
++void *acc_get_current_cuda_device (void) __GOACC_NOTHROW;
++void *acc_get_current_cuda_context (void) __GOACC_NOTHROW;
++void *acc_get_cuda_stream (int) __GOACC_NOTHROW;
++int acc_set_cuda_stream (int, void *) __GOACC_NOTHROW;
++
++#ifdef __cplusplus
++}
++
++/* Forwarding function with correctly typed arg. */
++
++#pragma acc routine seq
++inline int acc_on_device (acc_device_t __arg) __GOACC_NOTHROW
++{
++ return acc_on_device ((int) __arg);
++}
++#endif
++
++#endif /* _OPENACC_H */
+--- libgomp/config/linux/doacross.h.jj 2016-07-13 16:57:18.902355979 +0200
++++ libgomp/config/linux/doacross.h 2016-07-13 16:57:18.902355979 +0200
+@@ -0,0 +1,57 @@
++/* Copyright (C) 2015-2016 Free Software Foundation, Inc.
++ Contributed by Jakub Jelinek .
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++/* This is a Linux specific implementation of doacross spinning. */
++
++#ifndef GOMP_DOACROSS_H
++#define GOMP_DOACROSS_H 1
++
++#include "libgomp.h"
++#include
++#include "wait.h"
++
++#ifdef HAVE_ATTRIBUTE_VISIBILITY
++# pragma GCC visibility push(hidden)
++#endif
++
++static inline void doacross_spin (unsigned long *addr, unsigned long expected,
++ unsigned long cur)
++{
++ /* FIXME: back off depending on how large expected - cur is. */
++ do
++ {
++ cpu_relax ();
++ cur = __atomic_load_n (addr, MEMMODEL_RELAXED);
++ if (expected < cur)
++ return;
++ }
++ while (1);
++}
++
++#ifdef HAVE_ATTRIBUTE_VISIBILITY
++# pragma GCC visibility pop
++#endif
++
++#endif /* GOMP_DOACROSS_H */
+--- libgomp/config/posix/doacross.h.jj 2016-07-13 16:57:18.903355966 +0200
++++ libgomp/config/posix/doacross.h 2016-07-13 16:57:18.903355966 +0200
+@@ -0,0 +1,62 @@
++/* Copyright (C) 2015-2016 Free Software Foundation, Inc.
++ Contributed by Jakub Jelinek .
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++/* This is a generic implementation of doacross spinning. */
++
++#ifndef GOMP_DOACROSS_H
++#define GOMP_DOACROSS_H 1
++
++#include "libgomp.h"
++#include
++
++#ifdef HAVE_ATTRIBUTE_VISIBILITY
++# pragma GCC visibility push(hidden)
++#endif
++
++static inline void
++cpu_relax (void)
++{
++ __asm volatile ("" : : : "memory");
++}
++
++static inline void doacross_spin (unsigned long *addr, unsigned long expected,
++ unsigned long cur)
++{
++ /* FIXME: back off depending on how large expected - cur is. */
++ do
++ {
++ cpu_relax ();
++ cur = __atomic_load_n (addr, MEMMODEL_RELAXED);
++ if (expected < cur)
++ return;
++ }
++ while (1);
++}
++
++#ifdef HAVE_ATTRIBUTE_VISIBILITY
++# pragma GCC visibility pop
++#endif
++
++#endif /* GOMP_DOACROSS_H */
+--- libgomp/splay-tree.c.jj 2016-07-13 16:57:18.919355768 +0200
++++ libgomp/splay-tree.c 2016-07-13 16:57:18.919355768 +0200
+@@ -0,0 +1,238 @@
++/* A splay-tree datatype.
++ Copyright (C) 1998-2016 Free Software Foundation, Inc.
++ Contributed by Mark Mitchell (mark@markmitchell.com).
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++/* The splay tree code copied from include/splay-tree.h and adjusted,
++ so that all the data lives directly in splay_tree_node_s structure
++ and no extra allocations are needed. */
++
++/* For an easily readable description of splay-trees, see:
++
++ Lewis, Harry R. and Denenberg, Larry. Data Structures and Their
++ Algorithms. Harper-Collins, Inc. 1991.
++
++ The major feature of splay trees is that all basic tree operations
++ are amortized O(log n) time for a tree with n nodes. */
++
++#include "libgomp.h"
++
++/* Rotate the edge joining the left child N with its parent P. PP is the
++ grandparents' pointer to P. */
++
++static inline void
++rotate_left (splay_tree_node *pp, splay_tree_node p, splay_tree_node n)
++{
++ splay_tree_node tmp;
++ tmp = n->right;
++ n->right = p;
++ p->left = tmp;
++ *pp = n;
++}
++
++/* Rotate the edge joining the right child N with its parent P. PP is the
++ grandparents' pointer to P. */
++
++static inline void
++rotate_right (splay_tree_node *pp, splay_tree_node p, splay_tree_node n)
++{
++ splay_tree_node tmp;
++ tmp = n->left;
++ n->left = p;
++ p->right = tmp;
++ *pp = n;
++}
++
++/* Bottom up splay of KEY. */
++
++static void
++splay_tree_splay (splay_tree sp, splay_tree_key key)
++{
++ if (sp->root == NULL)
++ return;
++
++ do {
++ int cmp1, cmp2;
++ splay_tree_node n, c;
++
++ n = sp->root;
++ cmp1 = splay_compare (key, &n->key);
++
++ /* Found. */
++ if (cmp1 == 0)
++ return;
++
++ /* Left or right? If no child, then we're done. */
++ if (cmp1 < 0)
++ c = n->left;
++ else
++ c = n->right;
++ if (!c)
++ return;
++
++ /* Next one left or right? If found or no child, we're done
++ after one rotation. */
++ cmp2 = splay_compare (key, &c->key);
++ if (cmp2 == 0
++ || (cmp2 < 0 && !c->left)
++ || (cmp2 > 0 && !c->right))
++ {
++ if (cmp1 < 0)
++ rotate_left (&sp->root, n, c);
++ else
++ rotate_right (&sp->root, n, c);
++ return;
++ }
++
++ /* Now we have the four cases of double-rotation. */
++ if (cmp1 < 0 && cmp2 < 0)
++ {
++ rotate_left (&n->left, c, c->left);
++ rotate_left (&sp->root, n, n->left);
++ }
++ else if (cmp1 > 0 && cmp2 > 0)
++ {
++ rotate_right (&n->right, c, c->right);
++ rotate_right (&sp->root, n, n->right);
++ }
++ else if (cmp1 < 0 && cmp2 > 0)
++ {
++ rotate_right (&n->left, c, c->right);
++ rotate_left (&sp->root, n, n->left);
++ }
++ else if (cmp1 > 0 && cmp2 < 0)
++ {
++ rotate_left (&n->right, c, c->left);
++ rotate_right (&sp->root, n, n->right);
++ }
++ } while (1);
++}
++
++/* Insert a new NODE into SP. The NODE shouldn't exist in the tree. */
++
++attribute_hidden void
++splay_tree_insert (splay_tree sp, splay_tree_node node)
++{
++ int comparison = 0;
++
++ splay_tree_splay (sp, &node->key);
++
++ if (sp->root)
++ comparison = splay_compare (&sp->root->key, &node->key);
++
++ if (sp->root && comparison == 0)
++ gomp_fatal ("Duplicate node");
++ else
++ {
++ /* Insert it at the root. */
++ if (sp->root == NULL)
++ node->left = node->right = NULL;
++ else if (comparison < 0)
++ {
++ node->left = sp->root;
++ node->right = node->left->right;
++ node->left->right = NULL;
++ }
++ else
++ {
++ node->right = sp->root;
++ node->left = node->right->left;
++ node->right->left = NULL;
++ }
++
++ sp->root = node;
++ }
++}
++
++/* Remove node with KEY from SP. It is not an error if it did not exist. */
++
++attribute_hidden void
++splay_tree_remove (splay_tree sp, splay_tree_key key)
++{
++ splay_tree_splay (sp, key);
++
++ if (sp->root && splay_compare (&sp->root->key, key) == 0)
++ {
++ splay_tree_node left, right;
++
++ left = sp->root->left;
++ right = sp->root->right;
++
++ /* One of the children is now the root. Doesn't matter much
++ which, so long as we preserve the properties of the tree. */
++ if (left)
++ {
++ sp->root = left;
++
++ /* If there was a right child as well, hang it off the
++ right-most leaf of the left child. */
++ if (right)
++ {
++ while (left->right)
++ left = left->right;
++ left->right = right;
++ }
++ }
++ else
++ sp->root = right;
++ }
++}
++
++/* Lookup KEY in SP, returning NODE if present, and NULL
++ otherwise. */
++
++attribute_hidden splay_tree_key
++splay_tree_lookup (splay_tree sp, splay_tree_key key)
++{
++ splay_tree_splay (sp, key);
++
++ if (sp->root && splay_compare (&sp->root->key, key) == 0)
++ return &sp->root->key;
++ else
++ return NULL;
++}
++
++/* Helper function for splay_tree_foreach.
++
++ Run FUNC on every node in KEY. */
++
++static void
++splay_tree_foreach_internal (splay_tree_node node, splay_tree_callback func,
++ void *data)
++{
++ if (!node)
++ return;
++ func (&node->key, data);
++ splay_tree_foreach_internal (node->left, func, data);
++ /* Yeah, whatever. GCC can fix my tail recursion. */
++ splay_tree_foreach_internal (node->right, func, data);
++}
++
++/* Run FUNC on each of the nodes in SP. */
++
++attribute_hidden void
++splay_tree_foreach (splay_tree sp, splay_tree_callback func, void *data)
++{
++ splay_tree_foreach_internal (sp->root, func, data);
++}
+--- libgomp/libgomp-plugin.c.jj 2016-07-13 16:57:04.435535360 +0200
++++ libgomp/libgomp-plugin.c 2016-07-13 16:57:04.435535360 +0200
+@@ -0,0 +1,80 @@
++/* Copyright (C) 2014-2016 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++/* Exported (non-hidden) functions exposing libgomp interface for plugins. */
++
++#include
++
++#include "libgomp.h"
++#include "libgomp-plugin.h"
++
++void *
++GOMP_PLUGIN_malloc (size_t size)
++{
++ return gomp_malloc (size);
++}
++
++void *
++GOMP_PLUGIN_malloc_cleared (size_t size)
++{
++ return gomp_malloc_cleared (size);
++}
++
++void *
++GOMP_PLUGIN_realloc (void *ptr, size_t size)
++{
++ return gomp_realloc (ptr, size);
++}
++
++void
++GOMP_PLUGIN_debug (int kind, const char *msg, ...)
++{
++ va_list ap;
++
++ va_start (ap, msg);
++ gomp_vdebug (kind, msg, ap);
++ va_end (ap);
++}
++
++void
++GOMP_PLUGIN_error (const char *msg, ...)
++{
++ va_list ap;
++
++ va_start (ap, msg);
++ gomp_verror (msg, ap);
++ va_end (ap);
++}
++
++void
++GOMP_PLUGIN_fatal (const char *msg, ...)
++{
++ va_list ap;
++
++ va_start (ap, msg);
++ gomp_vfatal (msg, ap);
++ va_end (ap);
++}
+--- libgomp/libgomp-plugin.h.jj 2016-07-13 16:57:04.438535323 +0200
++++ libgomp/libgomp-plugin.h 2016-07-13 16:57:04.438535323 +0200
+@@ -0,0 +1,80 @@
++/* Copyright (C) 2014-2016 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++/* An interface to various libgomp-internal functions for use by plugins. */
++
++#ifndef LIBGOMP_PLUGIN_H
++#define LIBGOMP_PLUGIN_H 1
++
++#include
++#include
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* Capabilities of offloading devices. */
++#define GOMP_OFFLOAD_CAP_SHARED_MEM (1 << 0)
++#define GOMP_OFFLOAD_CAP_NATIVE_EXEC (1 << 1)
++#define GOMP_OFFLOAD_CAP_OPENMP_400 (1 << 2)
++#define GOMP_OFFLOAD_CAP_OPENACC_200 (1 << 3)
++
++/* Type of offload target device. Keep in sync with include/gomp-constants.h. */
++enum offload_target_type
++{
++ OFFLOAD_TARGET_TYPE_HOST = 2,
++ /* OFFLOAD_TARGET_TYPE_HOST_NONSHM = 3 removed. */
++ OFFLOAD_TARGET_TYPE_NVIDIA_PTX = 5,
++ OFFLOAD_TARGET_TYPE_INTEL_MIC = 6,
++ OFFLOAD_TARGET_TYPE_HSA = 7
++};
++
++/* Auxiliary struct, used for transferring pairs of addresses from plugin
++ to libgomp. */
++struct addr_pair
++{
++ uintptr_t start;
++ uintptr_t end;
++};
++
++/* Miscellaneous functions. */
++extern void *GOMP_PLUGIN_malloc (size_t) __attribute__ ((malloc));
++extern void *GOMP_PLUGIN_malloc_cleared (size_t) __attribute__ ((malloc));
++extern void *GOMP_PLUGIN_realloc (void *, size_t);
++void GOMP_PLUGIN_target_task_completion (void *);
++
++extern void GOMP_PLUGIN_debug (int, const char *, ...)
++ __attribute__ ((format (printf, 2, 3)));
++extern void GOMP_PLUGIN_error (const char *, ...)
++ __attribute__ ((format (printf, 1, 2)));
++extern void GOMP_PLUGIN_fatal (const char *, ...)
++ __attribute__ ((noreturn, format (printf, 1, 2)));
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- libgomp/oacc-async.c.jj 2016-07-13 16:57:13.488423109 +0200
++++ libgomp/oacc-async.c 2016-07-13 16:57:13.488423109 +0200
+@@ -0,0 +1,107 @@
++/* OpenACC Runtime Library Definitions.
++
++ Copyright (C) 2013-2016 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++#include
++#include "openacc.h"
++#include "libgomp.h"
++#include "oacc-int.h"
++
++int
++acc_async_test (int async)
++{
++ if (async < acc_async_sync)
++ gomp_fatal ("invalid async argument: %d", async);
++
++ struct goacc_thread *thr = goacc_thread ();
++
++ if (!thr || !thr->dev)
++ gomp_fatal ("no device active");
++
++ return thr->dev->openacc.async_test_func (async);
++}
++
++int
++acc_async_test_all (void)
++{
++ struct goacc_thread *thr = goacc_thread ();
++
++ if (!thr || !thr->dev)
++ gomp_fatal ("no device active");
++
++ return thr->dev->openacc.async_test_all_func ();
++}
++
++void
++acc_wait (int async)
++{
++ if (async < acc_async_sync)
++ gomp_fatal ("invalid async argument: %d", async);
++
++ struct goacc_thread *thr = goacc_thread ();
++
++ if (!thr || !thr->dev)
++ gomp_fatal ("no device active");
++
++ thr->dev->openacc.async_wait_func (async);
++}
++
++void
++acc_wait_async (int async1, int async2)
++{
++ struct goacc_thread *thr = goacc_thread ();
++
++ if (!thr || !thr->dev)
++ gomp_fatal ("no device active");
++
++ thr->dev->openacc.async_wait_async_func (async1, async2);
++}
++
++void
++acc_wait_all (void)
++{
++ struct goacc_thread *thr = goacc_thread ();
++
++ if (!thr || !thr->dev)
++ gomp_fatal ("no device active");
++
++ thr->dev->openacc.async_wait_all_func ();
++}
++
++void
++acc_wait_all_async (int async)
++{
++ if (async < acc_async_sync)
++ gomp_fatal ("invalid async argument: %d", async);
++
++ struct goacc_thread *thr = goacc_thread ();
++
++ if (!thr || !thr->dev)
++ gomp_fatal ("no device active");
++
++ thr->dev->openacc.async_wait_all_async_func (async);
++}
+--- libgomp/splay-tree.h.jj 2016-07-13 16:57:18.934355582 +0200
++++ libgomp/splay-tree.h 2016-07-13 16:57:18.934355582 +0200
+@@ -0,0 +1,130 @@
++/* A splay-tree datatype.
++ Copyright (C) 1998-2016 Free Software Foundation, Inc.
++ Contributed by Mark Mitchell (mark@markmitchell.com).
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++/* The splay tree code copied from include/splay-tree.h and adjusted,
++ so that all the data lives directly in splay_tree_node_s structure
++ and no extra allocations are needed.
++
++ Files including this header should before including it add:
++typedef struct splay_tree_node_s *splay_tree_node;
++typedef struct splay_tree_s *splay_tree;
++typedef struct splay_tree_key_s *splay_tree_key;
++ define splay_tree_key_s structure, and define
++ splay_compare inline function.
++
++ Alternatively, they can define splay_tree_prefix macro before
++ including this header and then all the above types, the
++ splay_compare function and the splay_tree_{lookup,insert_remove}
++ function will be prefixed by that prefix. If splay_tree_prefix
++ macro is defined, this header must be included twice: once where
++ you need the header file definitions, and once where you need the
++ .c implementation routines. In the latter case, you must also
++ define the macro splay_tree_c. See the include of splay-tree.h in
++ priority_queue.[hc] for an example. */
++
++/* For an easily readable description of splay-trees, see:
++
++ Lewis, Harry R. and Denenberg, Larry. Data Structures and Their
++ Algorithms. Harper-Collins, Inc. 1991.
++
++ The major feature of splay trees is that all basic tree operations
++ are amortized O(log n) time for a tree with n nodes. */
++
++#ifdef splay_tree_prefix
++# define splay_tree_name_1(prefix, name) prefix ## _ ## name
++# define splay_tree_name(prefix, name) splay_tree_name_1 (prefix, name)
++# define splay_tree_node_s \
++ splay_tree_name (splay_tree_prefix, splay_tree_node_s)
++# define splay_tree_s \
++ splay_tree_name (splay_tree_prefix, splay_tree_s)
++# define splay_tree_key_s \
++ splay_tree_name (splay_tree_prefix, splay_tree_key_s)
++# define splay_tree_node \
++ splay_tree_name (splay_tree_prefix, splay_tree_node)
++# define splay_tree \
++ splay_tree_name (splay_tree_prefix, splay_tree)
++# define splay_tree_key \
++ splay_tree_name (splay_tree_prefix, splay_tree_key)
++# define splay_compare \
++ splay_tree_name (splay_tree_prefix, splay_compare)
++# define splay_tree_lookup \
++ splay_tree_name (splay_tree_prefix, splay_tree_lookup)
++# define splay_tree_insert \
++ splay_tree_name (splay_tree_prefix, splay_tree_insert)
++# define splay_tree_remove \
++ splay_tree_name (splay_tree_prefix, splay_tree_remove)
++# define splay_tree_foreach \
++ splay_tree_name (splay_tree_prefix, splay_tree_foreach)
++# define splay_tree_callback \
++ splay_tree_name (splay_tree_prefix, splay_tree_callback)
++#endif
++
++#ifndef splay_tree_c
++/* Header file definitions and prototypes. */
++
++/* The nodes in the splay tree. */
++struct splay_tree_node_s {
++ struct splay_tree_key_s key;
++ /* The left and right children, respectively. */
++ splay_tree_node left;
++ splay_tree_node right;
++};
++
++/* The splay tree. */
++struct splay_tree_s {
++ splay_tree_node root;
++};
++
++typedef void (*splay_tree_callback) (splay_tree_key, void *);
++
++extern splay_tree_key splay_tree_lookup (splay_tree, splay_tree_key);
++extern void splay_tree_insert (splay_tree, splay_tree_node);
++extern void splay_tree_remove (splay_tree, splay_tree_key);
++extern void splay_tree_foreach (splay_tree, splay_tree_callback, void *);
++#else /* splay_tree_c */
++# ifdef splay_tree_prefix
++# include "splay-tree.c"
++# undef splay_tree_name_1
++# undef splay_tree_name
++# undef splay_tree_node_s
++# undef splay_tree_s
++# undef splay_tree_key_s
++# undef splay_tree_node
++# undef splay_tree
++# undef splay_tree_key
++# undef splay_compare
++# undef splay_tree_lookup
++# undef splay_tree_insert
++# undef splay_tree_remove
++# undef splay_tree_foreach
++# undef splay_tree_callback
++# undef splay_tree_c
++# endif
++#endif /* #ifndef splay_tree_c */
++
++#ifdef splay_tree_prefix
++# undef splay_tree_prefix
++#endif
+--- libgomp/oacc-plugin.c.jj 2016-07-13 16:57:13.481423196 +0200
++++ libgomp/oacc-plugin.c 2016-07-14 15:40:21.653151873 +0200
+@@ -0,0 +1,44 @@
++/* Copyright (C) 2014-2016 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++/* Initialize and register OpenACC dispatch table from libgomp plugin. */
++
++#include "libgomp.h"
++#include "oacc-plugin.h"
++#include "oacc-int.h"
++
++void
++GOMP_PLUGIN_async_unmap_vars (void *ptr, int async)
++{
++}
++
++/* Return the target-specific part of the TLS data for the current thread. */
++
++void *
++GOMP_PLUGIN_acc_thread (void)
++{
++ return NULL;
++}
+--- libgomp/oacc-init.c.jj 2016-07-13 16:57:04.423535509 +0200
++++ libgomp/oacc-init.c 2016-07-14 19:06:41.679575688 +0200
+@@ -0,0 +1,640 @@
++/* OpenACC Runtime initialization routines
++
++ Copyright (C) 2013-2016 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++#include "libgomp.h"
++#include "oacc-int.h"
++#include "openacc.h"
++#include
++#include
++#include
++#include
++#include
++
++/* This lock is used to protect access to cached_base_dev, dispatchers and
++ the (abstract) initialisation state of attached offloading devices. */
++
++static gomp_mutex_t acc_device_lock;
++
++/* A cached version of the dispatcher for the global "current" accelerator type,
++ e.g. used as the default when creating new host threads. This is the
++ device-type equivalent of goacc_device_num (which specifies which device to
++ use out of potentially several of the same type). If there are several
++ devices of a given type, this points at the first one. */
++
++static struct gomp_device_descr *cached_base_dev = NULL;
++
++#if defined HAVE_TLS || defined USE_EMUTLS
++__thread struct goacc_thread *goacc_tls_data;
++#else
++pthread_key_t goacc_tls_key;
++#endif
++static pthread_key_t goacc_cleanup_key;
++
++static struct goacc_thread *goacc_threads;
++static gomp_mutex_t goacc_thread_lock;
++
++/* An array of dispatchers for device types, indexed by the type. This array
++ only references "base" devices, and other instances of the same type are
++ found by simply indexing from each such device (which are stored linearly,
++ grouped by device in target.c:devices). */
++static struct gomp_device_descr *dispatchers[_ACC_device_hwm] = { 0 };
++
++attribute_hidden void
++goacc_register (struct gomp_device_descr *disp)
++{
++ /* Only register the 0th device here. */
++ if (disp->target_id != 0)
++ return;
++
++ gomp_mutex_lock (&acc_device_lock);
++
++ assert (acc_device_type (disp->type) != acc_device_none
++ && acc_device_type (disp->type) != acc_device_default
++ && acc_device_type (disp->type) != acc_device_not_host);
++ assert (!dispatchers[disp->type]);
++ dispatchers[disp->type] = disp;
++
++ gomp_mutex_unlock (&acc_device_lock);
++}
++
++static const char *
++name_of_acc_device_t (enum acc_device_t type)
++{
++ switch (type)
++ {
++ case acc_device_none: return "none";
++ case acc_device_default: return "default";
++ case acc_device_host: return "host";
++ case acc_device_not_host: return "not_host";
++ case acc_device_nvidia: return "nvidia";
++ default: gomp_fatal ("unknown device type %u", (unsigned) type);
++ }
++}
++
++/* ACC_DEVICE_LOCK must be held before calling this function. If FAIL_IS_ERROR
++ is true, this function raises an error if there are no devices of type D,
++ otherwise it returns NULL in that case. */
++
++static struct gomp_device_descr *
++resolve_device (acc_device_t d, bool fail_is_error)
++{
++ acc_device_t d_arg = d;
++
++ switch (d)
++ {
++ case acc_device_default:
++ {
++ if (goacc_device_type)
++ {
++ /* Lookup the named device. */
++ if (!strcasecmp (goacc_device_type, "host"))
++ {
++ d = acc_device_host;
++ goto found;
++ }
++
++ if (fail_is_error)
++ {
++ gomp_mutex_unlock (&acc_device_lock);
++ gomp_fatal ("device type %s not supported", goacc_device_type);
++ }
++ else
++ return NULL;
++ }
++
++ /* No default device specified, so start scanning for any non-host
++ device that is available. */
++ d = acc_device_not_host;
++ }
++ /* FALLTHROUGH */
++
++ case acc_device_not_host:
++ if (d_arg == acc_device_default)
++ {
++ d = acc_device_host;
++ goto found;
++ }
++ if (fail_is_error)
++ {
++ gomp_mutex_unlock (&acc_device_lock);
++ gomp_fatal ("no device found");
++ }
++ else
++ return NULL;
++ break;
++
++ case acc_device_host:
++ break;
++
++ default:
++ if (d > _ACC_device_hwm)
++ {
++ if (fail_is_error)
++ goto unsupported_device;
++ else
++ return NULL;
++ }
++ break;
++ }
++ found:
++
++ assert (d != acc_device_none
++ && d != acc_device_default
++ && d != acc_device_not_host);
++
++ if (dispatchers[d] == NULL && fail_is_error)
++ {
++ unsupported_device:
++ gomp_mutex_unlock (&acc_device_lock);
++ gomp_fatal ("device type %s not supported", name_of_acc_device_t (d));
++ }
++
++ return dispatchers[d];
++}
++
++/* Emit a suitable error if no device of a particular type is available, or
++ the given device number is out-of-range. */
++static void
++acc_dev_num_out_of_range (acc_device_t d, int ord, int ndevs)
++{
++ if (ndevs == 0)
++ gomp_fatal ("no devices of type %s available", name_of_acc_device_t (d));
++ else
++ gomp_fatal ("device %u out of range", ord);
++}
++
++/* This is called when plugins have been initialized, and serves to call
++ (indirectly) the target's device_init hook. Calling multiple times without
++ an intervening acc_shutdown_1 call is an error. ACC_DEVICE_LOCK must be
++ held before calling this function. */
++
++static struct gomp_device_descr *
++acc_init_1 (acc_device_t d)
++{
++ struct gomp_device_descr *base_dev, *acc_dev;
++ int ndevs;
++
++ base_dev = resolve_device (d, true);
++
++ ndevs = base_dev->get_num_devices_func ();
++
++ if (ndevs <= 0 || goacc_device_num >= ndevs)
++ acc_dev_num_out_of_range (d, goacc_device_num, ndevs);
++
++ acc_dev = &base_dev[goacc_device_num];
++
++ gomp_mutex_lock (&acc_dev->lock);
++ if (acc_dev->state == GOMP_DEVICE_INITIALIZED)
++ {
++ gomp_mutex_unlock (&acc_dev->lock);
++ gomp_fatal ("device already active");
++ }
++
++ gomp_init_device (acc_dev);
++ gomp_mutex_unlock (&acc_dev->lock);
++
++ return base_dev;
++}
++
++/* ACC_DEVICE_LOCK must be held before calling this function. */
++
++static void
++acc_shutdown_1 (acc_device_t d)
++{
++ struct gomp_device_descr *base_dev;
++ struct goacc_thread *walk;
++ int ndevs, i;
++ bool devices_active = false;
++
++ /* Get the base device for this device type. */
++ base_dev = resolve_device (d, true);
++
++ ndevs = base_dev->get_num_devices_func ();
++
++ gomp_mutex_lock (&goacc_thread_lock);
++
++ /* Free target-specific TLS data and close all devices. */
++ for (walk = goacc_threads; walk != NULL; walk = walk->next)
++ {
++ if (walk->target_tls)
++ base_dev->openacc.destroy_thread_data_func (walk->target_tls);
++
++ walk->target_tls = NULL;
++
++ /* Similarly, if this happens then user code has done something weird. */
++ if (walk->saved_bound_dev)
++ {
++ gomp_mutex_unlock (&goacc_thread_lock);
++ gomp_fatal ("shutdown during host fallback");
++ }
++
++ if (walk->dev)
++ {
++ gomp_mutex_lock (&walk->dev->lock);
++ gomp_free_memmap (&walk->dev->mem_map);
++ gomp_mutex_unlock (&walk->dev->lock);
++
++ walk->dev = NULL;
++ walk->base_dev = NULL;
++ }
++ }
++
++ gomp_mutex_unlock (&goacc_thread_lock);
++
++ /* Close all the devices of this type that have been opened. */
++ bool ret = true;
++ for (i = 0; i < ndevs; i++)
++ {
++ struct gomp_device_descr *acc_dev = &base_dev[i];
++ gomp_mutex_lock (&acc_dev->lock);
++ if (acc_dev->state == GOMP_DEVICE_INITIALIZED)
++ {
++ devices_active = true;
++ ret &= acc_dev->fini_device_func (acc_dev->target_id);
++ acc_dev->state = GOMP_DEVICE_UNINITIALIZED;
++ }
++ gomp_mutex_unlock (&acc_dev->lock);
++ }
++
++ if (!ret)
++ gomp_fatal ("device finalization failed");
++
++ if (!devices_active)
++ gomp_fatal ("no device initialized");
++}
++
++static struct goacc_thread *
++goacc_new_thread (void)
++{
++ struct goacc_thread *thr = gomp_malloc (sizeof (struct gomp_thread));
++
++#if defined HAVE_TLS || defined USE_EMUTLS
++ goacc_tls_data = thr;
++#else
++ pthread_setspecific (goacc_tls_key, thr);
++#endif
++
++ pthread_setspecific (goacc_cleanup_key, thr);
++
++ gomp_mutex_lock (&goacc_thread_lock);
++ thr->next = goacc_threads;
++ goacc_threads = thr;
++ gomp_mutex_unlock (&goacc_thread_lock);
++
++ return thr;
++}
++
++static void
++goacc_destroy_thread (void *data)
++{
++ struct goacc_thread *thr = data, *walk, *prev;
++
++ gomp_mutex_lock (&goacc_thread_lock);
++
++ if (thr)
++ {
++ struct gomp_device_descr *acc_dev = thr->dev;
++
++ if (acc_dev && thr->target_tls)
++ {
++ acc_dev->openacc.destroy_thread_data_func (thr->target_tls);
++ thr->target_tls = NULL;
++ }
++
++ assert (!thr->mapped_data);
++
++ /* Remove from thread list. */
++ for (prev = NULL, walk = goacc_threads; walk;
++ prev = walk, walk = walk->next)
++ if (walk == thr)
++ {
++ if (prev == NULL)
++ goacc_threads = walk->next;
++ else
++ prev->next = walk->next;
++
++ free (thr);
++
++ break;
++ }
++
++ assert (walk);
++ }
++
++ gomp_mutex_unlock (&goacc_thread_lock);
++}
++
++/* Use the ORD'th device instance for the current host thread (or -1 for the
++ current global default). The device (and the runtime) must be initialised
++ before calling this function. */
++
++void
++goacc_attach_host_thread_to_device (int ord)
++{
++ struct goacc_thread *thr = goacc_thread ();
++ struct gomp_device_descr *acc_dev = NULL, *base_dev = NULL;
++ int num_devices;
++
++ if (thr && thr->dev && (thr->dev->target_id == ord || ord < 0))
++ return;
++
++ if (ord < 0)
++ ord = goacc_device_num;
++
++ /* Decide which type of device to use. If the current thread has a device
++ type already (e.g. set by acc_set_device_type), use that, else use the
++ global default. */
++ if (thr && thr->base_dev)
++ base_dev = thr->base_dev;
++ else
++ {
++ assert (cached_base_dev);
++ base_dev = cached_base_dev;
++ }
++
++ num_devices = base_dev->get_num_devices_func ();
++ if (num_devices <= 0 || ord >= num_devices)
++ acc_dev_num_out_of_range (acc_device_type (base_dev->type), ord,
++ num_devices);
++
++ if (!thr)
++ thr = goacc_new_thread ();
++
++ thr->base_dev = base_dev;
++ thr->dev = acc_dev = &base_dev[ord];
++ thr->saved_bound_dev = NULL;
++
++ thr->target_tls
++ = acc_dev->openacc.create_thread_data_func (ord);
++
++ acc_dev->openacc.async_set_async_func (acc_async_sync);
++}
++
++/* OpenACC 2.0a (3.2.12, 3.2.13) doesn't specify whether the serialization of
++ init/shutdown is per-process or per-thread. We choose per-process. */
++
++void
++acc_init (acc_device_t d)
++{
++ gomp_mutex_lock (&acc_device_lock);
++
++ cached_base_dev = acc_init_1 (d);
++
++ gomp_mutex_unlock (&acc_device_lock);
++
++ goacc_attach_host_thread_to_device (-1);
++}
++
++ialias (acc_init)
++
++void
++acc_shutdown (acc_device_t d)
++{
++ gomp_mutex_lock (&acc_device_lock);
++
++ acc_shutdown_1 (d);
++
++ gomp_mutex_unlock (&acc_device_lock);
++}
++
++ialias (acc_shutdown)
++
++int
++acc_get_num_devices (acc_device_t d)
++{
++ int n = 0;
++ struct gomp_device_descr *acc_dev;
++
++ if (d == acc_device_none)
++ return 0;
++
++ gomp_mutex_lock (&acc_device_lock);
++ acc_dev = resolve_device (d, false);
++ gomp_mutex_unlock (&acc_device_lock);
++
++ if (!acc_dev)
++ return 0;
++
++ n = acc_dev->get_num_devices_func ();
++ if (n < 0)
++ n = 0;
++
++ return n;
++}
++
++ialias (acc_get_num_devices)
++
++/* Set the device type for the current thread only (using the current global
++ default device number), initialising that device if necessary. Also set the
++ default device type for new threads to D. */
++
++void
++acc_set_device_type (acc_device_t d)
++{
++ struct gomp_device_descr *base_dev, *acc_dev;
++ struct goacc_thread *thr = goacc_thread ();
++
++ gomp_mutex_lock (&acc_device_lock);
++
++ cached_base_dev = base_dev = resolve_device (d, true);
++ acc_dev = &base_dev[goacc_device_num];
++
++ gomp_mutex_lock (&acc_dev->lock);
++ if (acc_dev->state == GOMP_DEVICE_UNINITIALIZED)
++ gomp_init_device (acc_dev);
++ gomp_mutex_unlock (&acc_dev->lock);
++
++ gomp_mutex_unlock (&acc_device_lock);
++
++ /* We're changing device type: invalidate the current thread's dev and
++ base_dev pointers. */
++ if (thr && thr->base_dev != base_dev)
++ {
++ thr->base_dev = thr->dev = NULL;
++ }
++
++ goacc_attach_host_thread_to_device (-1);
++}
++
++ialias (acc_set_device_type)
++
++acc_device_t
++acc_get_device_type (void)
++{
++ acc_device_t res = acc_device_none;
++ struct gomp_device_descr *dev;
++ struct goacc_thread *thr = goacc_thread ();
++
++ if (thr && thr->base_dev)
++ res = acc_device_type (thr->base_dev->type);
++ else
++ {
++ gomp_mutex_lock (&acc_device_lock);
++ dev = resolve_device (acc_device_default, true);
++ gomp_mutex_unlock (&acc_device_lock);
++ res = acc_device_type (dev->type);
++ }
++
++ assert (res != acc_device_default
++ && res != acc_device_not_host);
++
++ return res;
++}
++
++ialias (acc_get_device_type)
++
++int
++acc_get_device_num (acc_device_t d)
++{
++ const struct gomp_device_descr *dev;
++ struct goacc_thread *thr = goacc_thread ();
++
++ if (d >= _ACC_device_hwm)
++ gomp_fatal ("unknown device type %u", (unsigned) d);
++
++ gomp_mutex_lock (&acc_device_lock);
++ dev = resolve_device (d, true);
++ gomp_mutex_unlock (&acc_device_lock);
++
++ if (thr && thr->base_dev == dev && thr->dev)
++ return thr->dev->target_id;
++
++ return goacc_device_num;
++}
++
++ialias (acc_get_device_num)
++
++void
++acc_set_device_num (int ord, acc_device_t d)
++{
++ struct gomp_device_descr *base_dev, *acc_dev;
++ int num_devices;
++
++ if (ord < 0)
++ ord = goacc_device_num;
++
++ if ((int) d == 0)
++ /* Set whatever device is being used by the current host thread to use
++ device instance ORD. It's unclear if this is supposed to affect other
++ host threads too (OpenACC 2.0 (3.2.4) acc_set_device_num). */
++ goacc_attach_host_thread_to_device (ord);
++ else
++ {
++ gomp_mutex_lock (&acc_device_lock);
++
++ cached_base_dev = base_dev = resolve_device (d, true);
++
++ num_devices = base_dev->get_num_devices_func ();
++
++ if (num_devices <= 0 || ord >= num_devices)
++ acc_dev_num_out_of_range (d, ord, num_devices);
++
++ acc_dev = &base_dev[ord];
++
++ gomp_mutex_lock (&acc_dev->lock);
++ if (acc_dev->state == GOMP_DEVICE_UNINITIALIZED)
++ gomp_init_device (acc_dev);
++ gomp_mutex_unlock (&acc_dev->lock);
++
++ gomp_mutex_unlock (&acc_device_lock);
++
++ goacc_attach_host_thread_to_device (ord);
++ }
++
++ goacc_device_num = ord;
++}
++
++ialias (acc_set_device_num)
++
++int
++acc_on_device (acc_device_t dev)
++{
++ return dev == acc_device_host || dev == acc_device_none;
++}
++
++ialias (acc_on_device)
++
++attribute_hidden void
++goacc_runtime_initialize (void)
++{
++ gomp_mutex_init (&acc_device_lock);
++
++#if !(defined HAVE_TLS || defined USE_EMUTLS)
++ pthread_key_create (&goacc_tls_key, NULL);
++#endif
++
++ pthread_key_create (&goacc_cleanup_key, goacc_destroy_thread);
++
++ cached_base_dev = NULL;
++
++ goacc_threads = NULL;
++ gomp_mutex_init (&goacc_thread_lock);
++
++ /* Initialize and register the 'host' device type. */
++ goacc_host_init ();
++}
++
++/* Compiler helper functions */
++
++attribute_hidden void
++goacc_save_and_set_bind (acc_device_t d)
++{
++ struct goacc_thread *thr = goacc_thread ();
++
++ assert (!thr->saved_bound_dev);
++
++ thr->saved_bound_dev = thr->dev;
++ thr->dev = dispatchers[d];
++}
++
++attribute_hidden void
++goacc_restore_bind (void)
++{
++ struct goacc_thread *thr = goacc_thread ();
++
++ thr->dev = thr->saved_bound_dev;
++ thr->saved_bound_dev = NULL;
++}
++
++/* This is called from any OpenACC support function that may need to implicitly
++ initialize the libgomp runtime, either globally or from a new host thread.
++ On exit "goacc_thread" will return a valid & populated thread block. */
++
++attribute_hidden void
++goacc_lazy_initialize (void)
++{
++ struct goacc_thread *thr = goacc_thread ();
++
++ if (thr && thr->dev)
++ return;
++
++ if (!cached_base_dev)
++ acc_init (acc_device_default);
++ else
++ goacc_attach_host_thread_to_device (-1);
++}
+--- libgomp/oacc-int.h.jj 2016-07-13 16:57:04.400535794 +0200
++++ libgomp/oacc-int.h 2016-07-13 16:57:04.400535794 +0200
+@@ -0,0 +1,106 @@
++/* OpenACC Runtime - internal declarations
++
++ Copyright (C) 2013-2016 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++/* This file contains data types and function declarations that are not
++ part of the official OpenACC user interface. There are declarations
++ in here that are part of the GNU OpenACC ABI, in that the compiler is
++ required to know about them and use them.
++
++ The convention is that the all caps prefix "GOACC" is used group items
++ that are part of the external ABI, and the lower case prefix "goacc"
++ is used group items that are completely private to the library. */
++
++#ifndef OACC_INT_H
++#define OACC_INT_H 1
++
++#include "openacc.h"
++#include "config.h"
++#include
++#include
++#include
++
++#ifdef HAVE_ATTRIBUTE_VISIBILITY
++# pragma GCC visibility push(hidden)
++#endif
++
++static inline enum acc_device_t
++acc_device_type (enum offload_target_type type)
++{
++ return (enum acc_device_t) type;
++}
++
++struct goacc_thread
++{
++ /* The base device for the current thread. */
++ struct gomp_device_descr *base_dev;
++
++ /* The device for the current thread. */
++ struct gomp_device_descr *dev;
++
++ struct gomp_device_descr *saved_bound_dev;
++
++ /* This is a linked list of data mapped by the "acc data" pragma, following
++ strictly push/pop semantics according to lexical scope. */
++ struct target_mem_desc *mapped_data;
++
++ /* These structures form a list: this is the next thread in that list. */
++ struct goacc_thread *next;
++
++ /* Target-specific data (used by plugin). */
++ void *target_tls;
++};
++
++#if defined HAVE_TLS || defined USE_EMUTLS
++extern __thread struct goacc_thread *goacc_tls_data;
++static inline struct goacc_thread *
++goacc_thread (void)
++{
++ return goacc_tls_data;
++}
++#else
++extern pthread_key_t goacc_tls_key;
++static inline struct goacc_thread *
++goacc_thread (void)
++{
++ return pthread_getspecific (goacc_tls_key);
++}
++#endif
++
++void goacc_register (struct gomp_device_descr *) __GOACC_NOTHROW;
++void goacc_attach_host_thread_to_device (int);
++void goacc_runtime_initialize (void);
++void goacc_save_and_set_bind (acc_device_t);
++void goacc_restore_bind (void);
++void goacc_lazy_initialize (void);
++void goacc_host_init (void);
++
++#ifdef HAVE_ATTRIBUTE_VISIBILITY
++# pragma GCC visibility pop
++#endif
++
++#endif
+--- libgomp/oacc-host.c.jj 2016-07-13 16:57:13.489423096 +0200
++++ libgomp/oacc-host.c 2016-07-13 16:57:13.489423096 +0200
+@@ -0,0 +1,266 @@
++/* OpenACC Runtime Library: acc_device_host.
++
++ Copyright (C) 2013-2016 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++#include "libgomp.h"
++#include "oacc-int.h"
++#include "gomp-constants.h"
++
++#include
++#include
++#include
++
++static struct gomp_device_descr host_dispatch;
++
++static const char *
++host_get_name (void)
++{
++ return host_dispatch.name;
++}
++
++static unsigned int
++host_get_caps (void)
++{
++ return host_dispatch.capabilities;
++}
++
++static int
++host_get_type (void)
++{
++ return host_dispatch.type;
++}
++
++static int
++host_get_num_devices (void)
++{
++ return 1;
++}
++
++static bool
++host_init_device (int n __attribute__ ((unused)))
++{
++ return true;
++}
++
++static bool
++host_fini_device (int n __attribute__ ((unused)))
++{
++ return true;
++}
++
++static unsigned
++host_version (void)
++{
++ return GOMP_VERSION;
++}
++
++static int
++host_load_image (int n __attribute__ ((unused)),
++ unsigned v __attribute__ ((unused)),
++ const void *t __attribute__ ((unused)),
++ struct addr_pair **r __attribute__ ((unused)))
++{
++ return 0;
++}
++
++static bool
++host_unload_image (int n __attribute__ ((unused)),
++ unsigned v __attribute__ ((unused)),
++ const void *t __attribute__ ((unused)))
++{
++ return true;
++}
++
++static void *
++host_alloc (int n __attribute__ ((unused)), size_t s)
++{
++ return gomp_malloc (s);
++}
++
++static bool
++host_free (int n __attribute__ ((unused)), void *p)
++{
++ free (p);
++ return true;
++}
++
++static bool
++host_dev2host (int n __attribute__ ((unused)),
++ void *h __attribute__ ((unused)),
++ const void *d __attribute__ ((unused)),
++ size_t s __attribute__ ((unused)))
++{
++ return true;
++}
++
++static bool
++host_host2dev (int n __attribute__ ((unused)),
++ void *d __attribute__ ((unused)),
++ const void *h __attribute__ ((unused)),
++ size_t s __attribute__ ((unused)))
++{
++ return true;
++}
++
++static void
++host_run (int n __attribute__ ((unused)), void *fn_ptr, void *vars,
++ void **args __attribute__((unused)))
++{
++ void (*fn)(void *) = (void (*)(void *)) fn_ptr;
++
++ fn (vars);
++}
++
++static void
++host_openacc_exec (void (*fn) (void *),
++ size_t mapnum __attribute__ ((unused)),
++ void **hostaddrs,
++ void **devaddrs __attribute__ ((unused)),
++ int async __attribute__ ((unused)),
++ unsigned *dims __attribute ((unused)),
++ void *targ_mem_desc __attribute__ ((unused)))
++{
++ fn (hostaddrs);
++}
++
++static void
++host_openacc_register_async_cleanup (void *targ_mem_desc __attribute__ ((unused)),
++ int async __attribute__ ((unused)))
++{
++}
++
++static int
++host_openacc_async_test (int async __attribute__ ((unused)))
++{
++ return 1;
++}
++
++static int
++host_openacc_async_test_all (void)
++{
++ return 1;
++}
++
++static void
++host_openacc_async_wait (int async __attribute__ ((unused)))
++{
++}
++
++static void
++host_openacc_async_wait_async (int async1 __attribute__ ((unused)),
++ int async2 __attribute__ ((unused)))
++{
++}
++
++static void
++host_openacc_async_wait_all (void)
++{
++}
++
++static void
++host_openacc_async_wait_all_async (int async __attribute__ ((unused)))
++{
++}
++
++static void
++host_openacc_async_set_async (int async __attribute__ ((unused)))
++{
++}
++
++static void *
++host_openacc_create_thread_data (int ord __attribute__ ((unused)))
++{
++ return NULL;
++}
++
++static void
++host_openacc_destroy_thread_data (void *tls_data __attribute__ ((unused)))
++{
++}
++
++static struct gomp_device_descr host_dispatch =
++ {
++ .name = "host",
++ .capabilities = (GOMP_OFFLOAD_CAP_SHARED_MEM
++ | GOMP_OFFLOAD_CAP_NATIVE_EXEC
++ | GOMP_OFFLOAD_CAP_OPENACC_200),
++ .target_id = 0,
++ .type = OFFLOAD_TARGET_TYPE_HOST,
++
++ .get_name_func = host_get_name,
++ .get_caps_func = host_get_caps,
++ .get_type_func = host_get_type,
++ .get_num_devices_func = host_get_num_devices,
++ .init_device_func = host_init_device,
++ .fini_device_func = host_fini_device,
++ .version_func = host_version,
++ .load_image_func = host_load_image,
++ .unload_image_func = host_unload_image,
++ .alloc_func = host_alloc,
++ .free_func = host_free,
++ .dev2host_func = host_dev2host,
++ .host2dev_func = host_host2dev,
++ .run_func = host_run,
++
++ .mem_map = { NULL },
++ /* .lock initilized in goacc_host_init. */
++ .state = GOMP_DEVICE_UNINITIALIZED,
++
++ .openacc = {
++ .data_environ = NULL,
++
++ .exec_func = host_openacc_exec,
++
++ .register_async_cleanup_func = host_openacc_register_async_cleanup,
++
++ .async_test_func = host_openacc_async_test,
++ .async_test_all_func = host_openacc_async_test_all,
++ .async_wait_func = host_openacc_async_wait,
++ .async_wait_async_func = host_openacc_async_wait_async,
++ .async_wait_all_func = host_openacc_async_wait_all,
++ .async_wait_all_async_func = host_openacc_async_wait_all_async,
++ .async_set_async_func = host_openacc_async_set_async,
++
++ .create_thread_data_func = host_openacc_create_thread_data,
++ .destroy_thread_data_func = host_openacc_destroy_thread_data,
++
++ .cuda = {
++ .get_current_device_func = NULL,
++ .get_current_context_func = NULL,
++ .get_stream_func = NULL,
++ .set_stream_func = NULL,
++ }
++ }
++ };
++
++/* Initialize and register this device type. */
++void
++goacc_host_init (void)
++{
++ gomp_mutex_init (&host_dispatch.lock);
++ goacc_register (&host_dispatch);
++}
+--- libgomp/oacc-parallel.c.jj 2016-07-13 16:57:04.399535807 +0200
++++ libgomp/oacc-parallel.c 2016-07-14 18:53:06.694996381 +0200
+@@ -0,0 +1,241 @@
++/* Copyright (C) 2013-2016 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++/* This file handles OpenACC constructs. */
++
++#include "openacc.h"
++#include "libgomp.h"
++#include "libgomp_g.h"
++#include "gomp-constants.h"
++#include "oacc-int.h"
++#ifdef HAVE_INTTYPES_H
++# include /* For PRIu64. */
++#endif
++#include
++#include
++#include
++
++static void goacc_wait (int async, int num_waits, va_list *ap);
++
++
++/* Launch a possibly offloaded function on DEVICE. FN is the host fn
++ address. MAPNUM, HOSTADDRS, SIZES & KINDS describe the memory
++ blocks to be copied to/from the device. Varadic arguments are
++ keyed optional parameters terminated with a zero. */
++
++void
++GOACC_parallel_keyed (int device, void (*fn) (void *),
++ size_t mapnum, void **hostaddrs, size_t *sizes,
++ unsigned short *kinds, ...)
++{
++ bool host_fallback = device == GOMP_DEVICE_HOST_FALLBACK;
++ struct goacc_thread *thr;
++ struct gomp_device_descr *acc_dev;
++
++#ifdef HAVE_INTTYPES_H
++ gomp_debug (0, "%s: mapnum=%"PRIu64", hostaddrs=%p, size=%p, kinds=%p\n",
++ __FUNCTION__, (uint64_t) mapnum, hostaddrs, sizes, kinds);
++#else
++ gomp_debug (0, "%s: mapnum=%lu, hostaddrs=%p, sizes=%p, kinds=%p\n",
++ __FUNCTION__, (unsigned long) mapnum, hostaddrs, sizes, kinds);
++#endif
++ goacc_lazy_initialize ();
++
++ thr = goacc_thread ();
++ acc_dev = thr->dev;
++
++ /* Host fallback if "if" clause is false or if the current device is set to
++ the host. */
++ if (host_fallback)
++ {
++ goacc_save_and_set_bind (acc_device_host);
++ fn (hostaddrs);
++ goacc_restore_bind ();
++ return;
++ }
++ else if (acc_device_type (acc_dev->type) == acc_device_host)
++ {
++ fn (hostaddrs);
++ return;
++ }
++
++ /* acc_device_host is the only supported device type. */
++}
++
++/* Legacy entry point, only provide host execution. */
++
++void
++GOACC_parallel (int device, void (*fn) (void *),
++ size_t mapnum, void **hostaddrs, size_t *sizes,
++ unsigned short *kinds,
++ int num_gangs, int num_workers, int vector_length,
++ int async, int num_waits, ...)
++{
++ goacc_save_and_set_bind (acc_device_host);
++ fn (hostaddrs);
++ goacc_restore_bind ();
++}
++
++void
++GOACC_data_start (int device, size_t mapnum,
++ void **hostaddrs, size_t *sizes, unsigned short *kinds)
++{
++ goacc_lazy_initialize ();
++}
++
++void
++GOACC_data_end (void)
++{
++ gomp_debug (0, " %s: restore mappings\n", __FUNCTION__);
++ gomp_debug (0, " %s: mappings restored\n", __FUNCTION__);
++}
++
++void
++GOACC_enter_exit_data (int device, size_t mapnum,
++ void **hostaddrs, size_t *sizes, unsigned short *kinds,
++ int async, int num_waits, ...)
++{
++ goacc_lazy_initialize ();
++}
++
++static void
++goacc_wait (int async, int num_waits, va_list *ap)
++{
++ struct goacc_thread *thr = goacc_thread ();
++ struct gomp_device_descr *acc_dev = thr->dev;
++
++ while (num_waits--)
++ {
++ int qid = va_arg (*ap, int);
++
++ if (acc_async_test (qid))
++ continue;
++
++ if (async == acc_async_sync)
++ acc_wait (qid);
++ else if (qid == async)
++ ;/* If we're waiting on the same asynchronous queue as we're
++ launching on, the queue itself will order work as
++ required, so there's no need to wait explicitly. */
++ else
++ acc_dev->openacc.async_wait_async_func (qid, async);
++ }
++}
++
++void
++GOACC_update (int device, size_t mapnum,
++ void **hostaddrs, size_t *sizes, unsigned short *kinds,
++ int async, int num_waits, ...)
++{
++ goacc_lazy_initialize ();
++}
++
++void
++GOACC_wait (int async, int num_waits, ...)
++{
++ if (num_waits)
++ {
++ va_list ap;
++
++ va_start (ap, num_waits);
++ goacc_wait (async, num_waits, &ap);
++ va_end (ap);
++ }
++ else if (async == acc_async_sync)
++ acc_wait_all ();
++ else if (async == acc_async_noval)
++ goacc_thread ()->dev->openacc.async_wait_all_async_func (acc_async_noval);
++}
++
++int
++GOACC_get_num_threads (void)
++{
++ return 1;
++}
++
++int
++GOACC_get_thread_num (void)
++{
++ return 0;
++}
++
++void
++GOACC_declare (int device, size_t mapnum,
++ void **hostaddrs, size_t *sizes, unsigned short *kinds)
++{
++ int i;
++
++ for (i = 0; i < mapnum; i++)
++ {
++ unsigned char kind = kinds[i] & 0xff;
++
++ if (kind == GOMP_MAP_POINTER || kind == GOMP_MAP_TO_PSET)
++ continue;
++
++ switch (kind)
++ {
++ case GOMP_MAP_FORCE_ALLOC:
++ case GOMP_MAP_FORCE_FROM:
++ case GOMP_MAP_FORCE_TO:
++ case GOMP_MAP_POINTER:
++ case GOMP_MAP_DELETE:
++ GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i],
++ &kinds[i], 0, 0);
++ break;
++
++ case GOMP_MAP_FORCE_DEVICEPTR:
++ break;
++
++ case GOMP_MAP_ALLOC:
++ if (!acc_is_present (hostaddrs[i], sizes[i]))
++ GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i],
++ &kinds[i], 0, 0);
++ break;
++
++ case GOMP_MAP_TO:
++ GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i],
++ &kinds[i], 0, 0);
++
++ break;
++
++ case GOMP_MAP_FROM:
++ kinds[i] = GOMP_MAP_FORCE_FROM;
++ GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i],
++ &kinds[i], 0, 0);
++ break;
++
++ case GOMP_MAP_FORCE_PRESENT:
++ if (!acc_is_present (hostaddrs[i], sizes[i]))
++ gomp_fatal ("[%p,%ld] is not mapped", hostaddrs[i],
++ (unsigned long) sizes[i]);
++ break;
++
++ default:
++ assert (0);
++ break;
++ }
++ }
++}
+--- libgomp/oacc-cuda.c.jj 2016-07-13 16:57:04.432535397 +0200
++++ libgomp/oacc-cuda.c 2016-07-13 16:57:04.432535397 +0200
+@@ -0,0 +1,86 @@
++/* OpenACC Runtime Library: CUDA support glue.
++
++ Copyright (C) 2014-2016 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++#include "openacc.h"
++#include "config.h"
++#include "libgomp.h"
++#include "oacc-int.h"
++
++void *
++acc_get_current_cuda_device (void)
++{
++ struct goacc_thread *thr = goacc_thread ();
++
++ if (thr && thr->dev && thr->dev->openacc.cuda.get_current_device_func)
++ return thr->dev->openacc.cuda.get_current_device_func ();
++
++ return NULL;
++}
++
++void *
++acc_get_current_cuda_context (void)
++{
++ struct goacc_thread *thr = goacc_thread ();
++
++ if (thr && thr->dev && thr->dev->openacc.cuda.get_current_context_func)
++ return thr->dev->openacc.cuda.get_current_context_func ();
++
++ return NULL;
++}
++
++void *
++acc_get_cuda_stream (int async)
++{
++ struct goacc_thread *thr = goacc_thread ();
++
++ if (async < 0)
++ return NULL;
++
++ if (thr && thr->dev && thr->dev->openacc.cuda.get_stream_func)
++ return thr->dev->openacc.cuda.get_stream_func (async);
++
++ return NULL;
++}
++
++int
++acc_set_cuda_stream (int async, void *stream)
++{
++ struct goacc_thread *thr;
++
++ if (async < 0 || stream == NULL)
++ return 0;
++
++ goacc_lazy_initialize ();
++
++ thr = goacc_thread ();
++
++ if (thr && thr->dev && thr->dev->openacc.cuda.set_stream_func)
++ return thr->dev->openacc.cuda.set_stream_func (async, stream);
++
++ return -1;
++}
+--- libgomp/openacc_lib.h.jj 2016-07-13 16:57:13.486423134 +0200
++++ libgomp/openacc_lib.h 2016-07-13 16:57:13.486423134 +0200
+@@ -0,0 +1,382 @@
++! OpenACC Runtime Library Definitions. -*- mode: fortran -*-
++
++! Copyright (C) 2014-2016 Free Software Foundation, Inc.
++
++! Contributed by Tobias Burnus
++! and Mentor Embedded.
++
++! This file is part of the GNU Offloading and Multi Processing Library
++! (libgomp).
++
++! Libgomp 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.
++
++! Libgomp 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
++! .
++
++! NOTE: Due to the use of dimension (..), the code only works when compiled
++! with -std=f2008ts/gnu/legacy but not with other standard settings.
++! Alternatively, the user can use the module version, which permits
++! compilation with -std=f95.
++
++ integer, parameter :: acc_device_kind = 4
++
++! Keep in sync with include/gomp-constants.h.
++ integer (acc_device_kind), parameter :: acc_device_none = 0
++ integer (acc_device_kind), parameter :: acc_device_default = 1
++ integer (acc_device_kind), parameter :: acc_device_host = 2
++! integer (acc_device_kind), parameter :: acc_device_host_nonshm = 3
++! removed.
++ integer (acc_device_kind), parameter :: acc_device_not_host = 4
++ integer (acc_device_kind), parameter :: acc_device_nvidia = 5
++
++ integer, parameter :: acc_handle_kind = 4
++
++! Keep in sync with include/gomp-constants.h.
++ integer (acc_handle_kind), parameter :: acc_async_noval = -1
++ integer (acc_handle_kind), parameter :: acc_async_sync = -2
++
++ integer, parameter :: openacc_version = 201306
++
++ interface acc_get_num_devices
++ function acc_get_num_devices_h (d)
++ import acc_device_kind
++ integer acc_get_num_devices_h
++ integer (acc_device_kind) d
++ end function
++ end interface
++
++ interface acc_set_device_type
++ subroutine acc_set_device_type_h (d)
++ import acc_device_kind
++ integer (acc_device_kind) d
++ end subroutine
++ end interface
++
++ interface acc_get_device_type
++ function acc_get_device_type_h ()
++ import acc_device_kind
++ integer (acc_device_kind) acc_get_device_type_h
++ end function
++ end interface
++
++ interface acc_set_device_num
++ subroutine acc_set_device_num_h (n, d)
++ import acc_device_kind
++ integer n
++ integer (acc_device_kind) d
++ end subroutine
++ end interface
++
++ interface acc_get_device_num
++ function acc_get_device_num_h (d)
++ import acc_device_kind
++ integer acc_get_device_num_h
++ integer (acc_device_kind) d
++ end function
++ end interface
++
++ interface acc_async_test
++ function acc_async_test_h (a)
++ logical acc_async_test_h
++ integer a
++ end function
++ end interface
++
++ interface acc_async_test_all
++ function acc_async_test_all_h ()
++ logical acc_async_test_all_h
++ end function
++ end interface
++
++ interface acc_wait
++ subroutine acc_wait_h (a)
++ integer a
++ end subroutine
++ end interface
++
++ interface acc_wait_async
++ subroutine acc_wait_async_h (a1, a2)
++ integer a1, a2
++ end subroutine
++ end interface
++
++ interface acc_wait_all
++ subroutine acc_wait_all_h ()
++ end subroutine
++ end interface
++
++ interface acc_wait_all_async
++ subroutine acc_wait_all_async_h (a)
++ integer a
++ end subroutine
++ end interface
++
++ interface acc_init
++ subroutine acc_init_h (devicetype)
++ import acc_device_kind
++ integer (acc_device_kind) devicetype
++ end subroutine
++ end interface
++
++ interface acc_shutdown
++ subroutine acc_shutdown_h (devicetype)
++ import acc_device_kind
++ integer (acc_device_kind) devicetype
++ end subroutine
++ end interface
++
++ interface acc_on_device
++ function acc_on_device_h (devicetype)
++ import acc_device_kind
++ logical acc_on_device_h
++ integer (acc_device_kind) devicetype
++ end function
++ end interface
++
++ ! acc_malloc: Only available in C/C++
++ ! acc_free: Only available in C/C++
++
++ interface acc_copyin
++ subroutine acc_copyin_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_copyin_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_copyin_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++ end interface
++
++ interface acc_present_or_copyin
++ subroutine acc_present_or_copyin_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_present_or_copyin_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_present_or_copyin_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++ end interface
++
++ interface acc_pcopyin
++ subroutine acc_pcopyin_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_pcopyin_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_pcopyin_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++ end interface
++
++ interface acc_create
++ subroutine acc_create_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_create_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_create_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++ end interface
++
++ interface acc_present_or_create
++ subroutine acc_present_or_create_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_present_or_create_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_present_or_create_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++ end interface
++
++ interface acc_pcreate
++ subroutine acc_pcreate_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_pcreate_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_pcreate_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++ end interface
++
++ interface acc_copyout
++ subroutine acc_copyout_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_copyout_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_copyout_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++ end interface
++
++ interface acc_delete
++ subroutine acc_delete_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_delete_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_delete_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++ end interface
++
++ interface acc_update_device
++ subroutine acc_update_device_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_update_device_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_update_device_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++ end interface
++
++ interface acc_update_self
++ subroutine acc_update_self_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_update_self_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_update_self_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++ end interface
++
++ ! acc_map_data: Only available in C/C++
++ ! acc_unmap_data: Only available in C/C++
++ ! acc_deviceptr: Only available in C/C++
++ ! acc_ostptr: Only available in C/C++
++
++ interface acc_is_present
++ function acc_is_present_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ logical acc_is_present_32_h
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end function
++
++ function acc_is_present_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ logical acc_is_present_64_h
++ !GCC$ ATTRIBUTES NO_ARG_CHECK :: a
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end function
++
++ function acc_is_present_array_h (a)
++ logical acc_is_present_array_h
++ type (*), dimension (..), contiguous :: a
++ end function
++ end interface
++
++ ! acc_memcpy_to_device: Only available in C/C++
++ ! acc_memcpy_from_device: Only available in C/C++
+--- libgomp/gomp-constants.h.jj 2016-07-14 16:02:47.212545826 +0200
++++ libgomp/gomp-constants.h 2016-05-26 21:04:40.000000000 +0200
+@@ -0,0 +1,259 @@
++/* Communication between GCC and libgomp.
++
++ Copyright (C) 2014-2015 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++#ifndef GOMP_CONSTANTS_H
++#define GOMP_CONSTANTS_H 1
++
++/* Memory mapping types. */
++
++/* One byte. */
++#define GOMP_MAP_LAST (1 << 8)
++
++#define GOMP_MAP_FLAG_TO (1 << 0)
++#define GOMP_MAP_FLAG_FROM (1 << 1)
++/* Special map kinds, enumerated starting here. */
++#define GOMP_MAP_FLAG_SPECIAL_0 (1 << 2)
++#define GOMP_MAP_FLAG_SPECIAL_1 (1 << 3)
++#define GOMP_MAP_FLAG_SPECIAL_2 (1 << 4)
++#define GOMP_MAP_FLAG_SPECIAL (GOMP_MAP_FLAG_SPECIAL_1 \
++ | GOMP_MAP_FLAG_SPECIAL_0)
++/* Flag to force a specific behavior (or else, trigger a run-time error). */
++#define GOMP_MAP_FLAG_FORCE (1 << 7)
++
++enum gomp_map_kind
++ {
++ /* If not already present, allocate. */
++ GOMP_MAP_ALLOC = 0,
++ /* ..., and copy to device. */
++ GOMP_MAP_TO = (GOMP_MAP_ALLOC | GOMP_MAP_FLAG_TO),
++ /* ..., and copy from device. */
++ GOMP_MAP_FROM = (GOMP_MAP_ALLOC | GOMP_MAP_FLAG_FROM),
++ /* ..., and copy to and from device. */
++ GOMP_MAP_TOFROM = (GOMP_MAP_TO | GOMP_MAP_FROM),
++ /* The following kind is an internal only map kind, used for pointer based
++ array sections. OMP_CLAUSE_SIZE for these is not the pointer size,
++ which is implicitly POINTER_SIZE_UNITS, but the bias. */
++ GOMP_MAP_POINTER = (GOMP_MAP_FLAG_SPECIAL_0 | 0),
++ /* Also internal, behaves like GOMP_MAP_TO, but additionally any
++ GOMP_MAP_POINTER records consecutive after it which have addresses
++ falling into that range will not be ignored if GOMP_MAP_TO_PSET wasn't
++ mapped already. */
++ GOMP_MAP_TO_PSET = (GOMP_MAP_FLAG_SPECIAL_0 | 1),
++ /* Must already be present. */
++ GOMP_MAP_FORCE_PRESENT = (GOMP_MAP_FLAG_SPECIAL_0 | 2),
++ /* Deallocate a mapping, without copying from device. */
++ GOMP_MAP_DELETE = (GOMP_MAP_FLAG_SPECIAL_0 | 3),
++ /* Is a device pointer. OMP_CLAUSE_SIZE for these is unused; is implicitly
++ POINTER_SIZE_UNITS. */
++ GOMP_MAP_FORCE_DEVICEPTR = (GOMP_MAP_FLAG_SPECIAL_1 | 0),
++ /* Do not map, copy bits for firstprivate instead. */
++ /* OpenACC device_resident. */
++ GOMP_MAP_DEVICE_RESIDENT = (GOMP_MAP_FLAG_SPECIAL_1 | 1),
++ /* OpenACC link. */
++ GOMP_MAP_LINK = (GOMP_MAP_FLAG_SPECIAL_1 | 2),
++ /* Allocate. */
++ GOMP_MAP_FIRSTPRIVATE = (GOMP_MAP_FLAG_SPECIAL | 0),
++ /* Similarly, but store the value in the pointer rather than
++ pointed by the pointer. */
++ GOMP_MAP_FIRSTPRIVATE_INT = (GOMP_MAP_FLAG_SPECIAL | 1),
++ /* Pointer translate host address into device address and copy that
++ back to host. */
++ GOMP_MAP_USE_DEVICE_PTR = (GOMP_MAP_FLAG_SPECIAL | 2),
++ /* Allocate a zero length array section. Prefer next non-zero length
++ mapping over previous non-zero length mapping over zero length mapping
++ at the address. If not already mapped, do nothing (and pointer translate
++ to NULL). */
++ GOMP_MAP_ZERO_LEN_ARRAY_SECTION = (GOMP_MAP_FLAG_SPECIAL | 3),
++ /* Allocate. */
++ GOMP_MAP_FORCE_ALLOC = (GOMP_MAP_FLAG_FORCE | GOMP_MAP_ALLOC),
++ /* ..., and copy to device. */
++ GOMP_MAP_FORCE_TO = (GOMP_MAP_FLAG_FORCE | GOMP_MAP_TO),
++ /* ..., and copy from device. */
++ GOMP_MAP_FORCE_FROM = (GOMP_MAP_FLAG_FORCE | GOMP_MAP_FROM),
++ /* ..., and copy to and from device. */
++ GOMP_MAP_FORCE_TOFROM = (GOMP_MAP_FLAG_FORCE | GOMP_MAP_TOFROM),
++ /* If not already present, allocate. And unconditionally copy to
++ device. */
++ GOMP_MAP_ALWAYS_TO = (GOMP_MAP_FLAG_SPECIAL_2 | GOMP_MAP_TO),
++ /* If not already present, allocate. And unconditionally copy from
++ device. */
++ GOMP_MAP_ALWAYS_FROM = (GOMP_MAP_FLAG_SPECIAL_2
++ | GOMP_MAP_FROM),
++ /* If not already present, allocate. And unconditionally copy to and from
++ device. */
++ GOMP_MAP_ALWAYS_TOFROM = (GOMP_MAP_FLAG_SPECIAL_2
++ | GOMP_MAP_TOFROM),
++ /* Map a sparse struct; the address is the base of the structure, alignment
++ it's required alignment, and size is the number of adjacent entries
++ that belong to the struct. The adjacent entries should be sorted by
++ increasing address, so it is easy to determine lowest needed address
++ (address of the first adjacent entry) and highest needed address
++ (address of the last adjacent entry plus its size). */
++ GOMP_MAP_STRUCT = (GOMP_MAP_FLAG_SPECIAL_2
++ | GOMP_MAP_FLAG_SPECIAL | 0),
++ /* On a location of a pointer/reference that is assumed to be already mapped
++ earlier, store the translated address of the preceeding mapping.
++ No refcount is bumped by this, and the store is done unconditionally. */
++ GOMP_MAP_ALWAYS_POINTER = (GOMP_MAP_FLAG_SPECIAL_2
++ | GOMP_MAP_FLAG_SPECIAL | 1),
++ /* Forced deallocation of zero length array section. */
++ GOMP_MAP_DELETE_ZERO_LEN_ARRAY_SECTION
++ = (GOMP_MAP_FLAG_SPECIAL_2
++ | GOMP_MAP_FLAG_SPECIAL | 3),
++ /* Decrement usage count and deallocate if zero. */
++ GOMP_MAP_RELEASE = (GOMP_MAP_FLAG_SPECIAL_2
++ | GOMP_MAP_DELETE),
++
++ /* Internal to GCC, not used in libgomp. */
++ /* Do not map, but pointer assign a pointer instead. */
++ GOMP_MAP_FIRSTPRIVATE_POINTER = (GOMP_MAP_LAST | 1),
++ /* Do not map, but pointer assign a reference instead. */
++ GOMP_MAP_FIRSTPRIVATE_REFERENCE = (GOMP_MAP_LAST | 2)
++ };
++
++#define GOMP_MAP_COPY_TO_P(X) \
++ (!((X) & GOMP_MAP_FLAG_SPECIAL) \
++ && ((X) & GOMP_MAP_FLAG_TO))
++
++#define GOMP_MAP_COPY_FROM_P(X) \
++ (!((X) & GOMP_MAP_FLAG_SPECIAL) \
++ && ((X) & GOMP_MAP_FLAG_FROM))
++
++#define GOMP_MAP_POINTER_P(X) \
++ ((X) == GOMP_MAP_POINTER)
++
++#define GOMP_MAP_ALWAYS_TO_P(X) \
++ (((X) == GOMP_MAP_ALWAYS_TO) || ((X) == GOMP_MAP_ALWAYS_TOFROM))
++
++#define GOMP_MAP_ALWAYS_FROM_P(X) \
++ (((X) == GOMP_MAP_ALWAYS_FROM) || ((X) == GOMP_MAP_ALWAYS_TOFROM))
++
++#define GOMP_MAP_ALWAYS_P(X) \
++ (GOMP_MAP_ALWAYS_TO_P (X) || ((X) == GOMP_MAP_ALWAYS_FROM))
++
++
++/* Asynchronous behavior. Keep in sync with
++ libgomp/{openacc.h,openacc.f90,openacc_lib.h}:acc_async_t. */
++
++#define GOMP_ASYNC_NOVAL -1
++#define GOMP_ASYNC_SYNC -2
++
++
++/* Device codes. Keep in sync with
++ libgomp/{openacc.h,openacc.f90,openacc_lib.h}:acc_device_t as well as
++ libgomp/libgomp-plugin.h. */
++#define GOMP_DEVICE_NONE 0
++#define GOMP_DEVICE_DEFAULT 1
++#define GOMP_DEVICE_HOST 2
++/* #define GOMP_DEVICE_HOST_NONSHM 3 removed. */
++#define GOMP_DEVICE_NOT_HOST 4
++#define GOMP_DEVICE_NVIDIA_PTX 5
++#define GOMP_DEVICE_INTEL_MIC 6
++#define GOMP_DEVICE_HSA 7
++
++#define GOMP_DEVICE_ICV -1
++#define GOMP_DEVICE_HOST_FALLBACK -2
++
++/* GOMP_task/GOMP_taskloop* flags argument. */
++#define GOMP_TASK_FLAG_UNTIED (1 << 0)
++#define GOMP_TASK_FLAG_FINAL (1 << 1)
++#define GOMP_TASK_FLAG_MERGEABLE (1 << 2)
++#define GOMP_TASK_FLAG_DEPEND (1 << 3)
++#define GOMP_TASK_FLAG_PRIORITY (1 << 4)
++#define GOMP_TASK_FLAG_UP (1 << 8)
++#define GOMP_TASK_FLAG_GRAINSIZE (1 << 9)
++#define GOMP_TASK_FLAG_IF (1 << 10)
++#define GOMP_TASK_FLAG_NOGROUP (1 << 11)
++
++/* GOMP_target{_ext,update_ext,enter_exit_data} flags argument. */
++#define GOMP_TARGET_FLAG_NOWAIT (1 << 0)
++#define GOMP_TARGET_FLAG_EXIT_DATA (1 << 1)
++/* Internal to libgomp. */
++#define GOMP_TARGET_FLAG_UPDATE (1U << 31)
++
++/* Versions of libgomp and device-specific plugins. GOMP_VERSION
++ should be incremented whenever an ABI-incompatible change is introduced
++ to the plugin interface defined in libgomp/libgomp.h. */
++#define GOMP_VERSION 1
++#define GOMP_VERSION_NVIDIA_PTX 1
++#define GOMP_VERSION_INTEL_MIC 0
++#define GOMP_VERSION_HSA 0
++
++#define GOMP_VERSION_PACK(LIB, DEV) (((LIB) << 16) | (DEV))
++#define GOMP_VERSION_LIB(PACK) (((PACK) >> 16) & 0xffff)
++#define GOMP_VERSION_DEV(PACK) ((PACK) & 0xffff)
++
++#define GOMP_DIM_GANG 0
++#define GOMP_DIM_WORKER 1
++#define GOMP_DIM_VECTOR 2
++#define GOMP_DIM_MAX 3
++#define GOMP_DIM_MASK(X) (1u << (X))
++
++/* Varadic launch arguments. End of list is marked by a zero. */
++#define GOMP_LAUNCH_DIM 1 /* Launch dimensions, op = mask */
++#define GOMP_LAUNCH_ASYNC 2 /* Async, op = cst val if not MAX */
++#define GOMP_LAUNCH_WAIT 3 /* Waits, op = num waits. */
++#define GOMP_LAUNCH_CODE_SHIFT 28
++#define GOMP_LAUNCH_DEVICE_SHIFT 16
++#define GOMP_LAUNCH_OP_SHIFT 0
++#define GOMP_LAUNCH_PACK(CODE,DEVICE,OP) \
++ (((CODE) << GOMP_LAUNCH_CODE_SHIFT) \
++ | ((DEVICE) << GOMP_LAUNCH_DEVICE_SHIFT) \
++ | ((OP) << GOMP_LAUNCH_OP_SHIFT))
++#define GOMP_LAUNCH_CODE(X) (((X) >> GOMP_LAUNCH_CODE_SHIFT) & 0xf)
++#define GOMP_LAUNCH_DEVICE(X) (((X) >> GOMP_LAUNCH_DEVICE_SHIFT) & 0xfff)
++#define GOMP_LAUNCH_OP(X) (((X) >> GOMP_LAUNCH_OP_SHIFT) & 0xffff)
++#define GOMP_LAUNCH_OP_MAX 0xffff
++
++/* Bitmask to apply in order to find out the intended device of a target
++ argument. */
++#define GOMP_TARGET_ARG_DEVICE_MASK ((1 << 7) - 1)
++/* The target argument is significant for all devices. */
++#define GOMP_TARGET_ARG_DEVICE_ALL 0
++
++/* Flag set when the subsequent element in the device-specific argument
++ values. */
++#define GOMP_TARGET_ARG_SUBSEQUENT_PARAM (1 << 7)
++
++/* Bitmask to apply to a target argument to find out the value identifier. */
++#define GOMP_TARGET_ARG_ID_MASK (((1 << 8) - 1) << 8)
++/* Target argument index of NUM_TEAMS. */
++#define GOMP_TARGET_ARG_NUM_TEAMS (1 << 8)
++/* Target argument index of THREAD_LIMIT. */
++#define GOMP_TARGET_ARG_THREAD_LIMIT (2 << 8)
++
++/* If the value is directly embeded in target argument, it should be a 16-bit
++ at most and shifted by this many bits. */
++#define GOMP_TARGET_ARG_VALUE_SHIFT 16
++
++/* HSA specific data structures. */
++
++/* Identifiers of device-specific target arguments. */
++#define GOMP_TARGET_ARG_HSA_KERNEL_ATTRIBUTES (1 << 8)
++
++#endif
+--- libgomp/oacc-mem.c.jj 2016-07-13 16:57:04.433535385 +0200
++++ libgomp/oacc-mem.c 2016-07-14 15:39:44.644631308 +0200
+@@ -0,0 +1,204 @@
++/* OpenACC Runtime initialization routines
++
++ Copyright (C) 2013-2016 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++#include "openacc.h"
++#include "config.h"
++#include "libgomp.h"
++#include "gomp-constants.h"
++#include "oacc-int.h"
++#include
++#include
++#include
++
++/* OpenACC is silent on how memory exhaustion is indicated. We return
++ NULL. */
++
++void *
++acc_malloc (size_t s)
++{
++ if (!s)
++ return NULL;
++
++ goacc_lazy_initialize ();
++ return malloc (s);
++}
++
++/* OpenACC 2.0a (3.2.16) doesn't specify what to do in the event
++ the device address is mapped. We choose to check if it mapped,
++ and if it is, to unmap it. */
++void
++acc_free (void *d)
++{
++ return free (d);
++}
++
++void
++acc_memcpy_to_device (void *d, void *h, size_t s)
++{
++ memmove (d, h, s);
++}
++
++void
++acc_memcpy_from_device (void *h, void *d, size_t s)
++{
++ memmove (h, d, s);
++}
++
++/* Return the device pointer that corresponds to host data H. Or NULL
++ if no mapping. */
++
++void *
++acc_deviceptr (void *h)
++{
++ goacc_lazy_initialize ();
++ return h;
++}
++
++/* Return the host pointer that corresponds to device data D. Or NULL
++ if no mapping. */
++
++void *
++acc_hostptr (void *d)
++{
++ goacc_lazy_initialize ();
++ return d;
++}
++
++/* Return 1 if host data [H,+S] is present on the device. */
++
++int
++acc_is_present (void *h, size_t s)
++{
++ if (!s || !h)
++ return 0;
++
++ goacc_lazy_initialize ();
++ return h != NULL;
++}
++
++/* Create a mapping for host [H,+S] -> device [D,+S] */
++
++void
++acc_map_data (void *h, void *d, size_t s)
++{
++ goacc_lazy_initialize ();
++
++ if (d != h)
++ gomp_fatal ("cannot map data on shared-memory system");
++}
++
++void
++acc_unmap_data (void *h)
++{
++}
++
++#define FLAG_PRESENT (1 << 0)
++#define FLAG_CREATE (1 << 1)
++#define FLAG_COPY (1 << 2)
++
++static void *
++present_create_copy (unsigned f, void *h, size_t s)
++{
++ if (!h || !s)
++ gomp_fatal ("[%p,+%d] is a bad range", (void *)h, (int)s);
++
++ goacc_lazy_initialize ();
++ return h;
++}
++
++void *
++acc_create (void *h, size_t s)
++{
++ return present_create_copy (FLAG_CREATE, h, s);
++}
++
++void *
++acc_copyin (void *h, size_t s)
++{
++ return present_create_copy (FLAG_CREATE | FLAG_COPY, h, s);
++}
++
++void *
++acc_present_or_create (void *h, size_t s)
++{
++ return present_create_copy (FLAG_PRESENT | FLAG_CREATE, h, s);
++}
++
++void *
++acc_present_or_copyin (void *h, size_t s)
++{
++ return present_create_copy (FLAG_PRESENT | FLAG_CREATE | FLAG_COPY, h, s);
++}
++
++#define FLAG_COPYOUT (1 << 0)
++
++static void
++delete_copyout (unsigned f, void *h, size_t s, const char *libfnname)
++{
++}
++
++void
++acc_delete (void *h , size_t s)
++{
++ delete_copyout (0, h, s, __FUNCTION__);
++}
++
++void
++acc_copyout (void *h, size_t s)
++{
++ delete_copyout (FLAG_COPYOUT, h, s, __FUNCTION__);
++}
++
++static void
++update_dev_host (int is_dev, void *h, size_t s)
++{
++ goacc_lazy_initialize ();
++}
++
++void
++acc_update_device (void *h, size_t s)
++{
++ update_dev_host (1, h, s);
++}
++
++void
++acc_update_self (void *h, size_t s)
++{
++ update_dev_host (0, h, s);
++}
++
++void
++gomp_acc_insert_pointer (size_t mapnum, void **hostaddrs, size_t *sizes,
++ void *kinds)
++{
++}
++
++void
++gomp_acc_remove_pointer (void *h, bool force_copyfrom, int async, int mapnum)
++{
++}
+--- libgomp/oacc-plugin.h.jj 2016-07-13 16:57:13.487423121 +0200
++++ libgomp/oacc-plugin.h 2016-07-13 16:57:13.487423121 +0200
+@@ -0,0 +1,33 @@
++/* Copyright (C) 2014-2016 Free Software Foundation, Inc.
++
++ Contributed by Mentor Embedded.
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++#ifndef OACC_PLUGIN_H
++#define OACC_PLUGIN_H 1
++
++extern void GOMP_PLUGIN_async_unmap_vars (void *, int);
++extern void *GOMP_PLUGIN_acc_thread (void);
++
++#endif
+--- libgomp/taskloop.c.jj 2016-07-13 16:57:18.935355570 +0200
++++ libgomp/taskloop.c 2016-07-13 16:57:18.935355570 +0200
+@@ -0,0 +1,340 @@
++/* Copyright (C) 2015-2016 Free Software Foundation, Inc.
++ Contributed by Jakub Jelinek .
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++/* This file handles the taskloop construct. It is included twice, once
++ for the long and once for unsigned long long variant. */
++
++/* Called when encountering an explicit task directive. If IF_CLAUSE is
++ false, then we must not delay in executing the task. If UNTIED is true,
++ then the task may be executed by any member of the team. */
++
++void
++GOMP_taskloop (void (*fn) (void *), void *data, void (*cpyfn) (void *, void *),
++ long arg_size, long arg_align, unsigned flags,
++ unsigned long num_tasks, int priority,
++ TYPE start, TYPE end, TYPE step)
++{
++ struct gomp_thread *thr = gomp_thread ();
++ struct gomp_team *team = thr->ts.team;
++
++#ifdef HAVE_BROKEN_POSIX_SEMAPHORES
++ /* If pthread_mutex_* is used for omp_*lock*, then each task must be
++ tied to one thread all the time. This means UNTIED tasks must be
++ tied and if CPYFN is non-NULL IF(0) must be forced, as CPYFN
++ might be running on different thread than FN. */
++ if (cpyfn)
++ flags &= ~GOMP_TASK_FLAG_IF;
++ flags &= ~GOMP_TASK_FLAG_UNTIED;
++#endif
++
++ /* If parallel or taskgroup has been cancelled, don't start new tasks. */
++ if (team && gomp_team_barrier_cancelled (&team->barrier))
++ return;
++
++#ifdef TYPE_is_long
++ TYPE s = step;
++ if (step > 0)
++ {
++ if (start >= end)
++ return;
++ s--;
++ }
++ else
++ {
++ if (start <= end)
++ return;
++ s++;
++ }
++ UTYPE n = (end - start + s) / step;
++#else
++ UTYPE n;
++ if (flags & GOMP_TASK_FLAG_UP)
++ {
++ if (start >= end)
++ return;
++ n = (end - start + step - 1) / step;
++ }
++ else
++ {
++ if (start <= end)
++ return;
++ n = (start - end - step - 1) / -step;
++ }
++#endif
++
++ TYPE task_step = step;
++ unsigned long nfirst = n;
++ if (flags & GOMP_TASK_FLAG_GRAINSIZE)
++ {
++ unsigned long grainsize = num_tasks;
++#ifdef TYPE_is_long
++ num_tasks = n / grainsize;
++#else
++ UTYPE ndiv = n / grainsize;
++ num_tasks = ndiv;
++ if (num_tasks != ndiv)
++ num_tasks = ~0UL;
++#endif
++ if (num_tasks <= 1)
++ {
++ num_tasks = 1;
++ task_step = end - start;
++ }
++ else if (num_tasks >= grainsize
++#ifndef TYPE_is_long
++ && num_tasks != ~0UL
++#endif
++ )
++ {
++ UTYPE mul = num_tasks * grainsize;
++ task_step = (TYPE) grainsize * step;
++ if (mul != n)
++ {
++ task_step += step;
++ nfirst = n - mul - 1;
++ }
++ }
++ else
++ {
++ UTYPE div = n / num_tasks;
++ UTYPE mod = n % num_tasks;
++ task_step = (TYPE) div * step;
++ if (mod)
++ {
++ task_step += step;
++ nfirst = mod - 1;
++ }
++ }
++ }
++ else
++ {
++ if (num_tasks == 0)
++ num_tasks = team ? team->nthreads : 1;
++ if (num_tasks >= n)
++ num_tasks = n;
++ else
++ {
++ UTYPE div = n / num_tasks;
++ UTYPE mod = n % num_tasks;
++ task_step = (TYPE) div * step;
++ if (mod)
++ {
++ task_step += step;
++ nfirst = mod - 1;
++ }
++ }
++ }
++
++ if (flags & GOMP_TASK_FLAG_NOGROUP)
++ {
++ if (thr->task && thr->task->taskgroup && thr->task->taskgroup->cancelled)
++ return;
++ }
++ else
++ ialias_call (GOMP_taskgroup_start) ();
++
++ if (priority > gomp_max_task_priority_var)
++ priority = gomp_max_task_priority_var;
++
++ if ((flags & GOMP_TASK_FLAG_IF) == 0 || team == NULL
++ || (thr->task && thr->task->final_task)
++ || team->task_count + num_tasks > 64 * team->nthreads)
++ {
++ unsigned long i;
++ if (__builtin_expect (cpyfn != NULL, 0))
++ {
++ struct gomp_task task[num_tasks];
++ struct gomp_task *parent = thr->task;
++ arg_size = (arg_size + arg_align - 1) & ~(arg_align - 1);
++ char buf[num_tasks * arg_size + arg_align - 1];
++ char *arg = (char *) (((uintptr_t) buf + arg_align - 1)
++ & ~(uintptr_t) (arg_align - 1));
++ char *orig_arg = arg;
++ for (i = 0; i < num_tasks; i++)
++ {
++ gomp_init_task (&task[i], parent, gomp_icv (false));
++ task[i].priority = priority;
++ task[i].kind = GOMP_TASK_UNDEFERRED;
++ task[i].final_task = (thr->task && thr->task->final_task)
++ || (flags & GOMP_TASK_FLAG_FINAL);
++ if (thr->task)
++ {
++ task[i].in_tied_task = thr->task->in_tied_task;
++ task[i].taskgroup = thr->task->taskgroup;
++ }
++ thr->task = &task[i];
++ cpyfn (arg, data);
++ arg += arg_size;
++ }
++ arg = orig_arg;
++ for (i = 0; i < num_tasks; i++)
++ {
++ thr->task = &task[i];
++ ((TYPE *)arg)[0] = start;
++ start += task_step;
++ ((TYPE *)arg)[1] = start;
++ if (i == nfirst)
++ task_step -= step;
++ fn (arg);
++ arg += arg_size;
++ if (!priority_queue_empty_p (&task[i].children_queue,
++ MEMMODEL_RELAXED))
++ {
++ gomp_mutex_lock (&team->task_lock);
++ gomp_clear_parent (&task[i].children_queue);
++ gomp_mutex_unlock (&team->task_lock);
++ }
++ gomp_end_task ();
++ }
++ }
++ else
++ for (i = 0; i < num_tasks; i++)
++ {
++ struct gomp_task task;
++
++ gomp_init_task (&task, thr->task, gomp_icv (false));
++ task.priority = priority;
++ task.kind = GOMP_TASK_UNDEFERRED;
++ task.final_task = (thr->task && thr->task->final_task)
++ || (flags & GOMP_TASK_FLAG_FINAL);
++ if (thr->task)
++ {
++ task.in_tied_task = thr->task->in_tied_task;
++ task.taskgroup = thr->task->taskgroup;
++ }
++ thr->task = &task;
++ ((TYPE *)data)[0] = start;
++ start += task_step;
++ ((TYPE *)data)[1] = start;
++ if (i == nfirst)
++ task_step -= step;
++ fn (data);
++ if (!priority_queue_empty_p (&task.children_queue,
++ MEMMODEL_RELAXED))
++ {
++ gomp_mutex_lock (&team->task_lock);
++ gomp_clear_parent (&task.children_queue);
++ gomp_mutex_unlock (&team->task_lock);
++ }
++ gomp_end_task ();
++ }
++ }
++ else
++ {
++ struct gomp_task *tasks[num_tasks];
++ struct gomp_task *parent = thr->task;
++ struct gomp_taskgroup *taskgroup = parent->taskgroup;
++ char *arg;
++ int do_wake;
++ unsigned long i;
++
++ for (i = 0; i < num_tasks; i++)
++ {
++ struct gomp_task *task
++ = gomp_malloc (sizeof (*task) + arg_size + arg_align - 1);
++ tasks[i] = task;
++ arg = (char *) (((uintptr_t) (task + 1) + arg_align - 1)
++ & ~(uintptr_t) (arg_align - 1));
++ gomp_init_task (task, parent, gomp_icv (false));
++ task->priority = priority;
++ task->kind = GOMP_TASK_UNDEFERRED;
++ task->in_tied_task = parent->in_tied_task;
++ task->taskgroup = taskgroup;
++ thr->task = task;
++ if (cpyfn)
++ {
++ cpyfn (arg, data);
++ task->copy_ctors_done = true;
++ }
++ else
++ memcpy (arg, data, arg_size);
++ ((TYPE *)arg)[0] = start;
++ start += task_step;
++ ((TYPE *)arg)[1] = start;
++ if (i == nfirst)
++ task_step -= step;
++ thr->task = parent;
++ task->kind = GOMP_TASK_WAITING;
++ task->fn = fn;
++ task->fn_data = arg;
++ task->final_task = (flags & GOMP_TASK_FLAG_FINAL) >> 1;
++ }
++ gomp_mutex_lock (&team->task_lock);
++ /* If parallel or taskgroup has been cancelled, don't start new
++ tasks. */
++ if (__builtin_expect ((gomp_team_barrier_cancelled (&team->barrier)
++ || (taskgroup && taskgroup->cancelled))
++ && cpyfn == NULL, 0))
++ {
++ gomp_mutex_unlock (&team->task_lock);
++ for (i = 0; i < num_tasks; i++)
++ {
++ gomp_finish_task (tasks[i]);
++ free (tasks[i]);
++ }
++ if ((flags & GOMP_TASK_FLAG_NOGROUP) == 0)
++ ialias_call (GOMP_taskgroup_end) ();
++ return;
++ }
++ if (taskgroup)
++ taskgroup->num_children += num_tasks;
++ for (i = 0; i < num_tasks; i++)
++ {
++ struct gomp_task *task = tasks[i];
++ priority_queue_insert (PQ_CHILDREN, &parent->children_queue,
++ task, priority,
++ PRIORITY_INSERT_BEGIN,
++ /*last_parent_depends_on=*/false,
++ task->parent_depends_on);
++ if (taskgroup)
++ priority_queue_insert (PQ_TASKGROUP, &taskgroup->taskgroup_queue,
++ task, priority, PRIORITY_INSERT_BEGIN,
++ /*last_parent_depends_on=*/false,
++ task->parent_depends_on);
++ priority_queue_insert (PQ_TEAM, &team->task_queue, task, priority,
++ PRIORITY_INSERT_END,
++ /*last_parent_depends_on=*/false,
++ task->parent_depends_on);
++ ++team->task_count;
++ ++team->task_queued_count;
++ }
++ gomp_team_barrier_set_task_pending (&team->barrier);
++ if (team->task_running_count + !parent->in_tied_task
++ < team->nthreads)
++ {
++ do_wake = team->nthreads - team->task_running_count
++ - !parent->in_tied_task;
++ if ((unsigned long) do_wake > num_tasks)
++ do_wake = num_tasks;
++ }
++ else
++ do_wake = 0;
++ gomp_mutex_unlock (&team->task_lock);
++ if (do_wake)
++ gomp_team_barrier_wake (&team->barrier, do_wake);
++ }
++ if ((flags & GOMP_TASK_FLAG_NOGROUP) == 0)
++ ialias_call (GOMP_taskgroup_end) ();
++}
+--- libgomp/priority_queue.h.jj 2016-07-13 16:57:04.438535323 +0200
++++ libgomp/priority_queue.h 2016-07-13 16:57:04.438535323 +0200
+@@ -0,0 +1,485 @@
++/* Copyright (C) 2015-2016 Free Software Foundation, Inc.
++ Contributed by Aldy Hernandez .
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++/* Header file for a priority queue of GOMP tasks. */
++
++/* ?? Perhaps all the priority_tree_* functions are complex and rare
++ enough to go out-of-line and be moved to priority_queue.c. ?? */
++
++#ifndef _PRIORITY_QUEUE_H_
++#define _PRIORITY_QUEUE_H_
++
++/* One task. */
++
++struct priority_node
++{
++ /* Next and previous chains in a circular doubly linked list for
++ tasks within this task's priority. */
++ struct priority_node *next, *prev;
++};
++
++/* All tasks within the same priority. */
++
++struct priority_list
++{
++ /* Priority of the tasks in this set. */
++ int priority;
++
++ /* Tasks. */
++ struct priority_node *tasks;
++
++ /* This points to the last of the higher priority WAITING tasks.
++ Remember that for the children queue, we have:
++
++ parent_depends_on WAITING tasks.
++ !parent_depends_on WAITING tasks.
++ TIED tasks.
++
++ This is a pointer to the last of the parent_depends_on WAITING
++ tasks which are essentially, higher priority items within their
++ priority. */
++ struct priority_node *last_parent_depends_on;
++};
++
++/* Another splay tree instantiation, for priority_list's. */
++typedef struct prio_splay_tree_node_s *prio_splay_tree_node;
++typedef struct prio_splay_tree_s *prio_splay_tree;
++typedef struct prio_splay_tree_key_s *prio_splay_tree_key;
++struct prio_splay_tree_key_s {
++ /* This structure must only containing a priority_list, as we cast
++ prio_splay_tree_key to priority_list throughout. */
++ struct priority_list l;
++};
++#define splay_tree_prefix prio
++#include "splay-tree.h"
++
++/* The entry point into a priority queue of tasks.
++
++ There are two alternate implementations with which to store tasks:
++ as a balanced tree of sorts, or as a simple list of tasks. If
++ there are only priority-0 items (ROOT is NULL), we use the simple
++ list, otherwise (ROOT is non-NULL) we use the tree. */
++
++struct priority_queue
++{
++ /* If t.root != NULL, this is a splay tree of priority_lists to hold
++ all tasks. This is only used if multiple priorities are in play,
++ otherwise we use the priority_list `l' below to hold all
++ (priority-0) tasks. */
++ struct prio_splay_tree_s t;
++
++ /* If T above is NULL, only priority-0 items exist, so keep them
++ in a simple list. */
++ struct priority_list l;
++};
++
++enum priority_insert_type {
++ /* Insert at the beginning of a priority list. */
++ PRIORITY_INSERT_BEGIN,
++ /* Insert at the end of a priority list. */
++ PRIORITY_INSERT_END
++};
++
++/* Used to determine in which queue a given priority node belongs in.
++ See pnode field of gomp_task. */
++
++enum priority_queue_type
++{
++ PQ_TEAM, /* Node belongs in gomp_team's task_queue. */
++ PQ_CHILDREN, /* Node belongs in parent's children_queue. */
++ PQ_TASKGROUP, /* Node belongs in taskgroup->taskgroup_queue. */
++ PQ_IGNORED = 999
++};
++
++/* Priority queue implementation prototypes. */
++
++extern bool priority_queue_task_in_queue_p (enum priority_queue_type,
++ struct priority_queue *,
++ struct gomp_task *);
++extern void priority_queue_dump (enum priority_queue_type,
++ struct priority_queue *);
++extern void priority_queue_verify (enum priority_queue_type,
++ struct priority_queue *, bool);
++extern void priority_tree_remove (enum priority_queue_type,
++ struct priority_queue *,
++ struct priority_node *);
++extern struct gomp_task *priority_tree_next_task (enum priority_queue_type,
++ struct priority_queue *,
++ enum priority_queue_type,
++ struct priority_queue *,
++ bool *);
++
++/* Return TRUE if there is more than one priority in HEAD. This is
++ used throughout to to choose between the fast path (priority 0 only
++ items) and a world with multiple priorities. */
++
++static inline bool
++priority_queue_multi_p (struct priority_queue *head)
++{
++ return __builtin_expect (head->t.root != NULL, 0);
++}
++
++/* Initialize a priority queue. */
++
++static inline void
++priority_queue_init (struct priority_queue *head)
++{
++ head->t.root = NULL;
++ /* To save a few microseconds, we don't initialize head->l.priority
++ to 0 here. It is implied that priority will be 0 if head->t.root
++ == NULL.
++
++ priority_tree_insert() will fix this when we encounter multiple
++ priorities. */
++ head->l.tasks = NULL;
++ head->l.last_parent_depends_on = NULL;
++}
++
++static inline void
++priority_queue_free (struct priority_queue *head)
++{
++ /* There's nothing to do, as tasks were freed as they were removed
++ in priority_queue_remove. */
++}
++
++/* Forward declarations. */
++static inline size_t priority_queue_offset (enum priority_queue_type);
++static inline struct gomp_task *priority_node_to_task
++ (enum priority_queue_type,
++ struct priority_node *);
++static inline struct priority_node *task_to_priority_node
++ (enum priority_queue_type,
++ struct gomp_task *);
++
++/* Return TRUE if priority queue HEAD is empty.
++
++ MODEL IS MEMMODEL_ACQUIRE if we should use an acquire atomic to
++ read from the root of the queue, otherwise MEMMODEL_RELAXED if we
++ should use a plain load. */
++
++static inline _Bool
++priority_queue_empty_p (struct priority_queue *head, enum memmodel model)
++{
++ /* Note: The acquire barriers on the loads here synchronize with
++ the write of a NULL in gomp_task_run_post_remove_parent. It is
++ not necessary that we synchronize with other non-NULL writes at
++ this point, but we must ensure that all writes to memory by a
++ child thread task work function are seen before we exit from
++ GOMP_taskwait. */
++ if (priority_queue_multi_p (head))
++ {
++ if (model == MEMMODEL_ACQUIRE)
++ return __atomic_load_n (&head->t.root, MEMMODEL_ACQUIRE) == NULL;
++ return head->t.root == NULL;
++ }
++ if (model == MEMMODEL_ACQUIRE)
++ return __atomic_load_n (&head->l.tasks, MEMMODEL_ACQUIRE) == NULL;
++ return head->l.tasks == NULL;
++}
++
++/* Look for a given PRIORITY in HEAD. Return it if found, otherwise
++ return NULL. This only applies to the tree variant in HEAD. There
++ is no point in searching for priorities in HEAD->L. */
++
++static inline struct priority_list *
++priority_queue_lookup_priority (struct priority_queue *head, int priority)
++{
++ if (head->t.root == NULL)
++ return NULL;
++ struct prio_splay_tree_key_s k;
++ k.l.priority = priority;
++ return (struct priority_list *)
++ prio_splay_tree_lookup (&head->t, &k);
++}
++
++/* Insert task in DATA, with PRIORITY, in the priority list in LIST.
++ LIST contains items of type TYPE.
++
++ If POS is PRIORITY_INSERT_BEGIN, the new task is inserted at the
++ top of its respective priority. If POS is PRIORITY_INSERT_END, the
++ task is inserted at the end of its priority.
++
++ If ADJUST_PARENT_DEPENDS_ON is TRUE, LIST is a children queue, and
++ we must keep track of higher and lower priority WAITING tasks by
++ keeping the queue's last_parent_depends_on field accurate. This
++ only applies to the children queue, and the caller must ensure LIST
++ is a children queue in this case.
++
++ If ADJUST_PARENT_DEPENDS_ON is TRUE, TASK_IS_PARENT_DEPENDS_ON is
++ set to the task's parent_depends_on field. If
++ ADJUST_PARENT_DEPENDS_ON is FALSE, this field is irrelevant.
++
++ Return the new priority_node. */
++
++static inline void
++priority_list_insert (enum priority_queue_type type,
++ struct priority_list *list,
++ struct gomp_task *task,
++ int priority,
++ enum priority_insert_type pos,
++ bool adjust_parent_depends_on,
++ bool task_is_parent_depends_on)
++{
++ struct priority_node *node = task_to_priority_node (type, task);
++ if (list->tasks)
++ {
++ /* If we are keeping track of higher/lower priority items,
++ but this is a lower priority WAITING task
++ (parent_depends_on != NULL), put it after all ready to
++ run tasks. See the comment in
++ priority_queue_upgrade_task for a visual on how tasks
++ should be organized. */
++ if (adjust_parent_depends_on
++ && pos == PRIORITY_INSERT_BEGIN
++ && list->last_parent_depends_on
++ && !task_is_parent_depends_on)
++ {
++ struct priority_node *last_parent_depends_on
++ = list->last_parent_depends_on;
++ node->next = last_parent_depends_on->next;
++ node->prev = last_parent_depends_on;
++ }
++ /* Otherwise, put it at the top/bottom of the queue. */
++ else
++ {
++ node->next = list->tasks;
++ node->prev = list->tasks->prev;
++ if (pos == PRIORITY_INSERT_BEGIN)
++ list->tasks = node;
++ }
++ node->next->prev = node;
++ node->prev->next = node;
++ }
++ else
++ {
++ node->next = node;
++ node->prev = node;
++ list->tasks = node;
++ }
++ if (adjust_parent_depends_on
++ && list->last_parent_depends_on == NULL
++ && task_is_parent_depends_on)
++ list->last_parent_depends_on = node;
++}
++
++/* Tree version of priority_list_insert. */
++
++static inline void
++priority_tree_insert (enum priority_queue_type type,
++ struct priority_queue *head,
++ struct gomp_task *task,
++ int priority,
++ enum priority_insert_type pos,
++ bool adjust_parent_depends_on,
++ bool task_is_parent_depends_on)
++{
++ if (__builtin_expect (head->t.root == NULL, 0))
++ {
++ /* The first time around, transfer any priority 0 items to the
++ tree. */
++ if (head->l.tasks != NULL)
++ {
++ prio_splay_tree_node k = gomp_malloc (sizeof (*k));
++ k->left = NULL;
++ k->right = NULL;
++ k->key.l.priority = 0;
++ k->key.l.tasks = head->l.tasks;
++ k->key.l.last_parent_depends_on = head->l.last_parent_depends_on;
++ prio_splay_tree_insert (&head->t, k);
++ head->l.tasks = NULL;
++ }
++ }
++ struct priority_list *list
++ = priority_queue_lookup_priority (head, priority);
++ if (!list)
++ {
++ prio_splay_tree_node k = gomp_malloc (sizeof (*k));
++ k->left = NULL;
++ k->right = NULL;
++ k->key.l.priority = priority;
++ k->key.l.tasks = NULL;
++ k->key.l.last_parent_depends_on = NULL;
++ prio_splay_tree_insert (&head->t, k);
++ list = &k->key.l;
++ }
++ priority_list_insert (type, list, task, priority, pos,
++ adjust_parent_depends_on,
++ task_is_parent_depends_on);
++}
++
++/* Generic version of priority_*_insert. */
++
++static inline void
++priority_queue_insert (enum priority_queue_type type,
++ struct priority_queue *head,
++ struct gomp_task *task,
++ int priority,
++ enum priority_insert_type pos,
++ bool adjust_parent_depends_on,
++ bool task_is_parent_depends_on)
++{
++#if _LIBGOMP_CHECKING_
++ if (priority_queue_task_in_queue_p (type, head, task))
++ gomp_fatal ("Attempt to insert existing task %p", task);
++#endif
++ if (priority_queue_multi_p (head) || __builtin_expect (priority > 0, 0))
++ priority_tree_insert (type, head, task, priority, pos,
++ adjust_parent_depends_on,
++ task_is_parent_depends_on);
++ else
++ priority_list_insert (type, &head->l, task, priority, pos,
++ adjust_parent_depends_on,
++ task_is_parent_depends_on);
++}
++
++/* If multiple priorities are in play, return the highest priority
++ task from within Q1 and Q2, while giving preference to tasks from
++ Q1. If the returned task is chosen from Q1, *Q1_CHOSEN_P is set to
++ TRUE, otherwise it is set to FALSE.
++
++ If multiple priorities are not in play (only 0 priorities are
++ available), the next task is chosen exclusively from Q1.
++
++ As a special case, Q2 can be NULL, in which case, we just choose
++ the highest priority WAITING task in Q1. This is an optimization
++ to speed up looking through only one queue.
++
++ We assume Q1 has at least one item. */
++
++static inline struct gomp_task *
++priority_queue_next_task (enum priority_queue_type t1,
++ struct priority_queue *q1,
++ enum priority_queue_type t2,
++ struct priority_queue *q2,
++ bool *q1_chosen_p)
++{
++#if _LIBGOMP_CHECKING_
++ if (priority_queue_empty_p (q1, MEMMODEL_RELAXED))
++ gomp_fatal ("priority_queue_next_task: Q1 is empty");
++#endif
++ if (priority_queue_multi_p (q1))
++ {
++ struct gomp_task *t
++ = priority_tree_next_task (t1, q1, t2, q2, q1_chosen_p);
++ /* If T is NULL, there are no WAITING tasks in Q1. In which
++ case, return any old (non-waiting) task which will cause the
++ caller to do the right thing when checking T->KIND ==
++ GOMP_TASK_WAITING. */
++ if (!t)
++ {
++#if _LIBGOMP_CHECKING_
++ if (*q1_chosen_p == false)
++ gomp_fatal ("priority_queue_next_task inconsistency");
++#endif
++ return priority_node_to_task (t1, q1->t.root->key.l.tasks);
++ }
++ return t;
++ }
++ else
++ {
++ *q1_chosen_p = true;
++ return priority_node_to_task (t1, q1->l.tasks);
++ }
++}
++
++/* Remove NODE from LIST.
++
++ If we are removing the one and only item in the list, and MODEL is
++ MEMMODEL_RELEASE, use an atomic release to clear the list.
++
++ If the list becomes empty after the remove, return TRUE. */
++
++static inline bool
++priority_list_remove (struct priority_list *list,
++ struct priority_node *node,
++ enum memmodel model)
++{
++ bool empty = false;
++ node->prev->next = node->next;
++ node->next->prev = node->prev;
++ if (list->tasks == node)
++ {
++ if (node->next != node)
++ list->tasks = node->next;
++ else
++ {
++ /* We access task->children in GOMP_taskwait outside of
++ the task lock mutex region, so need a release barrier
++ here to ensure memory written by child_task->fn above
++ is flushed before the NULL is written. */
++ if (model == MEMMODEL_RELEASE)
++ __atomic_store_n (&list->tasks, NULL, MEMMODEL_RELEASE);
++ else
++ list->tasks = NULL;
++ empty = true;
++ goto remove_out;
++ }
++ }
++remove_out:
++#if _LIBGOMP_CHECKING_
++ memset (node, 0xaf, sizeof (*node));
++#endif
++ return empty;
++}
++
++/* This is the generic version of priority_list_remove.
++
++ Remove NODE from priority queue HEAD. HEAD contains tasks of type TYPE.
++
++ If we are removing the one and only item in the priority queue and
++ MODEL is MEMMODEL_RELEASE, use an atomic release to clear the queue.
++
++ If the queue becomes empty after the remove, return TRUE. */
++
++static inline bool
++priority_queue_remove (enum priority_queue_type type,
++ struct priority_queue *head,
++ struct gomp_task *task,
++ enum memmodel model)
++{
++#if _LIBGOMP_CHECKING_
++ if (!priority_queue_task_in_queue_p (type, head, task))
++ gomp_fatal ("Attempt to remove missing task %p", task);
++#endif
++ if (priority_queue_multi_p (head))
++ {
++ priority_tree_remove (type, head, task_to_priority_node (type, task));
++ if (head->t.root == NULL)
++ {
++ if (model == MEMMODEL_RELEASE)
++ /* Errr, we store NULL twice, the alternative would be to
++ use an atomic release directly in the splay tree
++ routines. Worth it? */
++ __atomic_store_n (&head->t.root, NULL, MEMMODEL_RELEASE);
++ return true;
++ }
++ return false;
++ }
++ else
++ return priority_list_remove (&head->l,
++ task_to_priority_node (type, task), model);
++}
++
++#endif /* _PRIORITY_QUEUE_H_ */
+--- libgomp/priority_queue.c.jj 2016-07-13 16:57:04.435535360 +0200
++++ libgomp/priority_queue.c 2016-07-13 16:57:04.435535360 +0200
+@@ -0,0 +1,300 @@
++/* Copyright (C) 2015-2016 Free Software Foundation, Inc.
++ Contributed by Aldy Hernandez .
++
++ This file is part of the GNU Offloading and Multi Processing Library
++ (libgomp).
++
++ Libgomp 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.
++
++ Libgomp 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
++ . */
++
++/* Priority queue implementation of GOMP tasks. */
++
++#include "libgomp.h"
++
++#if _LIBGOMP_CHECKING_
++#include
++
++/* Sanity check to verify whether a TASK is in LIST. Return TRUE if
++ found, FALSE otherwise.
++
++ TYPE is the type of priority queue this task resides in. */
++
++static inline bool
++priority_queue_task_in_list_p (enum priority_queue_type type,
++ struct priority_list *list,
++ struct gomp_task *task)
++{
++ struct priority_node *p = list->tasks;
++ do
++ {
++ if (priority_node_to_task (type, p) == task)
++ return true;
++ p = p->next;
++ }
++ while (p != list->tasks);
++ return false;
++}
++
++/* Tree version of priority_queue_task_in_list_p. */
++
++static inline bool
++priority_queue_task_in_tree_p (enum priority_queue_type type,
++ struct priority_queue *head,
++ struct gomp_task *task)
++{
++ struct priority_list *list
++ = priority_queue_lookup_priority (head, task->priority);
++ if (!list)
++ return false;
++ return priority_queue_task_in_list_p (type, list, task);
++}
++
++/* Generic version of priority_queue_task_in_list_p that works for
++ trees or lists. */
++
++bool
++priority_queue_task_in_queue_p (enum priority_queue_type type,
++ struct priority_queue *head,
++ struct gomp_task *task)
++{
++ if (priority_queue_empty_p (head, MEMMODEL_RELAXED))
++ return false;
++ if (priority_queue_multi_p (head))
++ return priority_queue_task_in_tree_p (type, head, task);
++ else
++ return priority_queue_task_in_list_p (type, &head->l, task);
++}
++
++/* Sanity check LIST to make sure the tasks therein are in the right
++ order. LIST is a priority list of type TYPE.
++
++ The expected order is that GOMP_TASK_WAITING tasks come before
++ GOMP_TASK_TIED/GOMP_TASK_ASYNC_RUNNING ones.
++
++ If CHECK_DEPS is TRUE, we also check that parent_depends_on WAITING
++ tasks come before !parent_depends_on WAITING tasks. This is only
++ applicable to the children queue, and the caller is expected to
++ ensure that we are verifying the children queue. */
++
++static void
++priority_list_verify (enum priority_queue_type type,
++ struct priority_list *list, bool check_deps)
++{
++ bool seen_tied = false;
++ bool seen_plain_waiting = false;
++ struct priority_node *p = list->tasks;
++ while (1)
++ {
++ struct gomp_task *t = priority_node_to_task (type, p);
++ if (seen_tied && t->kind == GOMP_TASK_WAITING)
++ gomp_fatal ("priority_queue_verify: WAITING task after TIED");
++ if (t->kind >= GOMP_TASK_TIED)
++ seen_tied = true;
++ else if (check_deps && t->kind == GOMP_TASK_WAITING)
++ {
++ if (t->parent_depends_on)
++ {
++ if (seen_plain_waiting)
++ gomp_fatal ("priority_queue_verify: "
++ "parent_depends_on after !parent_depends_on");
++ }
++ else
++ seen_plain_waiting = true;
++ }
++ p = p->next;
++ if (p == list->tasks)
++ break;
++ }
++}
++
++/* Callback type for priority_tree_verify_callback. */
++struct cbtype
++{
++ enum priority_queue_type type;
++ bool check_deps;
++};
++
++/* Verify every task in NODE.
++
++ Callback for splay_tree_foreach. */
++
++static void
++priority_tree_verify_callback (prio_splay_tree_key key, void *data)
++{
++ struct cbtype *cb = (struct cbtype *) data;
++ priority_list_verify (cb->type, &key->l, cb->check_deps);
++}
++
++/* Generic version of priority_list_verify.
++
++ Sanity check HEAD to make sure the tasks therein are in the right
++ order. The priority_queue holds tasks of type TYPE.
++
++ If CHECK_DEPS is TRUE, we also check that parent_depends_on WAITING
++ tasks come before !parent_depends_on WAITING tasks. This is only
++ applicable to the children queue, and the caller is expected to
++ ensure that we are verifying the children queue. */
++
++void
++priority_queue_verify (enum priority_queue_type type,
++ struct priority_queue *head, bool check_deps)
++{
++ if (priority_queue_empty_p (head, MEMMODEL_RELAXED))
++ return;
++ if (priority_queue_multi_p (head))
++ {
++ struct cbtype cb = { type, check_deps };
++ prio_splay_tree_foreach (&head->t,
++ priority_tree_verify_callback, &cb);
++ }
++ else
++ priority_list_verify (type, &head->l, check_deps);
++}
++#endif /* _LIBGOMP_CHECKING_ */
++
++/* Remove NODE from priority queue HEAD, wherever it may be inside the
++ tree. HEAD contains tasks of type TYPE. */
++
++void
++priority_tree_remove (enum priority_queue_type type,
++ struct priority_queue *head,
++ struct priority_node *node)
++{
++ /* ?? The only reason this function is not inlined is because we
++ need to find the priority within gomp_task (which has not been
++ completely defined in the header file). If the lack of inlining
++ is a concern, we could pass the priority number as a
++ parameter, or we could move this to libgomp.h. */
++ int priority = priority_node_to_task (type, node)->priority;
++
++ /* ?? We could avoid this lookup by keeping a pointer to the key in
++ the priority_node. */
++ struct priority_list *list
++ = priority_queue_lookup_priority (head, priority);
++#if _LIBGOMP_CHECKING_
++ if (!list)
++ gomp_fatal ("Unable to find priority %d", priority);
++#endif
++ /* If NODE was the last in its priority, clean up the priority. */
++ if (priority_list_remove (list, node, MEMMODEL_RELAXED))
++ {
++ prio_splay_tree_remove (&head->t, (prio_splay_tree_key) list);
++ list->tasks = NULL;
++#if _LIBGOMP_CHECKING_
++ memset (list, 0xaf, sizeof (*list));
++#endif
++ free (list);
++ }
++}
++
++/* Return the highest priority WAITING task in a splay tree NODE. If
++ there are no WAITING tasks available, return NULL.
++
++ NODE is a priority list containing tasks of type TYPE.
++
++ The right most node in a tree contains the highest priority.
++ Recurse down to find such a node. If the task at that max node is
++ not WAITING, bubble back up and look at the remaining tasks
++ in-order. */
++
++static struct gomp_task *
++priority_tree_next_task_1 (enum priority_queue_type type,
++ prio_splay_tree_node node)
++{
++ again:
++ if (!node)
++ return NULL;
++ struct gomp_task *ret = priority_tree_next_task_1 (type, node->right);
++ if (ret)
++ return ret;
++ ret = priority_node_to_task (type, node->key.l.tasks);
++ if (ret->kind == GOMP_TASK_WAITING)
++ return ret;
++ node = node->left;
++ goto again;
++}
++
++/* Return the highest priority WAITING task from within Q1 and Q2,
++ while giving preference to tasks from Q1. Q1 is a queue containing
++ items of type TYPE1. Q2 is a queue containing items of type TYPE2.
++
++ Since we are mostly interested in Q1, if there are no WAITING tasks
++ in Q1, we don't bother checking Q2, and just return NULL.
++
++ As a special case, Q2 can be NULL, in which case, we just choose
++ the highest priority WAITING task in Q1. This is an optimization
++ to speed up looking through only one queue.
++
++ If the returned task is chosen from Q1, *Q1_CHOSEN_P is set to
++ TRUE, otherwise it is set to FALSE. */
++
++struct gomp_task *
++priority_tree_next_task (enum priority_queue_type type1,
++ struct priority_queue *q1,
++ enum priority_queue_type type2,
++ struct priority_queue *q2,
++ bool *q1_chosen_p)
++{
++ struct gomp_task *t1 = priority_tree_next_task_1 (type1, q1->t.root);
++ if (!t1
++ /* Special optimization when only searching through one queue. */
++ || !q2)
++ {
++ *q1_chosen_p = true;
++ return t1;
++ }
++ struct gomp_task *t2 = priority_tree_next_task_1 (type2, q2->t.root);
++ if (!t2 || t1->priority > t2->priority)
++ {
++ *q1_chosen_p = true;
++ return t1;
++ }
++ if (t2->priority > t1->priority)
++ {
++ *q1_chosen_p = false;
++ return t2;
++ }
++ /* If we get here, the priorities are the same, so we must look at
++ parent_depends_on to make our decision. */
++#if _LIBGOMP_CHECKING_
++ if (t1 != t2)
++ gomp_fatal ("priority_tree_next_task: t1 != t2");
++#endif
++ if (t2->parent_depends_on && !t1->parent_depends_on)
++ {
++ *q1_chosen_p = false;
++ return t2;
++ }
++ *q1_chosen_p = true;
++ return t1;
++}
++
++/* Priority splay trees comparison function. */
++static inline int
++prio_splay_compare (prio_splay_tree_key x, prio_splay_tree_key y)
++{
++ if (x->l.priority == y->l.priority)
++ return 0;
++ return x->l.priority < y->l.priority ? -1 : 1;
++}
++
++/* Define another splay tree instantiation, for priority_list's. */
++#define splay_tree_prefix prio
++#define splay_tree_c
++#include "splay-tree.h"
+--- libgomp/openacc.f90.jj 2016-07-13 16:57:04.434535373 +0200
++++ libgomp/openacc.f90 2016-07-14 19:01:54.901230875 +0200
+@@ -0,0 +1,911 @@
++! OpenACC Runtime Library Definitions.
++
++! Copyright (C) 2014-2016 Free Software Foundation, Inc.
++
++! Contributed by Tobias Burnus
++! and Mentor Embedded.
++
++! This file is part of the GNU Offloading and Multi Processing Library
++! (libgomp).
++
++! Libgomp 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.
++
++! Libgomp 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
++! .
++
++module openacc_kinds
++ use iso_fortran_env, only: int32
++ implicit none
++
++ private :: int32
++ public :: acc_device_kind
++
++ integer, parameter :: acc_device_kind = int32
++
++ public :: acc_device_none, acc_device_default, acc_device_host
++ public :: acc_device_not_host, acc_device_nvidia
++
++ ! Keep in sync with include/gomp-constants.h.
++ integer (acc_device_kind), parameter :: acc_device_none = 0
++ integer (acc_device_kind), parameter :: acc_device_default = 1
++ integer (acc_device_kind), parameter :: acc_device_host = 2
++ ! integer (acc_device_kind), parameter :: acc_device_host_nonshm = 3 removed.
++ integer (acc_device_kind), parameter :: acc_device_not_host = 4
++ integer (acc_device_kind), parameter :: acc_device_nvidia = 5
++
++ public :: acc_handle_kind
++
++ integer, parameter :: acc_handle_kind = int32
++
++ public :: acc_async_noval, acc_async_sync
++
++ ! Keep in sync with include/gomp-constants.h.
++ integer (acc_handle_kind), parameter :: acc_async_noval = -1
++ integer (acc_handle_kind), parameter :: acc_async_sync = -2
++
++end module
++
++module openacc_internal
++ use openacc_kinds
++ implicit none
++
++ interface
++ function acc_get_num_devices_h (d)
++ import
++ integer acc_get_num_devices_h
++ integer (acc_device_kind) d
++ end function
++
++ subroutine acc_set_device_type_h (d)
++ import
++ integer (acc_device_kind) d
++ end subroutine
++
++ function acc_get_device_type_h ()
++ import
++ integer (acc_device_kind) acc_get_device_type_h
++ end function
++
++ subroutine acc_set_device_num_h (n, d)
++ import
++ integer n
++ integer (acc_device_kind) d
++ end subroutine
++
++ function acc_get_device_num_h (d)
++ import
++ integer acc_get_device_num_h
++ integer (acc_device_kind) d
++ end function
++
++ function acc_async_test_h (a)
++ logical acc_async_test_h
++ integer a
++ end function
++
++ function acc_async_test_all_h ()
++ logical acc_async_test_all_h
++ end function
++
++ subroutine acc_wait_h (a)
++ integer a
++ end subroutine
++
++ subroutine acc_wait_async_h (a1, a2)
++ integer a1, a2
++ end subroutine
++
++ subroutine acc_wait_all_h ()
++ end subroutine
++
++ subroutine acc_wait_all_async_h (a)
++ integer a
++ end subroutine
++
++ subroutine acc_init_h (d)
++ import
++ integer (acc_device_kind) d
++ end subroutine
++
++ subroutine acc_shutdown_h (d)
++ import
++ integer (acc_device_kind) d
++ end subroutine
++
++ function acc_on_device_h (d)
++ import
++ integer (acc_device_kind) d
++ logical acc_on_device_h
++ end function
++
++ subroutine acc_copyin_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_copyin_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_copyin_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++
++ subroutine acc_present_or_copyin_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_present_or_copyin_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_present_or_copyin_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++
++ subroutine acc_create_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_create_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_create_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++
++ subroutine acc_present_or_create_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_present_or_create_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_present_or_create_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++
++ subroutine acc_copyout_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_copyout_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_copyout_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++
++ subroutine acc_delete_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_delete_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_delete_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++
++ subroutine acc_update_device_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_update_device_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_update_device_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++
++ subroutine acc_update_self_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end subroutine
++
++ subroutine acc_update_self_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end subroutine
++
++ subroutine acc_update_self_array_h (a)
++ type (*), dimension (..), contiguous :: a
++ end subroutine
++
++ function acc_is_present_32_h (a, len)
++ use iso_c_binding, only: c_int32_t
++ logical acc_is_present_32_h
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ end function
++
++ function acc_is_present_64_h (a, len)
++ use iso_c_binding, only: c_int64_t
++ logical acc_is_present_64_h
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ end function
++
++ function acc_is_present_array_h (a)
++ logical acc_is_present_array_h
++ type (*), dimension (..), contiguous :: a
++ end function
++ end interface
++
++ interface
++ function acc_get_num_devices_l (d) &
++ bind (C, name = "acc_get_num_devices")
++ use iso_c_binding, only: c_int
++ integer (c_int) :: acc_get_num_devices_l
++ integer (c_int), value :: d
++ end function
++
++ subroutine acc_set_device_type_l (d) &
++ bind (C, name = "acc_set_device_type")
++ use iso_c_binding, only: c_int
++ integer (c_int), value :: d
++ end subroutine
++
++ function acc_get_device_type_l () &
++ bind (C, name = "acc_get_device_type")
++ use iso_c_binding, only: c_int
++ integer (c_int) :: acc_get_device_type_l
++ end function
++
++ subroutine acc_set_device_num_l (n, d) &
++ bind (C, name = "acc_set_device_num")
++ use iso_c_binding, only: c_int
++ integer (c_int), value :: n, d
++ end subroutine
++
++ function acc_get_device_num_l (d) &
++ bind (C, name = "acc_get_device_num")
++ use iso_c_binding, only: c_int
++ integer (c_int) :: acc_get_device_num_l
++ integer (c_int), value :: d
++ end function
++
++ function acc_async_test_l (a) &
++ bind (C, name = "acc_async_test")
++ use iso_c_binding, only: c_int
++ integer (c_int) :: acc_async_test_l
++ integer (c_int), value :: a
++ end function
++
++ function acc_async_test_all_l () &
++ bind (C, name = "acc_async_test_all")
++ use iso_c_binding, only: c_int
++ integer (c_int) :: acc_async_test_all_l
++ end function
++
++ subroutine acc_wait_l (a) &
++ bind (C, name = "acc_wait")
++ use iso_c_binding, only: c_int
++ integer (c_int), value :: a
++ end subroutine
++
++ subroutine acc_wait_async_l (a1, a2) &
++ bind (C, name = "acc_wait_async")
++ use iso_c_binding, only: c_int
++ integer (c_int), value :: a1, a2
++ end subroutine
++
++ subroutine acc_wait_all_l () &
++ bind (C, name = "acc_wait_all")
++ use iso_c_binding, only: c_int
++ end subroutine
++
++ subroutine acc_wait_all_async_l (a) &
++ bind (C, name = "acc_wait_all_async")
++ use iso_c_binding, only: c_int
++ integer (c_int), value :: a
++ end subroutine
++
++ subroutine acc_init_l (d) &
++ bind (C, name = "acc_init")
++ use iso_c_binding, only: c_int
++ integer (c_int), value :: d
++ end subroutine
++
++ subroutine acc_shutdown_l (d) &
++ bind (C, name = "acc_shutdown")
++ use iso_c_binding, only: c_int
++ integer (c_int), value :: d
++ end subroutine
++
++ function acc_on_device_l (d) &
++ bind (C, name = "acc_on_device")
++ use iso_c_binding, only: c_int
++ integer (c_int) :: acc_on_device_l
++ integer (c_int), value :: d
++ end function
++
++ subroutine acc_copyin_l (a, len) &
++ bind (C, name = "acc_copyin")
++ use iso_c_binding, only: c_size_t
++ type (*), dimension (*) :: a
++ integer (c_size_t), value :: len
++ end subroutine
++
++ subroutine acc_present_or_copyin_l (a, len) &
++ bind (C, name = "acc_present_or_copyin")
++ use iso_c_binding, only: c_size_t
++ type (*), dimension (*) :: a
++ integer (c_size_t), value :: len
++ end subroutine
++
++ subroutine acc_create_l (a, len) &
++ bind (C, name = "acc_create")
++ use iso_c_binding, only: c_size_t
++ type (*), dimension (*) :: a
++ integer (c_size_t), value :: len
++ end subroutine
++
++ subroutine acc_present_or_create_l (a, len) &
++ bind (C, name = "acc_present_or_create")
++ use iso_c_binding, only: c_size_t
++ type (*), dimension (*) :: a
++ integer (c_size_t), value :: len
++ end subroutine
++
++ subroutine acc_copyout_l (a, len) &
++ bind (C, name = "acc_copyout")
++ use iso_c_binding, only: c_size_t
++ type (*), dimension (*) :: a
++ integer (c_size_t), value :: len
++ end subroutine
++
++ subroutine acc_delete_l (a, len) &
++ bind (C, name = "acc_delete")
++ use iso_c_binding, only: c_size_t
++ type (*), dimension (*) :: a
++ integer (c_size_t), value :: len
++ end subroutine
++
++ subroutine acc_update_device_l (a, len) &
++ bind (C, name = "acc_update_device")
++ use iso_c_binding, only: c_size_t
++ type (*), dimension (*) :: a
++ integer (c_size_t), value :: len
++ end subroutine
++
++ subroutine acc_update_self_l (a, len) &
++ bind (C, name = "acc_update_self")
++ use iso_c_binding, only: c_size_t
++ type (*), dimension (*) :: a
++ integer (c_size_t), value :: len
++ end subroutine
++
++ function acc_is_present_l (a, len) &
++ bind (C, name = "acc_is_present")
++ use iso_c_binding, only: c_int32_t, c_size_t
++ integer (c_int32_t) :: acc_is_present_l
++ type (*), dimension (*) :: a
++ integer (c_size_t), value :: len
++ end function
++ end interface
++end module
++
++module openacc
++ use openacc_kinds
++ use openacc_internal
++ implicit none
++
++ public :: openacc_version
++
++ public :: acc_get_num_devices, acc_set_device_type, acc_get_device_type
++ public :: acc_set_device_num, acc_get_device_num, acc_async_test
++ public :: acc_async_test_all, acc_wait, acc_wait_async, acc_wait_all
++ public :: acc_wait_all_async, acc_init, acc_shutdown, acc_on_device
++ public :: acc_copyin, acc_present_or_copyin, acc_pcopyin, acc_create
++ public :: acc_present_or_create, acc_pcreate, acc_copyout, acc_delete
++ public :: acc_update_device, acc_update_self, acc_is_present
++
++ integer, parameter :: openacc_version = 201306
++
++ interface acc_get_num_devices
++ procedure :: acc_get_num_devices_h
++ end interface
++
++ interface acc_set_device_type
++ procedure :: acc_set_device_type_h
++ end interface
++
++ interface acc_get_device_type
++ procedure :: acc_get_device_type_h
++ end interface
++
++ interface acc_set_device_num
++ procedure :: acc_set_device_num_h
++ end interface
++
++ interface acc_get_device_num
++ procedure :: acc_get_device_num_h
++ end interface
++
++ interface acc_async_test
++ procedure :: acc_async_test_h
++ end interface
++
++ interface acc_async_test_all
++ procedure :: acc_async_test_all_h
++ end interface
++
++ interface acc_wait
++ procedure :: acc_wait_h
++ end interface
++
++ interface acc_wait_async
++ procedure :: acc_wait_async_h
++ end interface
++
++ interface acc_wait_all
++ procedure :: acc_wait_all_h
++ end interface
++
++ interface acc_wait_all_async
++ procedure :: acc_wait_all_async_h
++ end interface
++
++ interface acc_init
++ procedure :: acc_init_h
++ end interface
++
++ interface acc_shutdown
++ procedure :: acc_shutdown_h
++ end interface
++
++ interface acc_on_device
++ procedure :: acc_on_device_h
++ end interface
++
++ ! acc_malloc: Only available in C/C++
++ ! acc_free: Only available in C/C++
++
++ ! As vendor extension, the following code supports both 32bit and 64bit
++ ! arguments for "size"; the OpenACC standard only permits default-kind
++ ! integers, which are of kind 4 (i.e. 32 bits).
++ ! Additionally, the two-argument version also takes arrays as argument.
++ ! and the one argument version also scalars. Note that the code assumes
++ ! that the arrays are contiguous.
++
++ interface acc_copyin
++ procedure :: acc_copyin_32_h
++ procedure :: acc_copyin_64_h
++ procedure :: acc_copyin_array_h
++ end interface
++
++ interface acc_present_or_copyin
++ procedure :: acc_present_or_copyin_32_h
++ procedure :: acc_present_or_copyin_64_h
++ procedure :: acc_present_or_copyin_array_h
++ end interface
++
++ interface acc_pcopyin
++ procedure :: acc_present_or_copyin_32_h
++ procedure :: acc_present_or_copyin_64_h
++ procedure :: acc_present_or_copyin_array_h
++ end interface
++
++ interface acc_create
++ procedure :: acc_create_32_h
++ procedure :: acc_create_64_h
++ procedure :: acc_create_array_h
++ end interface
++
++ interface acc_present_or_create
++ procedure :: acc_present_or_create_32_h
++ procedure :: acc_present_or_create_64_h
++ procedure :: acc_present_or_create_array_h
++ end interface
++
++ interface acc_pcreate
++ procedure :: acc_present_or_create_32_h
++ procedure :: acc_present_or_create_64_h
++ procedure :: acc_present_or_create_array_h
++ end interface
++
++ interface acc_copyout
++ procedure :: acc_copyout_32_h
++ procedure :: acc_copyout_64_h
++ procedure :: acc_copyout_array_h
++ end interface
++
++ interface acc_delete
++ procedure :: acc_delete_32_h
++ procedure :: acc_delete_64_h
++ procedure :: acc_delete_array_h
++ end interface
++
++ interface acc_update_device
++ procedure :: acc_update_device_32_h
++ procedure :: acc_update_device_64_h
++ procedure :: acc_update_device_array_h
++ end interface
++
++ interface acc_update_self
++ procedure :: acc_update_self_32_h
++ procedure :: acc_update_self_64_h
++ procedure :: acc_update_self_array_h
++ end interface
++
++ ! acc_map_data: Only available in C/C++
++ ! acc_unmap_data: Only available in C/C++
++ ! acc_deviceptr: Only available in C/C++
++ ! acc_hostptr: Only available in C/C++
++
++ interface acc_is_present
++ procedure :: acc_is_present_32_h
++ procedure :: acc_is_present_64_h
++ procedure :: acc_is_present_array_h
++ end interface
++
++ ! acc_memcpy_to_device: Only available in C/C++
++ ! acc_memcpy_from_device: Only available in C/C++
++
++end module
++
++function acc_get_num_devices_h (d)
++ use openacc_internal, only: acc_get_num_devices_l
++ use openacc_kinds
++ integer acc_get_num_devices_h
++ integer (acc_device_kind) d
++ acc_get_num_devices_h = acc_get_num_devices_l (d)
++end function
++
++subroutine acc_set_device_type_h (d)
++ use openacc_internal, only: acc_set_device_type_l
++ use openacc_kinds
++ integer (acc_device_kind) d
++ call acc_set_device_type_l (d)
++end subroutine
++
++function acc_get_device_type_h ()
++ use openacc_internal, only: acc_get_device_type_l
++ use openacc_kinds
++ integer (acc_device_kind) acc_get_device_type_h
++ acc_get_device_type_h = acc_get_device_type_l ()
++end function
++
++subroutine acc_set_device_num_h (n, d)
++ use openacc_internal, only: acc_set_device_num_l
++ use openacc_kinds
++ integer n
++ integer (acc_device_kind) d
++ call acc_set_device_num_l (n, d)
++end subroutine
++
++function acc_get_device_num_h (d)
++ use openacc_internal, only: acc_get_device_num_l
++ use openacc_kinds
++ integer acc_get_device_num_h
++ integer (acc_device_kind) d
++ acc_get_device_num_h = acc_get_device_num_l (d)
++end function
++
++function acc_async_test_h (a)
++ use openacc_internal, only: acc_async_test_l
++ logical acc_async_test_h
++ integer a
++ if (acc_async_test_l (a) .eq. 1) then
++ acc_async_test_h = .TRUE.
++ else
++ acc_async_test_h = .FALSE.
++ end if
++end function
++
++function acc_async_test_all_h ()
++ use openacc_internal, only: acc_async_test_all_l
++ logical acc_async_test_all_h
++ if (acc_async_test_all_l () .eq. 1) then
++ acc_async_test_all_h = .TRUE.
++ else
++ acc_async_test_all_h = .FALSE.
++ end if
++end function
++
++subroutine acc_wait_h (a)
++ use openacc_internal, only: acc_wait_l
++ integer a
++ call acc_wait_l (a)
++end subroutine
++
++subroutine acc_wait_async_h (a1, a2)
++ use openacc_internal, only: acc_wait_async_l
++ integer a1, a2
++ call acc_wait_async_l (a1, a2)
++end subroutine
++
++subroutine acc_wait_all_h ()
++ use openacc_internal, only: acc_wait_all_l
++ call acc_wait_all_l ()
++end subroutine
++
++subroutine acc_wait_all_async_h (a)
++ use openacc_internal, only: acc_wait_all_async_l
++ integer a
++ call acc_wait_all_async_l (a)
++end subroutine
++
++subroutine acc_init_h (d)
++ use openacc_internal, only: acc_init_l
++ use openacc_kinds
++ integer (acc_device_kind) d
++ call acc_init_l (d)
++end subroutine
++
++subroutine acc_shutdown_h (d)
++ use openacc_internal, only: acc_shutdown_l
++ use openacc_kinds
++ integer (acc_device_kind) d
++ call acc_shutdown_l (d)
++end subroutine
++
++function acc_on_device_h (d)
++ use openacc_internal, only: acc_on_device_l
++ use openacc_kinds
++ integer (acc_device_kind) d
++ logical acc_on_device_h
++ if (acc_on_device_l (d) .eq. 1) then
++ acc_on_device_h = .TRUE.
++ else
++ acc_on_device_h = .FALSE.
++ end if
++end function
++
++subroutine acc_copyin_32_h (a, len)
++ use iso_c_binding, only: c_int32_t, c_size_t
++ use openacc_internal, only: acc_copyin_l
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ call acc_copyin_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_copyin_64_h (a, len)
++ use iso_c_binding, only: c_int64_t, c_size_t
++ use openacc_internal, only: acc_copyin_l
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ call acc_copyin_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_copyin_array_h (a)
++ use openacc_internal, only: acc_copyin_l
++ type (*), dimension (..), contiguous :: a
++ call acc_copyin_l (a, sizeof (a))
++end subroutine
++
++subroutine acc_present_or_copyin_32_h (a, len)
++ use iso_c_binding, only: c_int32_t, c_size_t
++ use openacc_internal, only: acc_present_or_copyin_l
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ call acc_present_or_copyin_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_present_or_copyin_64_h (a, len)
++ use iso_c_binding, only: c_int64_t, c_size_t
++ use openacc_internal, only: acc_present_or_copyin_l
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ call acc_present_or_copyin_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_present_or_copyin_array_h (a)
++ use openacc_internal, only: acc_present_or_copyin_l
++ type (*), dimension (..), contiguous :: a
++ call acc_present_or_copyin_l (a, sizeof (a))
++end subroutine
++
++subroutine acc_create_32_h (a, len)
++ use iso_c_binding, only: c_int32_t, c_size_t
++ use openacc_internal, only: acc_create_l
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ call acc_create_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_create_64_h (a, len)
++ use iso_c_binding, only: c_int64_t, c_size_t
++ use openacc_internal, only: acc_create_l
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ call acc_create_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_create_array_h (a)
++ use openacc_internal, only: acc_create_l
++ type (*), dimension (..), contiguous :: a
++ call acc_create_l (a, sizeof (a))
++end subroutine
++
++subroutine acc_present_or_create_32_h (a, len)
++ use iso_c_binding, only: c_int32_t, c_size_t
++ use openacc_internal, only: acc_present_or_create_l
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ call acc_present_or_create_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_present_or_create_64_h (a, len)
++ use iso_c_binding, only: c_int64_t, c_size_t
++ use openacc_internal, only: acc_present_or_create_l
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ call acc_present_or_create_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_present_or_create_array_h (a)
++ use openacc_internal, only: acc_present_or_create_l
++ type (*), dimension (..), contiguous :: a
++ call acc_present_or_create_l (a, sizeof (a))
++end subroutine
++
++subroutine acc_copyout_32_h (a, len)
++ use iso_c_binding, only: c_int32_t, c_size_t
++ use openacc_internal, only: acc_copyout_l
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ call acc_copyout_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_copyout_64_h (a, len)
++ use iso_c_binding, only: c_int64_t, c_size_t
++ use openacc_internal, only: acc_copyout_l
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ call acc_copyout_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_copyout_array_h (a)
++ use openacc_internal, only: acc_copyout_l
++ type (*), dimension (..), contiguous :: a
++ call acc_copyout_l (a, sizeof (a))
++end subroutine
++
++subroutine acc_delete_32_h (a, len)
++ use iso_c_binding, only: c_int32_t, c_size_t
++ use openacc_internal, only: acc_delete_l
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ call acc_delete_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_delete_64_h (a, len)
++ use iso_c_binding, only: c_int64_t, c_size_t
++ use openacc_internal, only: acc_delete_l
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ call acc_delete_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_delete_array_h (a)
++ use openacc_internal, only: acc_delete_l
++ type (*), dimension (..), contiguous :: a
++ call acc_delete_l (a, sizeof (a))
++end subroutine
++
++subroutine acc_update_device_32_h (a, len)
++ use iso_c_binding, only: c_int32_t, c_size_t
++ use openacc_internal, only: acc_update_device_l
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ call acc_update_device_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_update_device_64_h (a, len)
++ use iso_c_binding, only: c_int64_t, c_size_t
++ use openacc_internal, only: acc_update_device_l
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ call acc_update_device_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_update_device_array_h (a)
++ use openacc_internal, only: acc_update_device_l
++ type (*), dimension (..), contiguous :: a
++ call acc_update_device_l (a, sizeof (a))
++end subroutine
++
++subroutine acc_update_self_32_h (a, len)
++ use iso_c_binding, only: c_int32_t, c_size_t
++ use openacc_internal, only: acc_update_self_l
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ call acc_update_self_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_update_self_64_h (a, len)
++ use iso_c_binding, only: c_int64_t, c_size_t
++ use openacc_internal, only: acc_update_self_l
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ call acc_update_self_l (a, int (len, kind = c_size_t))
++end subroutine
++
++subroutine acc_update_self_array_h (a)
++ use openacc_internal, only: acc_update_self_l
++ type (*), dimension (..), contiguous :: a
++ call acc_update_self_l (a, sizeof (a))
++end subroutine
++
++function acc_is_present_32_h (a, len)
++ use iso_c_binding, only: c_int32_t, c_size_t
++ use openacc_internal, only: acc_is_present_l
++ logical acc_is_present_32_h
++ type (*), dimension (*) :: a
++ integer (c_int32_t) len
++ if (acc_is_present_l (a, int (len, kind = c_size_t)) .eq. 1) then
++ acc_is_present_32_h = .TRUE.
++ else
++ acc_is_present_32_h = .FALSE.
++ end if
++end function
++
++function acc_is_present_64_h (a, len)
++ use iso_c_binding, only: c_int64_t, c_size_t
++ use openacc_internal, only: acc_is_present_l
++ logical acc_is_present_64_h
++ type (*), dimension (*) :: a
++ integer (c_int64_t) len
++ if (acc_is_present_l (a, int (len, kind = c_size_t)) .eq. 1) then
++ acc_is_present_64_h = .TRUE.
++ else
++ acc_is_present_64_h = .FALSE.
++ end if
++end function
++
++function acc_is_present_array_h (a)
++ use openacc_internal, only: acc_is_present_l
++ logical acc_is_present_array_h
++ type (*), dimension (..), contiguous :: a
++ acc_is_present_array_h = acc_is_present_l (a, sizeof (a)) == 1
++end function
diff --git a/SOURCES/gcc48-libgomp-omp_h-multilib.patch b/SOURCES/gcc48-libgomp-omp_h-multilib.patch
new file mode 100644
index 0000000..d0e98d1
--- /dev/null
+++ b/SOURCES/gcc48-libgomp-omp_h-multilib.patch
@@ -0,0 +1,17 @@
+2008-06-09 Jakub Jelinek
+
+ * omp.h.in (omp_nest_lock_t): Fix up for Linux multilibs.
+
+--- libgomp/omp.h.in.jj 2008-06-09 13:34:05.000000000 +0200
++++ libgomp/omp.h.in 2008-06-09 13:34:48.000000000 +0200
+@@ -42,8 +42,8 @@ typedef struct
+
+ typedef struct
+ {
+- unsigned char _x[@OMP_NEST_LOCK_SIZE@]
+- __attribute__((__aligned__(@OMP_NEST_LOCK_ALIGN@)));
++ unsigned char _x[8 + sizeof (void *)]
++ __attribute__((__aligned__(sizeof (void *))));
+ } omp_nest_lock_t;
+ #endif
+
diff --git a/SOURCES/gcc48-libstdc++-docs.patch b/SOURCES/gcc48-libstdc++-docs.patch
new file mode 100644
index 0000000..382666b
--- /dev/null
+++ b/SOURCES/gcc48-libstdc++-docs.patch
@@ -0,0 +1,26 @@
+--- libstdc++-v3/doc/html/index.html.jj 2011-01-03 12:53:21.282829010 +0100
++++ libstdc++-v3/doc/html/index.html 2011-01-04 18:06:28.999851145 +0100
+@@ -5,6 +5,8 @@
+ FSF
+
+
++ Release 4.8.3
++
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation
+ License, Version 1.2 or any later version published by the
+--- libstdc++-v3/doc/html/api.html.jj 2011-01-03 12:53:21.000000000 +0100
++++ libstdc++-v3/doc/html/api.html 2011-01-04 18:12:01.672757784 +0100
+@@ -18,8 +18,11 @@
+ member functions for the library classes, finding out what is in a
+ particular include file, looking at inheritance diagrams, etc.
+
+- The API documentation, rendered into HTML, can be viewed online:
++ The API documentation, rendered into HTML, can be viewed here:
+
++ for the 4.8.3 release, local
++
++
+ for the 3.4 release
+
+
diff --git a/SOURCES/gcc48-libtool-no-rpath.patch b/SOURCES/gcc48-libtool-no-rpath.patch
new file mode 100644
index 0000000..466c661
--- /dev/null
+++ b/SOURCES/gcc48-libtool-no-rpath.patch
@@ -0,0 +1,27 @@
+libtool sucks.
+--- ltmain.sh.jj 2007-12-07 14:53:21.000000000 +0100
++++ ltmain.sh 2008-09-05 21:51:48.000000000 +0200
+@@ -5394,6 +5394,7 @@ EOF
+ rpath="$finalize_rpath"
+ test "$mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
++ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+@@ -6071,6 +6072,7 @@ EOF
+ rpath=
+ hardcode_libdirs=
+ for libdir in $compile_rpath $finalize_rpath; do
++ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+@@ -6120,6 +6122,7 @@ EOF
+ rpath=
+ hardcode_libdirs=
+ for libdir in $finalize_rpath; do
++ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
diff --git a/SOURCES/gcc48-no-add-needed.patch b/SOURCES/gcc48-no-add-needed.patch
new file mode 100644
index 0000000..b6ca777
--- /dev/null
+++ b/SOURCES/gcc48-no-add-needed.patch
@@ -0,0 +1,50 @@
+2010-02-08 Roland McGrath
+
+ * config/rs6000/sysv4.h (LINK_EH_SPEC): Pass --no-add-needed to the
+ linker.
+ * config/gnu-user.h (LINK_EH_SPEC): Likewise.
+ * config/alpha/elf.h (LINK_EH_SPEC): Likewise.
+ * config/ia64/linux.h (LINK_EH_SPEC): Likewise.
+
+--- gcc/config/alpha/elf.h.jj 2011-01-03 12:52:31.118056764 +0100
++++ gcc/config/alpha/elf.h 2011-01-04 18:14:10.931874160 +0100
+@@ -165,5 +165,5 @@ extern int alpha_this_gpdisp_sequence_nu
+ I imagine that other systems will catch up. In the meantime, it
+ doesn't harm to make sure that the data exists to be used later. */
+ #if defined(HAVE_LD_EH_FRAME_HDR)
+-#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
++#define LINK_EH_SPEC "--no-add-needed %{!static:--eh-frame-hdr} "
+ #endif
+--- gcc/config/ia64/linux.h.jj 2011-01-03 13:02:11.462994522 +0100
++++ gcc/config/ia64/linux.h 2011-01-04 18:14:10.931874160 +0100
+@@ -77,7 +77,7 @@ do { \
+ Signalize that because we have fde-glibc, we don't need all C shared libs
+ linked against -lgcc_s. */
+ #undef LINK_EH_SPEC
+-#define LINK_EH_SPEC ""
++#define LINK_EH_SPEC "--no-add-needed "
+
+ /* Put all *tf routines in libgcc. */
+ #undef LIBGCC2_HAS_TF_MODE
+--- gcc/config/gnu-user.h.jj 2011-01-03 12:53:03.739057299 +0100
++++ gcc/config/gnu-user.h 2011-01-04 18:14:10.932814884 +0100
+@@ -82,7 +82,7 @@ see the files COPYING3 and COPYING.RUNTI
+ #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
+
+ #if defined(HAVE_LD_EH_FRAME_HDR)
+-#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
++#define LINK_EH_SPEC "--no-add-needed %{!static:--eh-frame-hdr} "
+ #endif
+
+ #undef LINK_GCC_C_SEQUENCE_SPEC
+--- gcc/config/rs6000/sysv4.h.jj 2011-01-03 13:02:18.255994215 +0100
++++ gcc/config/rs6000/sysv4.h 2011-01-04 18:14:10.933888871 +0100
+@@ -820,7 +820,7 @@ extern int fixuplabelno;
+ -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
+
+ #if defined(HAVE_LD_EH_FRAME_HDR)
+-# define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
++# define LINK_EH_SPEC "--no-add-needed %{!static:--eh-frame-hdr} "
+ #endif
+
+ #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
diff --git a/SOURCES/gcc48-ppc32-retaddr.patch b/SOURCES/gcc48-ppc32-retaddr.patch
new file mode 100644
index 0000000..e906dad
--- /dev/null
+++ b/SOURCES/gcc48-ppc32-retaddr.patch
@@ -0,0 +1,87 @@
+2005-11-28 Jakub Jelinek
+
+ * config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0,
+ read word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx
+ instead of doing an extran indirection from frame_pointer_rtx.
+
+ * gcc.dg/20051128-1.c: New test.
+
+--- gcc/config/rs6000/rs6000.c.jj 2005-11-26 14:38:01.000000000 +0100
++++ gcc/config/rs6000/rs6000.c 2005-11-28 20:32:18.000000000 +0100
+@@ -21423,18 +21423,22 @@ rs6000_return_addr (int count, rtx frame
+ if (count != 0
+ || ((DEFAULT_ABI == ABI_V4 || DEFAULT_ABI == ABI_DARWIN) && flag_pic))
+ {
++ rtx x;
+ cfun->machine->ra_needs_full_frame = 1;
+
+- return
+- gen_rtx_MEM
+- (Pmode,
+- memory_address
+- (Pmode,
+- plus_constant (Pmode,
+- copy_to_reg
+- (gen_rtx_MEM (Pmode,
+- memory_address (Pmode, frame))),
+- RETURN_ADDRESS_OFFSET)));
++ if (count == 0)
++ {
++ gcc_assert (frame == frame_pointer_rtx);
++ x = arg_pointer_rtx;
++ }
++ else
++ {
++ x = memory_address (Pmode, frame);
++ x = copy_to_reg (gen_rtx_MEM (Pmode, x));
++ }
++
++ x = plus_constant (Pmode, x, RETURN_ADDRESS_OFFSET);
++ return gen_rtx_MEM (Pmode, memory_address (Pmode, x));
+ }
+
+ cfun->machine->ra_need_lr = 1;
+--- gcc/testsuite/gcc.dg/20051128-1.c.jj 2005-10-10 11:21:41.096999000 +0200
++++ gcc/testsuite/gcc.dg/20051128-1.c 2005-11-28 12:30:57.000000000 +0100
+@@ -0,0 +1,41 @@
++/* { dg-do run } */
++/* { dg-options "-O2 -fpic" } */
++
++extern void exit (int);
++extern void abort (void);
++
++int b;
++
++struct A
++{
++ void *pad[147];
++ void *ra, *h;
++ long o;
++};
++
++void
++__attribute__((noinline))
++foo (struct A *a, void *x)
++{
++ __builtin_memset (a, 0, sizeof (a));
++ if (!b)
++ exit (0);
++}
++
++void
++__attribute__((noinline))
++bar (void)
++{
++ struct A a;
++
++ __builtin_unwind_init ();
++ foo (&a, __builtin_return_address (0));
++}
++
++int
++main (void)
++{
++ bar ();
++ abort ();
++ return 0;
++}
diff --git a/SOURCES/gcc48-pr28865.patch b/SOURCES/gcc48-pr28865.patch
new file mode 100644
index 0000000..8e07e94
--- /dev/null
+++ b/SOURCES/gcc48-pr28865.patch
@@ -0,0 +1,190 @@
+2014-01-16 Nick Clifton
+
+ PR middle-end/28865
+ * varasm.c (output_constant): Return the number of bytes actually
+ emitted.
+ (output_constructor_array_range): Update the field size with the
+ number of bytes emitted by output_constant.
+ (output_constructor_regular_field): Likewise. Also do not
+ complain if the total number of bytes emitted is now greater
+ than the expected fieldpos.
+ * output.h (output_constant): Update prototype and descriptive
+ comment.
+
+ * gcc.c-torture/compile/pr28865.c: New.
+ * gcc.c-torture/execute/pr28865.c: New.
+
+--- gcc/varasm.c (revision 206660)
++++ gcc/varasm.c (revision 206661)
+@@ -4474,8 +4474,10 @@ static unsigned HOST_WIDE_INT
+ This includes the pseudo-op such as ".int" or ".byte", and a newline.
+ Assumes output_addressed_constants has been done on EXP already.
+
+- Generate exactly SIZE bytes of assembler data, padding at the end
+- with zeros if necessary. SIZE must always be specified.
++ Generate at least SIZE bytes of assembler data, padding at the end
++ with zeros if necessary. SIZE must always be specified. The returned
++ value is the actual number of bytes of assembler data generated, which
++ may be bigger than SIZE if the object contains a variable length field.
+
+ SIZE is important for structure constructors,
+ since trailing members may have been omitted from the constructor.
+@@ -4490,14 +4492,14 @@ static unsigned HOST_WIDE_INT
+
+ ALIGN is the alignment of the data in bits. */
+
+-void
++unsigned HOST_WIDE_INT
+ output_constant (tree exp, unsigned HOST_WIDE_INT size, unsigned int align)
+ {
+ enum tree_code code;
+ unsigned HOST_WIDE_INT thissize;
+
+ if (size == 0 || flag_syntax_only)
+- return;
++ return size;
+
+ /* See if we're trying to initialize a pointer in a non-default mode
+ to the address of some declaration somewhere. If the target says
+@@ -4562,7 +4564,7 @@ output_constant (tree exp, unsigned HOST
+ && vec_safe_is_empty (CONSTRUCTOR_ELTS (exp)))
+ {
+ assemble_zeros (size);
+- return;
++ return size;
+ }
+
+ if (TREE_CODE (exp) == FDESC_EXPR)
+@@ -4574,7 +4576,7 @@ output_constant (tree exp, unsigned HOST
+ #else
+ gcc_unreachable ();
+ #endif
+- return;
++ return size;
+ }
+
+ /* Now output the underlying data. If we've handling the padding, return.
+@@ -4612,8 +4614,7 @@ output_constant (tree exp, unsigned HOST
+ switch (TREE_CODE (exp))
+ {
+ case CONSTRUCTOR:
+- output_constructor (exp, size, align, NULL);
+- return;
++ return output_constructor (exp, size, align, NULL);
+ case STRING_CST:
+ thissize = MIN ((unsigned HOST_WIDE_INT)TREE_STRING_LENGTH (exp),
+ size);
+@@ -4648,11 +4649,10 @@ output_constant (tree exp, unsigned HOST
+ case RECORD_TYPE:
+ case UNION_TYPE:
+ gcc_assert (TREE_CODE (exp) == CONSTRUCTOR);
+- output_constructor (exp, size, align, NULL);
+- return;
++ return output_constructor (exp, size, align, NULL);
+
+ case ERROR_MARK:
+- return;
++ return 0;
+
+ default:
+ gcc_unreachable ();
+@@ -4660,6 +4660,8 @@ output_constant (tree exp, unsigned HOST
+
+ if (size > thissize)
+ assemble_zeros (size - thissize);
++
++ return size;
+ }
+
+
+@@ -4759,7 +4761,7 @@ output_constructor_array_range (oc_local
+ if (local->val == NULL_TREE)
+ assemble_zeros (fieldsize);
+ else
+- output_constant (local->val, fieldsize, align2);
++ fieldsize = output_constant (local->val, fieldsize, align2);
+
+ /* Count its size. */
+ local->total_bytes += fieldsize;
+@@ -4808,9 +4810,8 @@ output_constructor_regular_field (oc_loc
+ Note no alignment needed in an array, since that is guaranteed
+ if each element has the proper size. */
+ if ((local->field != NULL_TREE || local->index != NULL_TREE)
+- && fieldpos != local->total_bytes)
++ && fieldpos > local->total_bytes)
+ {
+- gcc_assert (fieldpos >= local->total_bytes);
+ assemble_zeros (fieldpos - local->total_bytes);
+ local->total_bytes = fieldpos;
+ }
+@@ -4847,7 +4848,7 @@ output_constructor_regular_field (oc_loc
+ if (local->val == NULL_TREE)
+ assemble_zeros (fieldsize);
+ else
+- output_constant (local->val, fieldsize, align2);
++ fieldsize = output_constant (local->val, fieldsize, align2);
+
+ /* Count its size. */
+ local->total_bytes += fieldsize;
+--- gcc/output.h (revision 206660)
++++ gcc/output.h (revision 206661)
+@@ -294,11 +294,13 @@ extern void output_quoted_string (FILE *
+ This includes the pseudo-op such as ".int" or ".byte", and a newline.
+ Assumes output_addressed_constants has been done on EXP already.
+
+- Generate exactly SIZE bytes of assembler data, padding at the end
+- with zeros if necessary. SIZE must always be specified.
++ Generate at least SIZE bytes of assembler data, padding at the end
++ with zeros if necessary. SIZE must always be specified. The returned
++ value is the actual number of bytes of assembler data generated, which
++ may be bigger than SIZE if the object contains a variable length field.
+
+ ALIGN is the alignment in bits that may be assumed for the data. */
+-extern void output_constant (tree, unsigned HOST_WIDE_INT, unsigned int);
++extern unsigned HOST_WIDE_INT output_constant (tree, unsigned HOST_WIDE_INT, unsigned int);
+
+ /* When outputting delayed branch sequences, this rtx holds the
+ sequence being output. It is null when no delayed branch
+--- gcc/testsuite/gcc.c-torture/execute/pr28865.c (revision 0)
++++ gcc/testsuite/gcc.c-torture/execute/pr28865.c (revision 206661)
+@@ -0,0 +1,21 @@
++struct A { int a; char b[]; };
++union B { struct A a; char b[sizeof (struct A) + 31]; };
++union B b = { { 1, "123456789012345678901234567890" } };
++union B c = { { 2, "123456789012345678901234567890" } };
++
++__attribute__((noinline, noclone)) void
++foo (int *x[2])
++{
++ x[0] = &b.a.a;
++ x[1] = &c.a.a;
++}
++
++int
++main ()
++{
++ int *x[2];
++ foo (x);
++ if (*x[0] != 1 || *x[1] != 2)
++ __builtin_abort ();
++ return 0;
++}
+--- gcc/testsuite/gcc.c-torture/compile/pr28865.c (revision 0)
++++ gcc/testsuite/gcc.c-torture/compile/pr28865.c (revision 206661)
+@@ -0,0 +1,16 @@
++struct var_len
++{
++ int field1;
++ const char field2[];
++};
++
++/* Note - strictly speaking this array declaration is illegal
++ since each element has a variable length. GCC allows it
++ (for the moment) because it is used in existing code, such
++ as glibc. */
++static const struct var_len var_array[] =
++{
++ { 1, "Long exposure noise reduction" },
++ { 2, "Shutter/AE lock buttons" },
++ { 3, "Mirror lockup" }
++};
diff --git a/SOURCES/gcc48-pr38757.patch b/SOURCES/gcc48-pr38757.patch
new file mode 100644
index 0000000..4206584
--- /dev/null
+++ b/SOURCES/gcc48-pr38757.patch
@@ -0,0 +1,106 @@
+2009-03-18 Jakub Jelinek
+
+ PR debug/38757
+ * langhooks.h (struct lang_hooks): Add source_language langhook.
+ * langhooks-def.h (LANG_HOOKS_SOURCE_LANGUAGE): Define to NULL.
+ (LANG_HOOKS_INITIALIZER): Add LANG_HOOKS_SOURCE_LANGUAGE.
+ * dwarf2out.c (add_prototyped_attribute): Add DW_AT_prototype
+ also for DW_LANG_{C,C99,ObjC}.
+ (gen_compile_unit_die): Use lang_hooks.source_language () to
+ determine if DW_LANG_C99 or DW_LANG_C89 should be returned.
+c/
+ * c-lang.c (c_source_language): New function.
+ (LANG_HOOKS_SOURCE_LANGUAGE): Define.
+
+--- gcc/langhooks.h.jj 2011-01-03 12:53:05.125745450 +0100
++++ gcc/langhooks.h 2011-01-04 17:59:43.166744926 +0100
+@@ -467,6 +467,10 @@ struct lang_hooks
+ gimplification. */
+ bool deep_unsharing;
+
++ /* Return year of the source language standard version if the FE supports
++ multiple versions of the standard. */
++ int (*source_language) (void);
++
+ /* Whenever you add entries here, make sure you adjust langhooks-def.h
+ and langhooks.c accordingly. */
+ };
+--- gcc/langhooks-def.h.jj 2011-01-03 12:53:05.000000000 +0100
++++ gcc/langhooks-def.h 2011-01-04 18:00:44.858851030 +0100
+@@ -118,6 +118,7 @@ extern void lhd_omp_firstprivatize_type_
+ #define LANG_HOOKS_BLOCK_MAY_FALLTHRU hook_bool_const_tree_true
+ #define LANG_HOOKS_EH_USE_CXA_END_CLEANUP false
+ #define LANG_HOOKS_DEEP_UNSHARING false
++#define LANG_HOOKS_SOURCE_LANGUAGE NULL
+
+ /* Attribute hooks. */
+ #define LANG_HOOKS_ATTRIBUTE_TABLE NULL
+@@ -303,7 +304,8 @@ extern void lhd_end_section (void);
+ LANG_HOOKS_EH_PROTECT_CLEANUP_ACTIONS, \
+ LANG_HOOKS_BLOCK_MAY_FALLTHRU, \
+ LANG_HOOKS_EH_USE_CXA_END_CLEANUP, \
+- LANG_HOOKS_DEEP_UNSHARING \
++ LANG_HOOKS_DEEP_UNSHARING, \
++ LANG_HOOKS_SOURCE_LANGUAGE \
+ }
+
+ #endif /* GCC_LANG_HOOKS_DEF_H */
+--- gcc/c/c-lang.c.jj 2011-01-03 12:53:05.376056936 +0100
++++ gcc/c/c-lang.c 2011-01-04 17:59:43.167743798 +0100
+@@ -36,6 +36,12 @@ along with GCC; see the file COPYING3.
+
+ enum c_language_kind c_language = clk_c;
+
++static int
++c_source_language (void)
++{
++ return flag_isoc99 ? 1999 : 1989;
++}
++
+ /* Lang hooks common to C and ObjC are declared in c-objc-common.h;
+ consequently, there should be very few hooks below. */
+
+@@ -45,6 +51,8 @@ enum c_language_kind c_language = clk_c;
+ #define LANG_HOOKS_INIT c_objc_common_init
+ #undef LANG_HOOKS_INIT_TS
+ #define LANG_HOOKS_INIT_TS c_common_init_ts
++#undef LANG_HOOKS_SOURCE_LANGUAGE
++#define LANG_HOOKS_SOURCE_LANGUAGE c_source_language
+
+ /* Each front end provides its own lang hook initializer. */
+ struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
+--- gcc/dwarf2out.c.jj 2011-01-03 12:53:05.102056475 +0100
++++ gcc/dwarf2out.c 2011-01-04 18:03:14.534151763 +0100
+@@ -16109,9 +16109,18 @@ add_bit_size_attribute (dw_die_ref die,
+ static inline void
+ add_prototyped_attribute (dw_die_ref die, tree func_type)
+ {
+- if (get_AT_unsigned (comp_unit_die (), DW_AT_language) == DW_LANG_C89
+- && prototype_p (func_type))
+- add_AT_flag (die, DW_AT_prototyped, 1);
++ switch (get_AT_unsigned (comp_unit_die (), DW_AT_language))
++ {
++ case DW_LANG_C:
++ case DW_LANG_C89:
++ case DW_LANG_C99:
++ case DW_LANG_ObjC:
++ if (prototype_p (func_type))
++ add_AT_flag (die, DW_AT_prototyped, 1);
++ break;
++ default:
++ break;
++ }
+ }
+
+ /* Add an 'abstract_origin' attribute below a given DIE. The DIE is found
+@@ -18915,6 +18924,10 @@ gen_compile_unit_die (const char *filena
+ if (strcmp (language_string, "GNU Go") == 0)
+ language = DW_LANG_Go;
+ }
++ else if (strcmp (language_string, "GNU C") == 0
++ && lang_hooks.source_language
++ && lang_hooks.source_language () >= 1999)
++ language = DW_LANG_C99;
+ }
+ /* Use a degraded Fortran setting in strict DWARF2 so is_fortran works. */
+ else if (strcmp (language_string, "GNU Fortran") == 0)
diff --git a/SOURCES/gcc48-pr52714.patch b/SOURCES/gcc48-pr52714.patch
new file mode 100644
index 0000000..2ea553d
--- /dev/null
+++ b/SOURCES/gcc48-pr52714.patch
@@ -0,0 +1,76 @@
+2014-02-27 Jeff Law
+
+ PR rtl-optimization/52714
+ * combine.c (try_combine): When splitting an unrecognized PARALLEL
+ into two independent simple sets, if I3 is a jump, ensure the
+ pattern we place into I3 is a (set (pc) ...)
+
+ * gcc.c-torture/compile/pr52714.c: New test.
+
+2016-06-15 Jakub Jelinek
+
+ * gcc.c-torture/compile/20160615-1.c: New test.
+
+--- gcc/combine.c (revision 208203)
++++ gcc/combine.c (revision 208204)
+@@ -3706,6 +3706,9 @@ try_combine (rtx i3, rtx i2, rtx i1, rtx
+ #ifdef HAVE_cc0
+ && !reg_referenced_p (cc0_rtx, XVECEXP (newpat, 0, 0))
+ #endif
++ /* If I3 is a jump, ensure that set0 is a jump so that
++ we do not create invalid RTL. */
++ && (!JUMP_P (i3) || SET_DEST (XVECEXP (newpat, 0, 0)) == pc_rtx)
+ )
+ {
+ newi2pat = XVECEXP (newpat, 0, 1);
+@@ -3716,6 +3719,9 @@ try_combine (rtx i3, rtx i2, rtx i1, rtx
+ #ifdef HAVE_cc0
+ && !reg_referenced_p (cc0_rtx, XVECEXP (newpat, 0, 1))
+ #endif
++ /* If I3 is a jump, ensure that set1 is a jump so that
++ we do not create invalid RTL. */
++ && (!JUMP_P (i3) || SET_DEST (XVECEXP (newpat, 0, 1)) == pc_rtx)
+ )
+ {
+ newi2pat = XVECEXP (newpat, 0, 0);
+--- gcc/testsuite/gcc.c-torture/compile/pr52714.c (revision 0)
++++ gcc/testsuite/gcc.c-torture/compile/pr52714.c (revision 208204)
+@@ -0,0 +1,25 @@
++
++int __re_compile_fastmap(unsigned char *p)
++{
++ unsigned char **stack;
++ unsigned size;
++ unsigned avail;
++
++ stack = __builtin_alloca(5 * sizeof(unsigned char*));
++ if (stack == 0)
++ return -2;
++ size = 5;
++ avail = 0;
++
++ for (;;) {
++ switch (*p++) {
++ case 0:
++ if (avail == size)
++ return -2;
++ stack[avail++] = p;
++ }
++ }
++
++ return 0;
++}
++
+--- gcc/testsuite/gcc.c-torture/compile/20160615-1.c.jj 2016-06-15 11:17:54.690689056 +0200
++++ gcc/testsuite/gcc.c-torture/compile/20160615-1.c 2016-06-15 11:17:48.811765657 +0200
+@@ -0,0 +1,10 @@
++int a;
++void bar (int, unsigned, unsigned);
++
++void
++foo (unsigned x)
++{
++ unsigned b = a ? x : 0;
++ if (x || b)
++ bar (0, x, b);
++}
diff --git a/SOURCES/gcc48-pr53477.patch b/SOURCES/gcc48-pr53477.patch
new file mode 100644
index 0000000..70d5d56
--- /dev/null
+++ b/SOURCES/gcc48-pr53477.patch
@@ -0,0 +1,131 @@
+2013-08-20 Phil Muldoon
+
+ PR libstdc++/53477
+ http://sourceware.org/bugzilla/show_bug.cgi?id=15195
+
+ * python/libstdcxx/v6/printers.py (Printer.__call__): If a value
+ is a reference, fetch referenced value.
+ (RxPrinter.invoke): Ditto.
+ * testsuite/libstdc++-prettyprinters/cxx11.cc (main): Add -O0
+ flag. Add referenced value tests.
+
+--- libstdc++-v3/python/libstdcxx/v6/printers.py (revision 201887)
++++ libstdc++-v3/python/libstdcxx/v6/printers.py (revision 201888)
+@@ -786,6 +786,11 @@ class RxPrinter(object):
+ def invoke(self, value):
+ if not self.enabled:
+ return None
++
++ if value.type.code == gdb.TYPE_CODE_REF:
++ if hasattr(gdb.Value,"referenced_value"):
++ value = value.referenced_value()
++
+ return self.function(self.name, value)
+
+ # A pretty-printer that conforms to the "PrettyPrinter" protocol from
+@@ -841,6 +846,11 @@ class Printer(object):
+ return None
+
+ basename = match.group(1)
++
++ if val.type.code == gdb.TYPE_CODE_REF:
++ if hasattr(gdb.Value,"referenced_value"):
++ val = val.referenced_value()
++
+ if basename in self.lookup:
+ return self.lookup[basename].invoke(val)
+
+--- libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc (revision 201887)
++++ libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc (revision 201888)
+@@ -1,5 +1,5 @@
+ // { dg-do run }
+-// { dg-options "-std=gnu++11 -g" }
++// { dg-options "-std=gnu++11 -g -O0" }
+
+ // Copyright (C) 2011-2013 Free Software Foundation, Inc.
+ //
+@@ -24,6 +24,8 @@
+ #include
+ #include
+
++typedef std::tuple ExTuple;
++
+ template
+ void
+ placeholder(const T &s)
+@@ -62,43 +64,75 @@ main()
+ std::forward_list efl;
+ // { dg-final { note-test efl "empty std::forward_list" } }
+
++ std::forward_list &refl = efl;
++// { dg-final { note-test refl "empty std::forward_list" } }
++
+ std::forward_list fl;
+ fl.push_front(2);
+ fl.push_front(1);
+ // { dg-final { note-test fl {std::forward_list = {[0] = 1, [1] = 2}} } }
+
++ std::forward_list &rfl = fl;
++// { dg-final { note-test rfl {std::forward_list = {[0] = 1, [1] = 2}} } }
++
+ std::unordered_map eum;
+ // { dg-final { note-test eum "std::unordered_map with 0 elements" } }
++ std::unordered_map &reum = eum;
++// { dg-final { note-test reum "std::unordered_map with 0 elements" } }
++
+ std::unordered_multimap eumm;
+ // { dg-final { note-test eumm "std::unordered_multimap with 0 elements" } }
++ std::unordered_multimap &reumm = eumm;
++// { dg-final { note-test reumm "std::unordered_multimap with 0 elements" } }
++
+ std::unordered_set eus;
+ // { dg-final { note-test eus "std::unordered_set with 0 elements" } }
++ std::unordered_set &reus = eus;
++// { dg-final { note-test reus "std::unordered_set with 0 elements" } }
++
+ std::unordered_multiset eums;
+ // { dg-final { note-test eums "std::unordered_multiset with 0 elements" } }
++ std::unordered_multiset &reums = eums;
++// { dg-final { note-test reums "std::unordered_multiset with 0 elements" } }
+
+ std::unordered_map uom;
+ uom[5] = "three";
+ uom[3] = "seven";
+ // { dg-final { note-test uom {std::unordered_map with 2 elements = {[3] = "seven", [5] = "three"}} } }
+
++ std::unordered_map &ruom = uom;
++// { dg-final { note-test ruom {std::unordered_map with 2 elements = {[3] = "seven", [5] = "three"}} } }
++
+ std::unordered_multimap uomm;
+ uomm.insert(std::pair (5, "three"));
+ uomm.insert(std::pair (5, "seven"));
+ // { dg-final { note-test uomm {std::unordered_multimap with 2 elements = {[5] = "seven", [5] = "three"}} } }
++ std::unordered_multimap &ruomm = uomm;
++// { dg-final { note-test ruomm {std::unordered_multimap with 2 elements = {[5] = "seven", [5] = "three"}} } }
+
+ std::unordered_set uos;
+ uos.insert(5);
+ // { dg-final { note-test uos {std::unordered_set with 1 elements = {[0] = 5}} } }
++ std::unordered_set &ruos = uos;
++// { dg-final { note-test ruos {std::unordered_set with 1 elements = {[0] = 5}} } }
+
+ std::unordered_multiset uoms;
+ uoms.insert(5);
+ // { dg-final { note-test uoms {std::unordered_multiset with 1 elements = {[0] = 5}} } }
++ std::unordered_multiset &ruoms = uoms;
++// { dg-final { note-test ruoms {std::unordered_multiset with 1 elements = {[0] = 5}} } }
+
+ std::unique_ptr uptr (new datum);
+ uptr->s = "hi bob";
+ uptr->i = 23;
+ // { dg-final { regexp-test uptr {std::unique_ptr.datum. containing 0x.*} } }
++ std::unique_ptr &ruptr = uptr;
++// { dg-final { regexp-test ruptr {std::unique_ptr.datum. containing 0x.*} } }
+
++ ExTuple tpl(6,7);
++// { dg-final { note-test tpl {std::tuple containing = {[1] = 6, [2] = 7}} } }
++ ExTuple &rtpl = tpl;
++// { dg-final { note-test rtpl {std::tuple containing = {[1] = 6, [2] = 7}} } }
+ placeholder(""); // Mark SPOT
+ use(efl);
+ use(fl);
diff --git a/SOURCES/gcc48-pr53658.patch b/SOURCES/gcc48-pr53658.patch
new file mode 100644
index 0000000..cafc8bd
--- /dev/null
+++ b/SOURCES/gcc48-pr53658.patch
@@ -0,0 +1,26 @@
+2013-06-07 Paolo Carlini
+
+ PR c++/53658
+ * pt.c (lookup_template_class_1): Consistently use TYPE_MAIN_DECL,
+ not TYPE_STUB_DECL, to access the _DECL for a _TYPE.
+
+--- gcc/cp/pt.c
++++ gcc/cp/pt.c
+@@ -7561,7 +7561,7 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context,
+ if (CLASS_TYPE_P (template_type) && is_dependent_type)
+ /* If the type makes use of template parameters, the
+ code that generates debugging information will crash. */
+- DECL_IGNORED_P (TYPE_STUB_DECL (t)) = 1;
++ DECL_IGNORED_P (TYPE_MAIN_DECL (t)) = 1;
+
+ /* Possibly limit visibility based on template args. */
+ TREE_PUBLIC (type_decl) = 1;
+--- /dev/null
++++ gcc/testsuite/g++.dg/cpp0x/alias-decl-36.C
+@@ -0,0 +1,6 @@
++// PR c++/53658
++// { dg-do compile { target c++11 } }
++
++struct A;
++template using Foo = const A;
++template Foo - bar();
diff --git a/SOURCES/gcc48-pr56564.patch b/SOURCES/gcc48-pr56564.patch
new file mode 100644
index 0000000..d81e02d
--- /dev/null
+++ b/SOURCES/gcc48-pr56564.patch
@@ -0,0 +1,654 @@
+2013-06-19 Igor Zamyatin
+
+ * gcc.dg/tree-ssa/loop-19.c: Add -fno-common.
+
+2013-06-12 Jakub Jelinek
+
+ PR target/56564
+ * varasm.c (decl_binds_to_current_def_p): Call binds_local_p
+ target hook even for !TREE_PUBLIC decls. If no resolution info
+ is available, return false for common and external decls.
+
+ * gcc.target/i386/pr56564-1.c: Skip on darwin, mingw and cygwin.
+ * gcc.target/i386/pr56564-3.c: Likewise.
+
+2013-06-11 Jakub Jelinek
+
+ PR target/56564
+ * varasm.c (get_variable_align): Move #endif to the right place.
+
+2013-06-10 Jakub Jelinek
+
+ PR target/56564
+ * varasm.c (align_variable): Don't use DATA_ALIGNMENT or
+ CONSTANT_ALIGNMENT if !decl_binds_to_current_def_p (decl).
+ Use DATA_ABI_ALIGNMENT for that case instead if defined.
+ (get_variable_align): New function.
+ (get_variable_section, emit_bss, emit_common,
+ assemble_variable_contents, place_block_symbol): Use
+ get_variable_align instead of DECL_ALIGN.
+ (assemble_noswitch_variable): Add align argument, use it
+ instead of DECL_ALIGN.
+ (assemble_variable): Adjust caller. Use get_variable_align
+ instead of DECL_ALIGN.
+ * config/i386/i386.h (DATA_ALIGNMENT): Adjust x86_data_alignment
+ caller.
+ (DATA_ABI_ALIGNMENT): Define.
+ * config/i386/i386-protos.h (x86_data_alignment): Adjust prototype.
+ * config/i386/i386.c (x86_data_alignment): Add opt argument. If
+ opt is false, only return the psABI mandated alignment increase.
+ * config/c6x/c6x.h (DATA_ALIGNMENT): Renamed to...
+ (DATA_ABI_ALIGNMENT): ... this.
+ * config/mmix/mmix.h (DATA_ALIGNMENT): Renamed to...
+ (DATA_ABI_ALIGNMENT): ... this.
+ * config/mmix/mmix.c (mmix_data_alignment): Adjust function comment.
+ * config/s390/s390.h (DATA_ALIGNMENT): Renamed to...
+ (DATA_ABI_ALIGNMENT): ... this.
+ * doc/tm.texi.in (DATA_ABI_ALIGNMENT): Document.
+ * doc/tm.texi: Regenerated.
+
+ * gcc.target/i386/pr56564-1.c: New test.
+ * gcc.target/i386/pr56564-2.c: New test.
+ * gcc.target/i386/pr56564-3.c: New test.
+ * gcc.target/i386/pr56564-4.c: New test.
+ * gcc.target/i386/avx256-unaligned-load-4.c: Add -fno-common.
+ * gcc.target/i386/avx256-unaligned-store-1.c: Likewise.
+ * gcc.target/i386/avx256-unaligned-store-3.c: Likewise.
+ * gcc.target/i386/avx256-unaligned-store-4.c: Likewise.
+ * gcc.target/i386/vect-sizes-1.c: Likewise.
+ * gcc.target/i386/memcpy-1.c: Likewise.
+ * gcc.dg/vect/costmodel/i386/costmodel-vect-31.c (tmp): Initialize.
+ * gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c (tmp): Likewise.
+
+--- gcc/doc/tm.texi.in (revision 199897)
++++ gcc/doc/tm.texi.in (revision 199898)
+@@ -1062,6 +1062,15 @@ arrays to be word-aligned so that @code{
+ constants to character arrays can be done inline.
+ @end defmac
+
++@defmac DATA_ABI_ALIGNMENT (@var{type}, @var{basic-align})
++Similar to @code{DATA_ALIGNMENT}, but for the cases where the ABI mandates
++some alignment increase, instead of optimization only purposes. E.g.@
++AMD x86-64 psABI says that variables with array type larger than 15 bytes
++must be aligned to 16 byte boundaries.
++
++If this macro is not defined, then @var{basic-align} is used.
++@end defmac
++
+ @defmac CONSTANT_ALIGNMENT (@var{constant}, @var{basic-align})
+ If defined, a C expression to compute the alignment given to a constant
+ that is being placed in memory. @var{constant} is the constant and
+--- gcc/doc/tm.texi (revision 199897)
++++ gcc/doc/tm.texi (revision 199898)
+@@ -1078,6 +1078,15 @@ arrays to be word-aligned so that @code{
+ constants to character arrays can be done inline.
+ @end defmac
+
++@defmac DATA_ABI_ALIGNMENT (@var{type}, @var{basic-align})
++Similar to @code{DATA_ALIGNMENT}, but for the cases where the ABI mandates
++some alignment increase, instead of optimization only purposes. E.g.@
++AMD x86-64 psABI says that variables with array type larger than 15 bytes
++must be aligned to 16 byte boundaries.
++
++If this macro is not defined, then @var{basic-align} is used.
++@end defmac
++
+ @defmac CONSTANT_ALIGNMENT (@var{constant}, @var{basic-align})
+ If defined, a C expression to compute the alignment given to a constant
+ that is being placed in memory. @var{constant} is the constant and
+--- gcc/varasm.c (revision 199897)
++++ gcc/varasm.c (revision 199984)
+@@ -966,13 +966,80 @@ align_variable (tree decl, bool dont_out
+ align = MAX_OFILE_ALIGNMENT;
+ }
+
+- /* On some machines, it is good to increase alignment sometimes. */
+ if (! DECL_USER_ALIGN (decl))
+ {
++#ifdef DATA_ABI_ALIGNMENT
++ unsigned int data_abi_align
++ = DATA_ABI_ALIGNMENT (TREE_TYPE (decl), align);
++ /* For backwards compatibility, don't assume the ABI alignment for
++ TLS variables. */
++ if (! DECL_THREAD_LOCAL_P (decl) || data_abi_align <= BITS_PER_WORD)
++ align = data_abi_align;
++#endif
++
++ /* On some machines, it is good to increase alignment sometimes.
++ But as DECL_ALIGN is used both for actually emitting the variable
++ and for code accessing the variable as guaranteed alignment, we
++ can only increase the alignment if it is a performance optimization
++ if the references to it must bind to the current definition. */
++ if (decl_binds_to_current_def_p (decl))
++ {
++#ifdef DATA_ALIGNMENT
++ unsigned int data_align = DATA_ALIGNMENT (TREE_TYPE (decl), align);
++ /* Don't increase alignment too much for TLS variables - TLS space
++ is too precious. */
++ if (! DECL_THREAD_LOCAL_P (decl) || data_align <= BITS_PER_WORD)
++ align = data_align;
++#endif
++#ifdef CONSTANT_ALIGNMENT
++ if (DECL_INITIAL (decl) != 0
++ && DECL_INITIAL (decl) != error_mark_node)
++ {
++ unsigned int const_align
++ = CONSTANT_ALIGNMENT (DECL_INITIAL (decl), align);
++ /* Don't increase alignment too much for TLS variables - TLS
++ space is too precious. */
++ if (! DECL_THREAD_LOCAL_P (decl) || const_align <= BITS_PER_WORD)
++ align = const_align;
++ }
++#endif
++ }
++ }
++
++ /* Reset the alignment in case we have made it tighter, so we can benefit
++ from it in get_pointer_alignment. */
++ DECL_ALIGN (decl) = align;
++}
++
++/* Return DECL_ALIGN (decl), possibly increased for optimization purposes
++ beyond what align_variable returned. */
++
++static unsigned int
++get_variable_align (tree decl)
++{
++ unsigned int align = DECL_ALIGN (decl);
++
++ /* For user aligned vars or static vars align_variable already did
++ everything. */
++ if (DECL_USER_ALIGN (decl) || !TREE_PUBLIC (decl))
++ return align;
++
++#ifdef DATA_ABI_ALIGNMENT
++ if (DECL_THREAD_LOCAL_P (decl))
++ align = DATA_ABI_ALIGNMENT (TREE_TYPE (decl), align);
++#endif
++
++ /* For decls that bind to the current definition, align_variable
++ did also everything, except for not assuming ABI required alignment
++ of TLS variables. For other vars, increase the alignment here
++ as an optimization. */
++ if (!decl_binds_to_current_def_p (decl))
++ {
++ /* On some machines, it is good to increase alignment sometimes. */
+ #ifdef DATA_ALIGNMENT
+ unsigned int data_align = DATA_ALIGNMENT (TREE_TYPE (decl), align);
+ /* Don't increase alignment too much for TLS variables - TLS space
+- is too precious. */
++ is too precious. */
+ if (! DECL_THREAD_LOCAL_P (decl) || data_align <= BITS_PER_WORD)
+ align = data_align;
+ #endif
+@@ -989,9 +1056,7 @@ align_variable (tree decl, bool dont_out
+ #endif
+ }
+
+- /* Reset the alignment in case we have made it tighter, so we can benefit
+- from it in get_pointer_alignment. */
+- DECL_ALIGN (decl) = align;
++ return align;
+ }
+
+ /* Return the section into which the given VAR_DECL or CONST_DECL
+@@ -1043,7 +1108,8 @@ get_variable_section (tree decl, bool pr
+ return bss_noswitch_section;
+ }
+
+- return targetm.asm_out.select_section (decl, reloc, DECL_ALIGN (decl));
++ return targetm.asm_out.select_section (decl, reloc,
++ get_variable_align (decl));
+ }
+
+ /* Return the block into which object_block DECL should be placed. */
+@@ -1780,7 +1846,8 @@ emit_bss (tree decl ATTRIBUTE_UNUSED,
+ unsigned HOST_WIDE_INT rounded ATTRIBUTE_UNUSED)
+ {
+ #if defined ASM_OUTPUT_ALIGNED_BSS
+- ASM_OUTPUT_ALIGNED_BSS (asm_out_file, decl, name, size, DECL_ALIGN (decl));
++ ASM_OUTPUT_ALIGNED_BSS (asm_out_file, decl, name, size,
++ get_variable_align (decl));
+ return true;
+ #endif
+ }
+@@ -1796,10 +1863,11 @@ emit_common (tree decl ATTRIBUTE_UNUSED,
+ {
+ #if defined ASM_OUTPUT_ALIGNED_DECL_COMMON
+ ASM_OUTPUT_ALIGNED_DECL_COMMON (asm_out_file, decl, name,
+- size, DECL_ALIGN (decl));
++ size, get_variable_align (decl));
+ return true;
+ #elif defined ASM_OUTPUT_ALIGNED_COMMON
+- ASM_OUTPUT_ALIGNED_COMMON (asm_out_file, name, size, DECL_ALIGN (decl));
++ ASM_OUTPUT_ALIGNED_COMMON (asm_out_file, name, size,
++ get_variable_align (decl));
+ return true;
+ #else
+ ASM_OUTPUT_COMMON (asm_out_file, name, size, rounded);
+@@ -1828,7 +1896,8 @@ emit_tls_common (tree decl ATTRIBUTE_UNU
+ NAME is the name of DECL's SYMBOL_REF. */
+
+ static void
+-assemble_noswitch_variable (tree decl, const char *name, section *sect)
++assemble_noswitch_variable (tree decl, const char *name, section *sect,
++ unsigned int align)
+ {
+ unsigned HOST_WIDE_INT size, rounded;
+
+@@ -1850,7 +1919,7 @@ assemble_noswitch_variable (tree decl, c
+ * (BIGGEST_ALIGNMENT / BITS_PER_UNIT));
+
+ if (!sect->noswitch.callback (decl, name, size, rounded)
+- && (unsigned HOST_WIDE_INT) DECL_ALIGN_UNIT (decl) > rounded)
++ && (unsigned HOST_WIDE_INT) (align / BITS_PER_UNIT) > rounded)
+ warning (0, "requested alignment for %q+D is greater than "
+ "implemented alignment of %wu", decl, rounded);
+ }
+@@ -1880,7 +1949,7 @@ assemble_variable_contents (tree decl, c
+ /* Output the actual data. */
+ output_constant (DECL_INITIAL (decl),
+ tree_low_cst (DECL_SIZE_UNIT (decl), 1),
+- DECL_ALIGN (decl));
++ get_variable_align (decl));
+ else
+ /* Leave space for it. */
+ assemble_zeros (tree_low_cst (DECL_SIZE_UNIT (decl), 1));
+@@ -1904,6 +1973,7 @@ assemble_variable (tree decl, int top_le
+ const char *name;
+ rtx decl_rtl, symbol;
+ section *sect;
++ unsigned int align;
+ bool asan_protected = false;
+
+ /* This function is supposed to handle VARIABLES. Ensure we have one. */
+@@ -2003,6 +2073,8 @@ assemble_variable (tree decl, int top_le
+
+ set_mem_align (decl_rtl, DECL_ALIGN (decl));
+
++ align = get_variable_align (decl);
++
+ if (TREE_PUBLIC (decl))
+ maybe_assemble_visibility (decl);
+
+@@ -2032,12 +2104,12 @@ assemble_variable (tree decl, int top_le
+ place_block_symbol (symbol);
+ }
+ else if (SECTION_STYLE (sect) == SECTION_NOSWITCH)
+- assemble_noswitch_variable (decl, name, sect);
++ assemble_noswitch_variable (decl, name, sect, align);
+ else
+ {
+ switch_to_section (sect);
+- if (DECL_ALIGN (decl) > BITS_PER_UNIT)
+- ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (DECL_ALIGN_UNIT (decl)));
++ if (align > BITS_PER_UNIT)
++ ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (align / BITS_PER_UNIT));
+ assemble_variable_contents (decl, name, dont_output_data);
+ if (asan_protected)
+ {
+@@ -6709,10 +6781,10 @@ bool
+ decl_binds_to_current_def_p (tree decl)
+ {
+ gcc_assert (DECL_P (decl));
+- if (!TREE_PUBLIC (decl))
+- return true;
+ if (!targetm.binds_local_p (decl))
+ return false;
++ if (!TREE_PUBLIC (decl))
++ return true;
+ /* When resolution is available, just use it. */
+ if (TREE_CODE (decl) == VAR_DECL
+ && (TREE_STATIC (decl) || DECL_EXTERNAL (decl)))
+@@ -6730,10 +6802,20 @@ decl_binds_to_current_def_p (tree decl)
+ return resolution_to_local_definition_p (node->symbol.resolution);
+ }
+ /* Otherwise we have to assume the worst for DECL_WEAK (hidden weaks
+- binds locally but still can be overwritten).
++ binds locally but still can be overwritten), DECL_COMMON (can be merged
++ with a non-common definition somewhere in the same module) or
++ DECL_EXTERNAL.
+ This rely on fact that binds_local_p behave as decl_replaceable_p
+ for all other declaration types. */
+- return !DECL_WEAK (decl);
++ if (DECL_WEAK (decl))
++ return false;
++ if (DECL_COMMON (decl)
++ && (DECL_INITIAL (decl) == NULL
++ || DECL_INITIAL (decl) == error_mark_node))
++ return false;
++ if (DECL_EXTERNAL (decl))
++ return false;
++ return true;
+ }
+
+ /* A replaceable function or variable is one which may be replaced
+@@ -6959,7 +7041,7 @@ place_block_symbol (rtx symbol)
+ else
+ {
+ decl = SYMBOL_REF_DECL (symbol);
+- alignment = DECL_ALIGN (decl);
++ alignment = get_variable_align (decl);
+ size = tree_low_cst (DECL_SIZE_UNIT (decl), 1);
+ if (flag_asan && asan_protect_global (decl))
+ {
+--- gcc/config/s390/s390.h (revision 199897)
++++ gcc/config/s390/s390.h (revision 199898)
+@@ -221,7 +221,7 @@ enum processor_flags
+
+ /* Alignment on even addresses for LARL instruction. */
+ #define CONSTANT_ALIGNMENT(EXP, ALIGN) (ALIGN) < 16 ? 16 : (ALIGN)
+-#define DATA_ALIGNMENT(TYPE, ALIGN) (ALIGN) < 16 ? 16 : (ALIGN)
++#define DATA_ABI_ALIGNMENT(TYPE, ALIGN) (ALIGN) < 16 ? 16 : (ALIGN)
+
+ /* Alignment is not required by the hardware. */
+ #define STRICT_ALIGNMENT 0
+--- gcc/config/i386/i386.h (revision 199897)
++++ gcc/config/i386/i386.h (revision 199898)
+@@ -859,7 +859,18 @@ enum target_cpu_default
+ cause character arrays to be word-aligned so that `strcpy' calls
+ that copy constants to character arrays can be done inline. */
+
+-#define DATA_ALIGNMENT(TYPE, ALIGN) ix86_data_alignment ((TYPE), (ALIGN))
++#define DATA_ALIGNMENT(TYPE, ALIGN) \
++ ix86_data_alignment ((TYPE), (ALIGN), true)
++
++/* Similar to DATA_ALIGNMENT, but for the cases where the ABI mandates
++ some alignment increase, instead of optimization only purposes. E.g.
++ AMD x86-64 psABI says that variables with array type larger than 15 bytes
++ must be aligned to 16 byte boundaries.
++
++ If this macro is not defined, then ALIGN is used. */
++
++#define DATA_ABI_ALIGNMENT(TYPE, ALIGN) \
++ ix86_data_alignment ((TYPE), (ALIGN), false)
+
+ /* If defined, a C expression to compute the alignment for a local
+ variable. TYPE is the data type, and ALIGN is the alignment that
+--- gcc/config/i386/i386-protos.h (revision 199897)
++++ gcc/config/i386/i386-protos.h (revision 199898)
+@@ -207,7 +207,7 @@ extern void init_cumulative_args (CUMULA
+ #endif /* RTX_CODE */
+
+ #ifdef TREE_CODE
+-extern int ix86_data_alignment (tree, int);
++extern int ix86_data_alignment (tree, int, bool);
+ extern unsigned int ix86_local_alignment (tree, enum machine_mode,
+ unsigned int);
+ extern unsigned int ix86_minimum_alignment (tree, enum machine_mode,
+--- gcc/config/i386/i386.c (revision 199897)
++++ gcc/config/i386/i386.c (revision 199898)
+@@ -25292,12 +25292,13 @@ ix86_constant_alignment (tree exp, int a
+ instead of that alignment to align the object. */
+
+ int
+-ix86_data_alignment (tree type, int align)
++ix86_data_alignment (tree type, int align, bool opt)
+ {
+ int max_align
+ = optimize_size ? BITS_PER_WORD : MIN (256, MAX_OFILE_ALIGNMENT);
+
+- if (AGGREGATE_TYPE_P (type)
++ if (opt
++ && AGGREGATE_TYPE_P (type)
+ && TYPE_SIZE (type)
+ && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
+ && (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= (unsigned) max_align
+@@ -25309,14 +25310,17 @@ ix86_data_alignment (tree type, int alig
+ to 16byte boundary. */
+ if (TARGET_64BIT)
+ {
+- if (AGGREGATE_TYPE_P (type)
+- && TYPE_SIZE (type)
+- && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
+- && (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= 128
+- || TREE_INT_CST_HIGH (TYPE_SIZE (type))) && align < 128)
++ if ((opt ? AGGREGATE_TYPE_P (type) : TREE_CODE (type) == ARRAY_TYPE)
++ && TYPE_SIZE (type)
++ && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
++ && (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= 128
++ || TREE_INT_CST_HIGH (TYPE_SIZE (type))) && align < 128)
+ return 128;
+ }
+
++ if (!opt)
++ return align;
++
+ if (TREE_CODE (type) == ARRAY_TYPE)
+ {
+ if (TYPE_MODE (TREE_TYPE (type)) == DFmode && align < 64)
+--- gcc/config/c6x/c6x.h (revision 199897)
++++ gcc/config/c6x/c6x.h (revision 199898)
+@@ -134,7 +134,7 @@ extern c6x_cpu_t c6x_arch;
+ Really only externally visible arrays must be aligned this way, as
+ only those are directly visible from another compilation unit. But
+ we don't have that information available here. */
+-#define DATA_ALIGNMENT(TYPE, ALIGN) \
++#define DATA_ABI_ALIGNMENT(TYPE, ALIGN) \
+ (((ALIGN) < BITS_PER_UNIT * 8 && TREE_CODE (TYPE) == ARRAY_TYPE) \
+ ? BITS_PER_UNIT * 8 : (ALIGN))
+
+--- gcc/config/mmix/mmix.h (revision 199897)
++++ gcc/config/mmix/mmix.h (revision 199898)
+@@ -164,7 +164,7 @@ struct GTY(()) machine_function
+ /* Copied from elfos.h. */
+ #define MAX_OFILE_ALIGNMENT (32768 * 8)
+
+-#define DATA_ALIGNMENT(TYPE, BASIC_ALIGN) \
++#define DATA_ABI_ALIGNMENT(TYPE, BASIC_ALIGN) \
+ mmix_data_alignment (TYPE, BASIC_ALIGN)
+
+ #define CONSTANT_ALIGNMENT(CONSTANT, BASIC_ALIGN) \
+--- gcc/config/mmix/mmix.c (revision 199897)
++++ gcc/config/mmix/mmix.c (revision 199898)
+@@ -313,7 +313,7 @@ mmix_init_machine_status (void)
+ return ggc_alloc_cleared_machine_function ();
+ }
+
+-/* DATA_ALIGNMENT.
++/* DATA_ABI_ALIGNMENT.
+ We have trouble getting the address of stuff that is located at other
+ than 32-bit alignments (GETA requirements), so try to give everything
+ at least 32-bit alignment. */
+--- gcc/testsuite/gcc.target/i386/memcpy-1.c (revision 199897)
++++ gcc/testsuite/gcc.target/i386/memcpy-1.c (revision 199898)
+@@ -1,6 +1,6 @@
+ /* { dg-do compile } */
+ /* { dg-require-effective-target ia32 } */
+-/* { dg-options "-O2 -march=pentiumpro -minline-all-stringops" } */
++/* { dg-options "-O2 -march=pentiumpro -minline-all-stringops -fno-common" } */
+ /* { dg-final { scan-assembler "rep" } } */
+ /* { dg-final { scan-assembler "movs" } } */
+ /* { dg-final { scan-assembler-not "test" } } */
+--- gcc/testsuite/gcc.target/i386/vect-sizes-1.c (revision 199897)
++++ gcc/testsuite/gcc.target/i386/vect-sizes-1.c (revision 199898)
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O3 -ffast-math -mavx -mtune=generic" } */
++/* { dg-options "-O3 -ffast-math -mavx -mtune=generic -fno-common" } */
+
+ double a[1024];
+
+--- gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c (revision 199897)
++++ gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c (revision 199898)
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O3 -dp -mavx -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store" } */
++/* { dg-options "-O3 -dp -mavx -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store -fno-common" } */
+
+ #define N 1024
+
+--- gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c (revision 199897)
++++ gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c (revision 199898)
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store" } */
++/* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store -fno-common" } */
+
+ #define N 1024
+
+--- gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c (revision 199897)
++++ gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c (revision 199898)
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store -mtune=generic" } */
++/* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store -mtune=generic -fno-common" } */
+
+ #define N 1024
+
+--- gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c (revision 199897)
++++ gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c (revision 199898)
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O3 -dp -mavx -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store" } */
++/* { dg-options "-O3 -dp -mavx -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store -fno-common" } */
+
+ #define N 1024
+
+--- gcc/testsuite/gcc.target/i386/pr56564-1.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/pr56564-1.c (revision 199985)
+@@ -0,0 +1,26 @@
++/* PR target/56564 */
++/* { dg-do compile { target { fpic && lp64 } } } */
++/* { dg-skip-if "No symbol interposition for PIC" { *-*-mingw* *-*-cygwin* *-*-darwin* } } */
++/* { dg-options "-O3 -fpic -fdump-tree-optimized" } */
++
++struct S { long a, b; } s = { 5, 6 };
++char t[16] = { 7 };
++
++int
++foo (void)
++{
++ return ((__UINTPTR_TYPE__) &s) & 15;
++}
++
++int
++bar (void)
++{
++ return ((__UINTPTR_TYPE__) &t[0]) & 15;
++}
++
++/* { dg-final { scan-tree-dump-times "&s" 1 "optimized" } } */
++/* { dg-final { scan-tree-dump-times "&t" 0 "optimized" } } */
++/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
++/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
++/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
++/* { dg-final { cleanup-tree-dump "optimized" } } */
+--- gcc/testsuite/gcc.target/i386/pr56564-2.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/pr56564-2.c (revision 199898)
+@@ -0,0 +1,25 @@
++/* PR target/56564 */
++/* { dg-do compile { target { *-*-linux* && lp64 } } } */
++/* { dg-options "-O3 -fno-pic -fdump-tree-optimized" } */
++
++struct S { long a, b; } s = { 5, 6 };
++char t[16] = { 7 };
++
++int
++foo (void)
++{
++ return ((__UINTPTR_TYPE__) &s) & 15;
++}
++
++int
++bar (void)
++{
++ return ((__UINTPTR_TYPE__) &t[0]) & 15;
++}
++
++/* { dg-final { scan-tree-dump-times "&s" 0 "optimized" } } */
++/* { dg-final { scan-tree-dump-times "&t" 0 "optimized" } } */
++/* { dg-final { scan-tree-dump-times "return 0" 2 "optimized" } } */
++/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
++/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
++/* { dg-final { cleanup-tree-dump "optimized" } } */
+--- gcc/testsuite/gcc.target/i386/pr56564-3.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/pr56564-3.c (revision 199985)
+@@ -0,0 +1,29 @@
++/* PR target/56564 */
++/* { dg-do compile { target { fpic && lp64 } } } */
++/* { dg-skip-if "No symbol interposition for PIC" { *-*-mingw* *-*-cygwin* *-*-darwin* } } */
++/* { dg-options "-O3 -fpic -fdump-tree-optimized" } */
++
++__thread struct S { long a, b; } s = { 5, 6 };
++__thread char t[16] = { 7 };
++
++int
++foo (void)
++{
++ return ((__UINTPTR_TYPE__) &s) & 15;
++}
++
++/* For backwards compatibility we don't assume that t must
++ be aligned to 16 bytes, but align it anyway. */
++
++int
++bar (void)
++{
++ return ((__UINTPTR_TYPE__) &t[0]) & 15;
++}
++
++/* { dg-final { scan-tree-dump-times "&s" 1 "optimized" } } */
++/* { dg-final { scan-tree-dump-times "&t" 1 "optimized" } } */
++/* { dg-final { scan-tree-dump-times "return 0" 0 "optimized" } } */
++/* { dg-final { scan-assembler-not ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
++/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
++/* { dg-final { cleanup-tree-dump "optimized" } } */
+--- gcc/testsuite/gcc.target/i386/pr56564-4.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/pr56564-4.c (revision 199898)
+@@ -0,0 +1,22 @@
++/* PR target/56564 */
++/* { dg-do compile { target { *-*-linux* && lp64 } } } */
++/* { dg-options "-O3 -fno-pic -fdump-tree-optimized" } */
++
++__thread struct S { long a, b; } s = { 5, 6 };
++__thread char t[16] = { 7 };
++
++int
++foo (void)
++{
++ return ((__UINTPTR_TYPE__) &s) & 15;
++}
++
++int
++bar (void)
++{
++ return ((__UINTPTR_TYPE__) &t[0]) & 15;
++}
++
++/* { dg-final { scan-assembler-not ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
++/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
++/* { dg-final { cleanup-tree-dump "optimized" } } */
+--- gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-31.c (revision 199897)
++++ gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-31.c (revision 199898)
+@@ -18,7 +18,7 @@ struct s{
+ struct t e; /* unaligned (offset 2N+4N+4 B) */
+ };
+
+-struct s tmp;
++struct s tmp = { 1 };
+
+ int main1 ()
+ {
+--- gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c (revision 199897)
++++ gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c (revision 199898)
+@@ -18,7 +18,7 @@ struct s{
+ struct t e; /* unaligned (offset 2N+4N+4 B) */
+ };
+
+-struct s tmp;
++struct s tmp = { 1 };
+
+ int main1 ()
+ {
+--- gcc/testsuite/gcc.dg/tree-ssa/loop-19.c (revision 200212)
++++ gcc/testsuite/gcc.dg/tree-ssa/loop-19.c (revision 200213)
+@@ -6,7 +6,7 @@
+
+ /* { dg-do compile { target { i?86-*-* || { x86_64-*-* || powerpc_hard_double } } } } */
+ /* { dg-require-effective-target nonpic } */
+-/* { dg-options "-O3 -fno-tree-loop-distribute-patterns -fno-prefetch-loop-arrays -fdump-tree-optimized" } */
++/* { dg-options "-O3 -fno-tree-loop-distribute-patterns -fno-prefetch-loop-arrays -fdump-tree-optimized -fno-common" } */
+
+ # define N 2000000
+ double a[N],c[N];
diff --git a/SOURCES/gcc48-pr60010.patch b/SOURCES/gcc48-pr60010.patch
new file mode 100644
index 0000000..0baa553
--- /dev/null
+++ b/SOURCES/gcc48-pr60010.patch
@@ -0,0 +1,16 @@
+2014-02-14 Kyle McMartin
+
+ PR pch/60010
+ * config/host-linux.c (TRY_EMPTY_VM_SPACE): Define for AArch64.
+
+--- gcc/config/host-linux.c (revision 207784)
++++ gcc/config/host-linux.c (revision 207785)
+@@ -86,6 +86,8 @@
+ # define TRY_EMPTY_VM_SPACE 0x60000000
+ #elif defined(__mc68000__)
+ # define TRY_EMPTY_VM_SPACE 0x40000000
++#elif defined(__aarch64__)
++# define TRY_EMPTY_VM_SPACE 0x1000000000
+ #elif defined(__ARM_EABI__)
+ # define TRY_EMPTY_VM_SPACE 0x60000000
+ #elif defined(__mips__) && defined(__LP64__)
diff --git a/SOURCES/gcc48-pr60784.patch b/SOURCES/gcc48-pr60784.patch
new file mode 100644
index 0000000..4cfc3a7
--- /dev/null
+++ b/SOURCES/gcc48-pr60784.patch
@@ -0,0 +1,46 @@
+2014-05-02 Marek Polacek
+
+ PR c/60784
+ * c-typeck.c (push_init_level): Set constructor_designated to
+ p->designated for structures.
+
+--- gcc/c/c-typeck.c
++++ gcc/c/c-typeck.c
+@@ -7270,6 +7270,9 @@ push_init_level (int implicit, struct obstack * braced_init_obstack)
+ push_member_name (constructor_fields);
+ constructor_depth++;
+ }
++ /* If upper initializer is designated, then mark this as
++ designated too to prevent bogus warnings. */
++ constructor_designated = p->designated;
+ }
+ else if (TREE_CODE (constructor_type) == ARRAY_TYPE)
+ {
+--- /dev/null
++++ gcc/testsuite/gcc.dg/pr60784.c
+@@ -0,0 +1,25 @@
++/* PR c/60784 */
++/* { dg-do compile } */
++/* { dg-options "-Wextra -std=c99" } */
++
++struct A { int i, j; };
++struct B { struct A a; } b1 = { .a.i = 1, .a.j = 1 };
++struct B b2 = { .a.i = 1 };
++
++struct C { struct { int a, b; }; } c1 = { .a = 4, .b = 2 };
++struct C c2 = { .a = 4, .b = 2 };
++
++struct D { struct A a; };
++struct E { struct D d; };
++struct F { struct E e; } f1 = { .e.d.a.i = 8 };
++struct F f2 = { .e.d.a.i = 8, .e.d.a.j = 3 };
++
++struct G {
++ struct {
++ struct {
++ struct {
++ int a, b, c, d, e, f;
++ };
++ };
++ };
++} g = { .b = 2 };
diff --git a/SOURCES/gcc48-pr62258.patch b/SOURCES/gcc48-pr62258.patch
new file mode 100644
index 0000000..4589214
--- /dev/null
+++ b/SOURCES/gcc48-pr62258.patch
@@ -0,0 +1,87 @@
+2015-09-03 Jonathan Wakely
+
+ Backport from mainline
+ 2015-04-27 Dmitry Prokoptsev
+ Michael Hanselmann
+
+ PR libstdc++/62258
+ * libsupc++/eh_ptr.cc (rethrow_exception): Increment count of
+ uncaught exceptions.
+ * testsuite/18_support/exception_ptr/62258.cc: New.
+
+--- libstdc++-v3/libsupc++/eh_ptr.cc (revision 227455)
++++ libstdc++-v3/libsupc++/eh_ptr.cc (revision 227456)
+@@ -245,6 +245,9 @@ std::rethrow_exception(std::exception_pt
+ __GXX_INIT_DEPENDENT_EXCEPTION_CLASS(dep->unwindHeader.exception_class);
+ dep->unwindHeader.exception_cleanup = __gxx_dependent_exception_cleanup;
+
++ __cxa_eh_globals *globals = __cxa_get_globals ();
++ globals->uncaughtExceptions += 1;
++
+ #ifdef _GLIBCXX_SJLJ_EXCEPTIONS
+ _Unwind_SjLj_RaiseException (&dep->unwindHeader);
+ #else
+--- libstdc++-v3/testsuite/18_support/exception_ptr/62258.cc (revision 0)
++++ libstdc++-v3/testsuite/18_support/exception_ptr/62258.cc (revision 227456)
+@@ -0,0 +1,61 @@
++// { dg-options "-std=gnu++11" }
++// { dg-require-atomic-builtins "" }
++
++// Copyright (C) 2015 Free Software Foundation, Inc.
++//
++// This file is part of the GNU ISO C++ Library. This library 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 library 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 library; see the file COPYING3. If not see
++// .
++
++// PR libstdc++/62258
++
++#include
++#include
++
++struct check_on_destruct
++{
++ ~check_on_destruct();
++};
++
++check_on_destruct::~check_on_destruct()
++{
++ VERIFY(std::uncaught_exception());
++}
++
++int main ()
++{
++ VERIFY(!std::uncaught_exception());
++
++ try
++ {
++ check_on_destruct check;
++
++ try
++ {
++ throw 1;
++ }
++ catch (...)
++ {
++ VERIFY(!std::uncaught_exception());
++
++ std::rethrow_exception(std::current_exception());
++ }
++ }
++ catch (...)
++ {
++ VERIFY(!std::uncaught_exception());
++ }
++
++ VERIFY(!std::uncaught_exception());
++}
diff --git a/SOURCES/gcc48-pr63293.patch b/SOURCES/gcc48-pr63293.patch
new file mode 100644
index 0000000..4b11a8c
--- /dev/null
+++ b/SOURCES/gcc48-pr63293.patch
@@ -0,0 +1,60 @@
+2014-11-04 Jiong Wang
+ Wilco Dijkstra
+
+ PR target/63293
+ * config/aarch64/aarch64.c (aarch64_expand_epiloue): Add barriers before
+ stack adjustment.
+
+--- gcc/config/aarch64/aarch64.c (revision 217090)
++++ gcc/config/aarch64/aarch64.c (revision 217091)
+@@ -1989,6 +1989,9 @@ aarch64_expand_epilogue (bool for_sibcal
+ rtx insn;
+ rtx cfa_reg;
+ rtx cfi_ops = NULL;
++ /* We need to add memory barrier to prevent read from deallocated stack. */
++ bool need_barrier_p = (get_frame_size () != 0
++ || cfun->machine->saved_varargs_size);
+
+ aarch64_layout_frame ();
+ original_frame_size = get_frame_size () + cfun->machine->saved_varargs_size;
+@@ -2030,6 +2033,9 @@ aarch64_expand_epilogue (bool for_sibcal
+ if (frame_pointer_needed
+ && (crtl->outgoing_args_size || cfun->calls_alloca))
+ {
++ if (cfun->calls_alloca)
++ emit_insn (gen_stack_tie (stack_pointer_rtx, stack_pointer_rtx));
++
+ insn = emit_insn (gen_add3_insn (stack_pointer_rtx,
+ hard_frame_pointer_rtx,
+ GEN_INT (- fp_offset)));
+@@ -2048,6 +2054,9 @@ aarch64_expand_epilogue (bool for_sibcal
+ /* Restore the frame pointer and lr if the frame pointer is needed. */
+ if (offset > 0)
+ {
++ if (need_barrier_p && (!frame_pointer_needed || !fp_offset))
++ emit_insn (gen_stack_tie (stack_pointer_rtx, stack_pointer_rtx));
++
+ if (frame_pointer_needed)
+ {
+ rtx mem_fp, mem_lr;
+@@ -2067,6 +2076,10 @@ aarch64_expand_epilogue (bool for_sibcal
+ + UNITS_PER_WORD));
+ emit_insn (gen_load_pairdi (reg_fp, mem_fp, reg_lr, mem_lr));
+
++ if (need_barrier_p)
++ emit_insn (gen_stack_tie (stack_pointer_rtx,
++ stack_pointer_rtx));
++
+ insn = emit_insn (gen_add2_insn (stack_pointer_rtx,
+ GEN_INT (offset)));
+ }
+@@ -2128,6 +2141,9 @@ aarch64_expand_epilogue (bool for_sibcal
+
+ if (frame_size > -1)
+ {
++ if (need_barrier_p)
++ emit_insn (gen_stack_tie (stack_pointer_rtx, stack_pointer_rtx));
++
+ if (frame_size >= 0x1000000)
+ {
+ rtx op0 = gen_rtx_REG (Pmode, IP0_REGNUM);
diff --git a/SOURCES/gcc48-pr63442.patch b/SOURCES/gcc48-pr63442.patch
new file mode 100644
index 0000000..8073c89
--- /dev/null
+++ b/SOURCES/gcc48-pr63442.patch
@@ -0,0 +1,16 @@
+2014-10-27 Jiong Wang
+
+ PR target/63442
+ * optabs.c (prepare_cmp_insn): Use "ret_mode" instead of "word_mode".
+
+--- gcc/optabs.c
++++ gcc/optabs.c
+@@ -4294,7 +4294,7 @@ prepare_cmp_insn (rtx x, rtx y, enum rtx_code comparison, rtx size,
+ y = const0_rtx;
+ }
+
+- *pmode = word_mode;
++ *pmode = ret_mode;
+ prepare_cmp_insn (x, y, comparison, NULL_RTX, unsignedp, methods,
+ ptest, pmode);
+ }
diff --git a/SOURCES/gcc48-pr63567-1.patch b/SOURCES/gcc48-pr63567-1.patch
new file mode 100644
index 0000000..b5e7bc5
--- /dev/null
+++ b/SOURCES/gcc48-pr63567-1.patch
@@ -0,0 +1,52 @@
+2014-10-17 Marek Polacek
+
+ PR c/63567
+ * c-typeck.c (digest_init): Allow initializing objects with static
+ storage duration with compound literals even in C99 and add pedwarn
+ for it.
+
+--- gcc/c/c-typeck.c
++++ gcc/c/c-typeck.c
+@@ -6683,13 +6683,15 @@ digest_init (location_t init_loc, tree type, tree init, tree origtype,
+ inside_init = convert (type, inside_init);
+
+ if (require_constant
+- && (code == VECTOR_TYPE || !flag_isoc99)
+ && TREE_CODE (inside_init) == COMPOUND_LITERAL_EXPR)
+ {
+ /* As an extension, allow initializing objects with static storage
+ duration with compound literals (which are then treated just as
+ the brace enclosed list they contain). Also allow this for
+ vectors, as we can only assign them with compound literals. */
++ if (flag_isoc99 && code != VECTOR_TYPE)
++ pedwarn_init (init_loc, OPT_Wpedantic, "initializer element "
++ "is not constant");
+ tree decl = COMPOUND_LITERAL_EXPR_DECL (inside_init);
+ inside_init = DECL_INITIAL (decl);
+ }
+--- /dev/null
++++ gcc/testsuite/gcc.dg/pr63567-1.c
+@@ -0,0 +1,10 @@
++/* PR c/63567 */
++/* { dg-do compile } */
++/* { dg-options "" } */
++
++/* Allow initializing objects with static storage duration with
++ compound literals even. This is being used in Linux kernel. */
++
++struct T { int i; };
++struct S { struct T t; };
++static struct S s = (struct S) { .t = { 42 } };
+--- /dev/null
++++ gcc/testsuite/gcc.dg/pr63567-2.c
+@@ -0,0 +1,10 @@
++/* PR c/63567 */
++/* { dg-do compile } */
++/* { dg-options "-pedantic -std=gnu99" } */
++
++/* Allow initializing objects with static storage duration with
++ compound literals. This is being used in Linux kernel. */
++
++struct T { int i; };
++struct S { struct T t; };
++static struct S s = (struct S) { .t = { 42 } }; /* { dg-warning "initializer element is not constant" } */
diff --git a/SOURCES/gcc48-pr63567-2.patch b/SOURCES/gcc48-pr63567-2.patch
new file mode 100644
index 0000000..610771c
--- /dev/null
+++ b/SOURCES/gcc48-pr63567-2.patch
@@ -0,0 +1,45 @@
+2014-10-19 Marek Polacek
+
+ PR c/63567
+ * c-typeck.c (output_init_element): Allow initializing objects with
+ static storage duration with compound literals even in C99 and add
+ pedwarn for it.
+
+--- gcc/c/c-typeck.c
++++ gcc/c/c-typeck.c
+@@ -8251,11 +8251,14 @@ output_init_element (location_t loc, tree value, tree origtype,
+ value = array_to_pointer_conversion (input_location, value);
+
+ if (TREE_CODE (value) == COMPOUND_LITERAL_EXPR
+- && require_constant_value && !flag_isoc99 && pending)
++ && require_constant_value && pending)
+ {
+ /* As an extension, allow initializing objects with static storage
+ duration with compound literals (which are then treated just as
+ the brace enclosed list they contain). */
++ if (flag_isoc99)
++ pedwarn_init (input_location, OPT_Wpedantic, "initializer element is not "
++ "constant");
+ tree decl = COMPOUND_LITERAL_EXPR_DECL (value);
+ value = DECL_INITIAL (decl);
+ }
+--- /dev/null
++++ gcc/testsuite/gcc.dg/pr63567-3.c
+@@ -0,0 +1,7 @@
++/* PR c/63567 */
++/* { dg-do compile } */
++/* { dg-options "" } */
++
++struct T { int i; };
++struct S { struct T t; };
++struct S s = { .t = { (int) { 1 } } };
+--- /dev/null
++++ gcc/testsuite/gcc.dg/pr63567-4.c
+@@ -0,0 +1,7 @@
++/* PR c/63567 */
++/* { dg-do compile } */
++/* { dg-options "-Wpedantic -std=gnu99" } */
++
++struct T { int i; };
++struct S { struct T t; };
++struct S s = { .t = { (int) { 1 } } }; /* { dg-warning "initializer element is not constant|initialization" } */
diff --git a/SOURCES/gcc48-pr65142.patch b/SOURCES/gcc48-pr65142.patch
new file mode 100644
index 0000000..367ec16
--- /dev/null
+++ b/SOURCES/gcc48-pr65142.patch
@@ -0,0 +1,23 @@
+2016-06-01 Jakub Jelinek
+
+ Backported from mainline
+ 2015-10-02 Jonathan Wakely
+
+ PR libstdc++/65142
+ * src/c++11/random.cc (random_device::_M_getval()): Check read result.
+
+--- libstdc++-v3/src/c++11/random.cc (revision 228423)
++++ libstdc++-v3/src/c++11/random.cc (revision 228424)
+@@ -126,8 +126,10 @@ namespace std _GLIBCXX_VISIBILITY(defaul
+ #endif
+
+ result_type __ret;
+- std::fread(reinterpret_cast(&__ret), sizeof(result_type),
+- 1, _M_file);
++ const size_t e = std::fread(reinterpret_cast(&__ret),
++ sizeof(result_type), 1, _M_file);
++ if (e != 1)
++ std::__throw_runtime_error(__N("random_device could not be read"));
+ return __ret;
+ }
+
diff --git a/SOURCES/gcc48-pr66731.patch b/SOURCES/gcc48-pr66731.patch
new file mode 100644
index 0000000..daf20b3
--- /dev/null
+++ b/SOURCES/gcc48-pr66731.patch
@@ -0,0 +1,111 @@
+2015-08-04 Szabolcs Nagy
+
+ Backport from mainline:
+ 2015-07-06 Szabolcs Nagy
+
+ PR target/66731
+ * config/aarch64/aarch64.md (fnmul3): Handle -frounding-math.
+
+ * gcc.target/aarch64/fnmul-1.c: New.
+ * gcc.target/aarch64/fnmul-2.c: New.
+ * gcc.target/aarch64/fnmul-3.c: New.
+ * gcc.target/aarch64/fnmul-4.c: New.
+
+--- gcc/config/aarch64/aarch64.md (revision 226591)
++++ gcc/config/aarch64/aarch64.md (revision 226592)
+@@ -3101,6 +3101,17 @@
+ (mult:GPF
+ (neg:GPF (match_operand:GPF 1 "register_operand" "w"))
+ (match_operand:GPF 2 "register_operand" "w")))]
++ "TARGET_FLOAT && !flag_rounding_math"
++ "fnmul\\t%
0, %1, %2"
++ [(set_attr "v8type" "fmul")
++ (set_attr "mode" "")]
++)
++
++(define_insn "*fnmul3"
++ [(set (match_operand:GPF 0 "register_operand" "=w")
++ (neg:GPF (mult:GPF
++ (match_operand:GPF 1 "register_operand" "w")
++ (match_operand:GPF 2 "register_operand" "w"))))]
+ "TARGET_FLOAT"
+ "fnmul\\t%0, %1, %2"
+ [(set_attr "v8type" "fmul")
+--- gcc/testsuite/gcc.target/aarch64/fnmul-1.c (nonexistent)
++++ gcc/testsuite/gcc.target/aarch64/fnmul-1.c (revision 226592)
+@@ -0,0 +1,16 @@
++/* { dg-do compile } */
++/* { dg-options "-O2" } */
++
++double
++foo_d (double a, double b)
++{
++ /* { dg-final { scan-assembler "fnmul\\td\[0-9\]+, d\[0-9\]+, d\[0-9\]+" } } */
++ return -a * b;
++}
++
++float
++foo_s (float a, float b)
++{
++ /* { dg-final { scan-assembler "fnmul\\ts\[0-9\]+, s\[0-9\]+, s\[0-9\]+" } } */
++ return -a * b;
++}
+--- gcc/testsuite/gcc.target/aarch64/fnmul-2.c (nonexistent)
++++ gcc/testsuite/gcc.target/aarch64/fnmul-2.c (revision 226592)
+@@ -0,0 +1,18 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -frounding-math" } */
++
++double
++foo_d (double a, double b)
++{
++ /* { dg-final { scan-assembler "fneg\\td\[0-9\]+, d\[0-9\]+" } } */
++ /* { dg-final { scan-assembler "fmul\\td\[0-9\]+, d\[0-9\]+, d\[0-9\]+" } } */
++ return -a * b;
++}
++
++float
++foo_s (float a, float b)
++{
++ /* { dg-final { scan-assembler "fneg\\ts\[0-9\]+, s\[0-9\]+" } } */
++ /* { dg-final { scan-assembler "fmul\\ts\[0-9\]+, s\[0-9\]+, s\[0-9\]+" } } */
++ return -a * b;
++}
+--- gcc/testsuite/gcc.target/aarch64/fnmul-3.c (nonexistent)
++++ gcc/testsuite/gcc.target/aarch64/fnmul-3.c (revision 226592)
+@@ -0,0 +1,16 @@
++/* { dg-do compile } */
++/* { dg-options "-O2" } */
++
++double
++foo_d (double a, double b)
++{
++ /* { dg-final { scan-assembler "fnmul\\td\[0-9\]+, d\[0-9\]+, d\[0-9\]+" } } */
++ return -(a * b);
++}
++
++float
++foo_s (float a, float b)
++{
++ /* { dg-final { scan-assembler "fnmul\\ts\[0-9\]+, s\[0-9\]+, s\[0-9\]+" } } */
++ return -(a * b);
++}
+--- gcc/testsuite/gcc.target/aarch64/fnmul-4.c (nonexistent)
++++ gcc/testsuite/gcc.target/aarch64/fnmul-4.c (revision 226592)
+@@ -0,0 +1,16 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -frounding-math" } */
++
++double
++foo_d (double a, double b)
++{
++ /* { dg-final { scan-assembler "fnmul\\td\[0-9\]+, d\[0-9\]+, d\[0-9\]+" } } */
++ return -(a * b);
++}
++
++float
++foo_s (float a, float b)
++{
++ /* { dg-final { scan-assembler "fnmul\\ts\[0-9\]+, s\[0-9\]+, s\[0-9\]+" } } */
++ return -(a * b);
++}
diff --git a/SOURCES/gcc48-pr66840.patch b/SOURCES/gcc48-pr66840.patch
new file mode 100644
index 0000000..721ee03
--- /dev/null
+++ b/SOURCES/gcc48-pr66840.patch
@@ -0,0 +1,16 @@
+2015-07-14 Matthias Klose
+
+ PR target/66840
+ * config/rs6000/t-rs6000 (TM_H): Add rs6000-cpus.def.
+
+diff -Nrup a/gcc/config/rs6000/t-rs6000 b/gcc/config/rs6000/t-rs6000
+--- /gcc/config/rs6000/t-rs6000 2013-08-14 05:55:11.000000000 -0600
++++ gcc/config/rs6000/t-rs6000 2018-04-18 12:09:30.614737081 -0600
+@@ -19,6 +19,7 @@
+ # .
+
+ TM_H += $(srcdir)/config/rs6000/rs6000-builtin.def
++TM_H += $(srcdir)/config/rs6000/rs6000-cpus.def
+
+ rs6000.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
+ $(RTL_H) $(REGS_H) hard-reg-set.h \
diff --git a/SOURCES/gcc48-pr67281.patch b/SOURCES/gcc48-pr67281.patch
new file mode 100644
index 0000000..9637e08
--- /dev/null
+++ b/SOURCES/gcc48-pr67281.patch
@@ -0,0 +1,348 @@
+2015-10-14 Peter Bergner
+ Torvald Riegel
+
+ PR target/67281
+ * config/rs6000/htm.md (UNSPEC_HTM_FENCE): New.
+ (tabort, tabortc, tabortci, tbegin, tcheck, tend,
+ trechkpt, treclaim, tsr, ttest): Rename define_insns from this...
+ (*tabort, *tabortc, *tabortci, *tbegin, *tcheck, *tend,
+ *trechkpt, *treclaim, *tsr, *ttest): ...to this. Add memory barrier.
+ (tabort, tabortc, tabortci, tbegin, tcheck, tend,
+ trechkpt, treclaim, tsr, ttest): New define_expands.
+ * config/rs6000/rs6000-c.c (rs6000_target_modify_macros): Define
+ __TM_FENCE__ for htm.
+ * doc/extend.texi: Update documentation for htm builtins.
+
+2015-08-03 Peter Bergner
+
+ * config/rs6000/htm.md (tabort.): Restrict the source operand to
+ using a base register.
+
+ * gcc.target/powerpc/htm-tabort-no-r0.c: New test.
+
+--- gcc/doc/extend.texi (revision 228826)
++++ gcc/doc/extend.texi (revision 228827)
+@@ -16092,6 +16092,28 @@ unsigned int __builtin_tresume (void)
+ unsigned int __builtin_tsuspend (void)
+ @end smallexample
+
++Note that the semantics of the above HTM builtins are required to mimic
++the locking semantics used for critical sections. Builtins that are used
++to create a new transaction or restart a suspended transaction must have
++lock acquisition like semantics while those builtins that end or suspend a
++transaction must have lock release like semantics. Specifically, this must
++mimic lock semantics as specified by C++11, for example: Lock acquisition is
++as-if an execution of __atomic_exchange_n(&globallock,1,__ATOMIC_ACQUIRE)
++that returns 0, and lock release is as-if an execution of
++__atomic_store(&globallock,0,__ATOMIC_RELEASE), with globallock being an
++implicit implementation-defined lock used for all transactions. The HTM
++instructions associated with with the builtins inherently provide the
++correct acquisition and release hardware barriers required. However,
++the compiler must also be prohibited from moving loads and stores across
++the builtins in a way that would violate their semantics. This has been
++accomplished by adding memory barriers to the associated HTM instructions
++(which is a conservative approach to provide acquire and release semantics).
++Earlier versions of the compiler did not treat the HTM instructions as
++memory barriers. A @code{__TM_FENCE__} macro has been added, which can
++be used to determine whether the current compiler treats HTM instructions
++as memory barriers or not. This allows the user to explicitly add memory
++barriers to their code when using an older version of the compiler.
++
+ The following set of built-in functions are available to gain access
+ to the HTM specific special purpose registers.
+
+--- gcc/config/rs6000/htm.md (revision 226531)
++++ gcc/config/rs6000/htm.md (revision 228827)
+@@ -27,6 +27,14 @@ (define_constants
+ ])
+
+ ;;
++;; UNSPEC usage
++;;
++
++(define_c_enum "unspec"
++ [UNSPEC_HTM_FENCE
++ ])
++
++;;
+ ;; UNSPEC_VOLATILE usage
+ ;;
+
+@@ -45,96 +53,223 @@ (define_c_enum "unspecv"
+ UNSPECV_HTM_MTSPR
+ ])
+
++(define_expand "tabort"
++ [(parallel
++ [(set (match_operand:CC 1 "cc_reg_operand" "=x")
++ (unspec_volatile:CC [(match_operand:SI 0 "base_reg_operand" "b")]
++ UNSPECV_HTM_TABORT))
++ (set (match_dup 2) (unspec:BLK [(match_dup 2)] UNSPEC_HTM_FENCE))])]
++ "TARGET_HTM"
++{
++ operands[2] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[2]) = 1;
++})
+
+-(define_insn "tabort"
++(define_insn "*tabort"
+ [(set (match_operand:CC 1 "cc_reg_operand" "=x")
+- (unspec_volatile:CC [(match_operand:SI 0 "gpc_reg_operand" "r")]
+- UNSPECV_HTM_TABORT))]
++ (unspec_volatile:CC [(match_operand:SI 0 "base_reg_operand" "b")]
++ UNSPECV_HTM_TABORT))
++ (set (match_operand:BLK 2) (unspec:BLK [(match_dup 2)] UNSPEC_HTM_FENCE))]
+ "TARGET_HTM"
+ "tabort. %0"
+ [(set_attr "type" "htm")
+ (set_attr "length" "4")])
+
+-(define_insn "tabortc"
++(define_expand "tabortc"
++ [(parallel
++ [(set (match_operand:CC 3 "cc_reg_operand" "=x")
++ (unspec_volatile:CC [(match_operand 0 "u5bit_cint_operand" "n")
++ (match_operand:GPR 1 "gpc_reg_operand" "r")
++ (match_operand:GPR 2 "gpc_reg_operand" "r")]
++ UNSPECV_HTM_TABORTXC))
++ (set (match_dup 4) (unspec:BLK [(match_dup 4)] UNSPEC_HTM_FENCE))])]
++ "TARGET_HTM"
++{
++ operands[4] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[4]) = 1;
++})
++
++(define_insn "*tabortc"
+ [(set (match_operand:CC 3 "cc_reg_operand" "=x")
+ (unspec_volatile:CC [(match_operand 0 "u5bit_cint_operand" "n")
+ (match_operand:GPR 1 "gpc_reg_operand" "r")
+ (match_operand:GPR 2 "gpc_reg_operand" "r")]
+- UNSPECV_HTM_TABORTXC))]
++ UNSPECV_HTM_TABORTXC))
++ (set (match_operand:BLK 4) (unspec:BLK [(match_dup 4)] UNSPEC_HTM_FENCE))]
+ "TARGET_HTM"
+ "tabortc. %0,%1,%2"
+ [(set_attr "type" "htm")
+ (set_attr "length" "4")])
+
+-(define_insn "tabortci"
++(define_expand "tabortci"
++ [(parallel
++ [(set (match_operand:CC 3 "cc_reg_operand" "=x")
++ (unspec_volatile:CC [(match_operand 0 "u5bit_cint_operand" "n")
++ (match_operand:GPR 1 "gpc_reg_operand" "r")
++ (match_operand 2 "s5bit_cint_operand" "n")]
++ UNSPECV_HTM_TABORTXCI))
++ (set (match_dup 4) (unspec:BLK [(match_dup 4)] UNSPEC_HTM_FENCE))])]
++ "TARGET_HTM"
++{
++ operands[4] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[4]) = 1;
++})
++
++(define_insn "*tabortci"
+ [(set (match_operand:CC 3 "cc_reg_operand" "=x")
+ (unspec_volatile:CC [(match_operand 0 "u5bit_cint_operand" "n")
+ (match_operand:GPR 1 "gpc_reg_operand" "r")
+ (match_operand 2 "s5bit_cint_operand" "n")]
+- UNSPECV_HTM_TABORTXCI))]
++ UNSPECV_HTM_TABORTXCI))
++ (set (match_operand:BLK 4) (unspec:BLK [(match_dup 4)] UNSPEC_HTM_FENCE))]
+ "TARGET_HTM"
+ "tabortci. %0,%1,%2"
+ [(set_attr "type" "htm")
+ (set_attr "length" "4")])
+
+-(define_insn "tbegin"
++(define_expand "tbegin"
++ [(parallel
++ [(set (match_operand:CC 1 "cc_reg_operand" "=x")
++ (unspec_volatile:CC [(match_operand 0 "const_0_to_1_operand" "n")]
++ UNSPECV_HTM_TBEGIN))
++ (set (match_dup 2) (unspec:BLK [(match_dup 2)] UNSPEC_HTM_FENCE))])]
++ "TARGET_HTM"
++{
++ operands[2] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[2]) = 1;
++})
++
++(define_insn "*tbegin"
+ [(set (match_operand:CC 1 "cc_reg_operand" "=x")
+ (unspec_volatile:CC [(match_operand 0 "const_0_to_1_operand" "n")]
+- UNSPECV_HTM_TBEGIN))]
++ UNSPECV_HTM_TBEGIN))
++ (set (match_operand:BLK 2) (unspec:BLK [(match_dup 2)] UNSPEC_HTM_FENCE))]
+ "TARGET_HTM"
+ "tbegin. %0"
+ [(set_attr "type" "htm")
+ (set_attr "length" "4")])
+
+-(define_insn "tcheck"
++(define_expand "tcheck"
++ [(parallel
++ [(set (match_operand:CC 0 "cc_reg_operand" "=y")
++ (unspec_volatile:CC [(const_int 0)] UNSPECV_HTM_TCHECK))
++ (set (match_dup 1) (unspec:BLK [(match_dup 1)] UNSPEC_HTM_FENCE))])]
++ "TARGET_HTM"
++{
++ operands[1] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[1]) = 1;
++})
++
++(define_insn "*tcheck"
+ [(set (match_operand:CC 0 "cc_reg_operand" "=y")
+- (unspec_volatile:CC [(const_int 0)]
+- UNSPECV_HTM_TCHECK))]
++ (unspec_volatile:CC [(const_int 0)] UNSPECV_HTM_TCHECK))
++ (set (match_operand:BLK 1) (unspec:BLK [(match_dup 1)] UNSPEC_HTM_FENCE))]
+ "TARGET_HTM"
+ "tcheck %0"
+ [(set_attr "type" "htm")
+ (set_attr "length" "4")])
+
+-(define_insn "tend"
++(define_expand "tend"
++ [(parallel
++ [(set (match_operand:CC 1 "cc_reg_operand" "=x")
++ (unspec_volatile:CC [(match_operand 0 "const_0_to_1_operand" "n")]
++ UNSPECV_HTM_TEND))
++ (set (match_dup 2) (unspec:BLK [(match_dup 2)] UNSPEC_HTM_FENCE))])]
++ "TARGET_HTM"
++{
++ operands[2] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[2]) = 1;
++})
++
++(define_insn "*tend"
+ [(set (match_operand:CC 1 "cc_reg_operand" "=x")
+ (unspec_volatile:CC [(match_operand 0 "const_0_to_1_operand" "n")]
+- UNSPECV_HTM_TEND))]
++ UNSPECV_HTM_TEND))
++ (set (match_operand:BLK 2) (unspec:BLK [(match_dup 2)] UNSPEC_HTM_FENCE))]
+ "TARGET_HTM"
+ "tend. %0"
+ [(set_attr "type" "htm")
+ (set_attr "length" "4")])
+
+-(define_insn "trechkpt"
++(define_expand "trechkpt"
++ [(parallel
++ [(set (match_operand:CC 0 "cc_reg_operand" "=x")
++ (unspec_volatile:CC [(const_int 0)] UNSPECV_HTM_TRECHKPT))
++ (set (match_dup 1) (unspec:BLK [(match_dup 1)] UNSPEC_HTM_FENCE))])]
++ "TARGET_HTM"
++{
++ operands[1] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[1]) = 1;
++})
++
++(define_insn "*trechkpt"
+ [(set (match_operand:CC 0 "cc_reg_operand" "=x")
+- (unspec_volatile:CC [(const_int 0)]
+- UNSPECV_HTM_TRECHKPT))]
++ (unspec_volatile:CC [(const_int 0)] UNSPECV_HTM_TRECHKPT))
++ (set (match_operand:BLK 1) (unspec:BLK [(match_dup 1)] UNSPEC_HTM_FENCE))]
+ "TARGET_HTM"
+ "trechkpt."
+ [(set_attr "type" "htm")
+ (set_attr "length" "4")])
+
+-(define_insn "treclaim"
++(define_expand "treclaim"
++ [(parallel
++ [(set (match_operand:CC 1 "cc_reg_operand" "=x")
++ (unspec_volatile:CC [(match_operand:SI 0 "gpc_reg_operand" "r")]
++ UNSPECV_HTM_TRECLAIM))
++ (set (match_dup 2) (unspec:BLK [(match_dup 2)] UNSPEC_HTM_FENCE))])]
++ "TARGET_HTM"
++{
++ operands[2] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[2]) = 1;
++})
++
++(define_insn "*treclaim"
+ [(set (match_operand:CC 1 "cc_reg_operand" "=x")
+ (unspec_volatile:CC [(match_operand:SI 0 "gpc_reg_operand" "r")]
+- UNSPECV_HTM_TRECLAIM))]
++ UNSPECV_HTM_TRECLAIM))
++ (set (match_operand:BLK 2) (unspec:BLK [(match_dup 2)] UNSPEC_HTM_FENCE))]
+ "TARGET_HTM"
+ "treclaim. %0"
+ [(set_attr "type" "htm")
+ (set_attr "length" "4")])
+
+-(define_insn "tsr"
++(define_expand "tsr"
++ [(parallel
++ [(set (match_operand:CC 1 "cc_reg_operand" "=x")
++ (unspec_volatile:CC [(match_operand 0 "const_0_to_1_operand" "n")]
++ UNSPECV_HTM_TSR))
++ (set (match_dup 2) (unspec:BLK [(match_dup 2)] UNSPEC_HTM_FENCE))])]
++ "TARGET_HTM"
++{
++ operands[2] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[2]) = 1;
++})
++
++(define_insn "*tsr"
+ [(set (match_operand:CC 1 "cc_reg_operand" "=x")
+ (unspec_volatile:CC [(match_operand 0 "const_0_to_1_operand" "n")]
+- UNSPECV_HTM_TSR))]
++ UNSPECV_HTM_TSR))
++ (set (match_operand:BLK 2) (unspec:BLK [(match_dup 2)] UNSPEC_HTM_FENCE))]
+ "TARGET_HTM"
+ "tsr. %0"
+ [(set_attr "type" "htm")
+ (set_attr "length" "4")])
+
+-(define_insn "ttest"
++(define_expand "ttest"
++ [(parallel
++ [(set (match_operand:CC 0 "cc_reg_operand" "=x")
++ (unspec_volatile:CC [(const_int 0)] UNSPECV_HTM_TTEST))
++ (set (match_dup 1) (unspec:BLK [(match_dup 1)] UNSPEC_HTM_FENCE))])]
++ "TARGET_HTM"
++{
++ operands[1] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[1]) = 1;
++})
++
++(define_insn "*ttest"
+ [(set (match_operand:CC 0 "cc_reg_operand" "=x")
+- (unspec_volatile:CC [(const_int 0)]
+- UNSPECV_HTM_TTEST))]
++ (unspec_volatile:CC [(const_int 0)] UNSPECV_HTM_TTEST))
++ (set (match_operand:BLK 1) (unspec:BLK [(match_dup 1)] UNSPEC_HTM_FENCE))]
+ "TARGET_HTM"
+ "tabortwci. 0,1,0"
+ [(set_attr "type" "htm")
+--- gcc/config/rs6000/rs6000-c.c (revision 228826)
++++ gcc/config/rs6000/rs6000-c.c (revision 228827)
+@@ -372,7 +372,11 @@ rs6000_target_modify_macros (bool define
+ if ((flags & OPTION_MASK_VSX) != 0)
+ rs6000_define_or_undefine_macro (define_p, "__VSX__");
+ if ((flags & OPTION_MASK_HTM) != 0)
+- rs6000_define_or_undefine_macro (define_p, "__HTM__");
++ {
++ rs6000_define_or_undefine_macro (define_p, "__HTM__");
++ /* Tell the user that our HTM insn patterns act as memory barriers. */
++ rs6000_define_or_undefine_macro (define_p, "__TM_FENCE__");
++ }
+ if ((flags & OPTION_MASK_P8_VECTOR) != 0)
+ rs6000_define_or_undefine_macro (define_p, "__POWER8_VECTOR__");
+ if ((flags & OPTION_MASK_QUAD_MEMORY) != 0)
+--- gcc/testsuite/gcc.target/powerpc/htm-tabort-no-r0.c (revision 0)
++++ gcc/testsuite/gcc.target/powerpc/htm-tabort-no-r0.c (revision 226532)
+@@ -0,0 +1,12 @@
++/* { dg-do compile { target { powerpc*-*-* } } } */
++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
++/* { dg-require-effective-target powerpc_htm_ok } */
++/* { dg-options "-O2 -mhtm -ffixed-r3 -ffixed-r4 -ffixed-r5 -ffixed-r6 -ffixed-r7 -ffixed-r8 -ffixed-r9 -ffixed-r10 -ffixed-r11 -ffixed-r12" } */
++
++/* { dg-final { scan-assembler-not "tabort\\.\[ \t\]0" } } */
++
++int
++foo (void)
++{
++ return __builtin_tabort (10);
++}
diff --git a/SOURCES/gcc48-pr68184.patch b/SOURCES/gcc48-pr68184.patch
new file mode 100644
index 0000000..445aefd
--- /dev/null
+++ b/SOURCES/gcc48-pr68184.patch
@@ -0,0 +1,59 @@
+2017-02-28 Jakub Jelinek
+
+ Backport from mainline
+ 2015-12-02 Jan Hubicka
+
+ PR ipa/68184
+ * cgraphunit.c (cgraph_node::analyze): Set can_throw_external.
+
+ * g++.dg/torture/pr68184.C: New testcase.
+
+--- gcc/cgraphunit.c.jj 2014-09-10 09:15:51.000000000 +0200
++++ gcc/cgraphunit.c 2017-02-28 08:24:44.387385510 +0100
+@@ -626,8 +626,10 @@ cgraph_analyze_function (struct cgraph_n
+ }
+ else if (node->thunk.thunk_p)
+ {
+- cgraph_create_edge (node, cgraph_get_node (node->thunk.alias),
+- NULL, 0, CGRAPH_FREQ_BASE);
++ struct cgraph_node *t = cgraph_get_node (node->thunk.alias);
++ cgraph_create_edge (node, t, NULL, 0,
++ CGRAPH_FREQ_BASE)->can_throw_external
++ = !TREE_NOTHROW (t->symbol.decl);
+ }
+ else if (node->dispatcher_function)
+ {
+--- gcc/testsuite/g++.dg/torture/pr68184.C.jj 2017-02-28 08:26:09.205246069 +0100
++++ gcc/testsuite/g++.dg/torture/pr68184.C 2015-12-03 16:39:34.589010321 +0100
+@@ -0,0 +1,31 @@
++// { dg-do run }
++namespace {
++struct IFoo { virtual void foo() = 0; };
++struct IBar { virtual void bar() = 0; };
++
++struct FooBar : private IBar, private IFoo
++{
++ void call_foo()
++ {
++ try
++ {
++ static_cast(this)->foo();
++ }
++ catch( ... ) {}
++ }
++ void foo() { throw 1; }
++ void bar() {}
++};
++
++void test()
++{
++ FooBar foobar;
++ foobar.call_foo();
++}
++}
++int main()
++{
++ test();
++ return 0;
++}
++
diff --git a/SOURCES/gcc48-pr68680.patch b/SOURCES/gcc48-pr68680.patch
new file mode 100644
index 0000000..59f6ffe
--- /dev/null
+++ b/SOURCES/gcc48-pr68680.patch
@@ -0,0 +1,46 @@
+2015-12-04 Jakub Jelinek
+
+ PR tree-optimization/68680
+ * calls.c (special_function_p): Return ECF_MAY_BE_ALLOCA for
+ BUILT_IN_ALLOCA{,_WITH_ALIGN}.
+
+ * gcc.target/i386/pr68680.c: New test.
+
+--- gcc/calls.c (revision 231278)
++++ gcc/calls.c (revision 231279)
+@@ -564,6 +564,17 @@ special_function_p (const_tree fndecl, i
+ flags |= ECF_NORETURN;
+ }
+
++ if (DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_NORMAL)
++ switch (DECL_FUNCTION_CODE (fndecl))
++ {
++ case BUILT_IN_ALLOCA:
++ case BUILT_IN_ALLOCA_WITH_ALIGN:
++ flags |= ECF_MAY_BE_ALLOCA;
++ break;
++ default:
++ break;
++ }
++
+ return flags;
+ }
+
+--- gcc/testsuite/gcc.target/i386/pr68680.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/pr68680.c (revision 231279)
+@@ -0,0 +1,15 @@
++/* PR tree-optimization/68680 */
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-protector-strong" } */
++
++int foo (char *);
++
++int
++bar (unsigned long x)
++{
++ char a[x];
++ return foo (a);
++}
++
++/* Verify that this function is stack protected. */
++/* { dg-final { scan-assembler "stack_chk_fail" } } */
diff --git a/SOURCES/gcc48-pr68814.patch b/SOURCES/gcc48-pr68814.patch
new file mode 100644
index 0000000..d92bde8
--- /dev/null
+++ b/SOURCES/gcc48-pr68814.patch
@@ -0,0 +1,17 @@
+2015-12-11 Segher Boessenkool
+
+ PR rtl-optimization/68814
+ * rtlanal.c (set_noop_p): Use BITS_BIG_ENDIAN instead of
+ BYTES_BIG_ENDIAN.
+
+--- gcc/rtlanal.c
++++ gcc/rtlanal.c
+@@ -1534,7 +1534,7 @@ set_noop_p (const_rtx set)
+
+ if (GET_CODE (dst) == ZERO_EXTRACT)
+ return rtx_equal_p (XEXP (dst, 0), src)
+- && ! BYTES_BIG_ENDIAN && XEXP (dst, 2) == const0_rtx
++ && !BITS_BIG_ENDIAN && XEXP (dst, 2) == const0_rtx
+ && !side_effects_p (src);
+
+ if (GET_CODE (dst) == STRICT_LOW_PART)
diff --git a/SOURCES/gcc48-pr69116.patch b/SOURCES/gcc48-pr69116.patch
new file mode 100644
index 0000000..9b93c79
--- /dev/null
+++ b/SOURCES/gcc48-pr69116.patch
@@ -0,0 +1,92 @@
+2016-02-10 Jonathan Wakely
+
+ PR libstdc++/69116
+ * include/bits/valarray_before.h (__fun, __fun_with_valarray): Only
+ define result_type for types which can be safely used with valarrays.
+ * testsuite/26_numerics/valarray/69116.cc: New.
+
+--- libstdc++-v3/include/bits/valarray_before.h (revision 233264)
++++ libstdc++-v3/include/bits/valarray_before.h (revision 233265)
+@@ -331,14 +331,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+ { return pow(__x, __y); }
+ };
+
++ template
++ struct __fun_with_valarray
++ {
++ typedef _Tp result_type;
++ };
++
++ template
++ struct __fun_with_valarray<_Tp, false>
++ {
++ // No result type defined for invalid value types.
++ };
+
+ // We need these bits in order to recover the return type of
+ // some functions/operators now that we're no longer using
+ // function templates.
+ template
+- struct __fun
++ struct __fun : __fun_with_valarray<_Tp>
+ {
+- typedef _Tp result_type;
+ };
+
+ // several specializations for relational operators.
+--- libstdc++-v3/testsuite/26_numerics/valarray/69116.cc (nonexistent)
++++ libstdc++-v3/testsuite/26_numerics/valarray/69116.cc (revision 233265)
+@@ -0,0 +1,53 @@
++// Copyright (C) 2016 Free Software Foundation, Inc.
++//
++// This file is part of the GNU ISO C++ Library. This library 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 library 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 library; see the file COPYING3. If not see
++// .
++
++// { dg-do compile }
++// { dg-options "-std=gnu++98" }
++
++// libstdc++/69116
++
++#include
++#include
++
++template
++ void foo(const T&) { }
++
++struct X : std::exception // makes namespace std an associated namespace
++{
++ virtual void pure() = 0;
++
++ typedef void(*func_type)(const X&);
++
++ void operator+(func_type) const;
++ void operator-(func_type) const;
++ void operator*(func_type) const;
++ void operator/(func_type) const;
++ void operator%(func_type) const;
++ void operator<<(func_type) const;
++ void operator>>(func_type) const;
++};
++
++void foo(X& x)
++{
++ x + foo;
++ x - foo;
++ x * foo;
++ x / foo;
++ x % foo;
++ x << foo;
++ x >> foo;
++}
diff --git a/SOURCES/gcc48-pr69644.patch b/SOURCES/gcc48-pr69644.patch
new file mode 100644
index 0000000..d6731e5
--- /dev/null
+++ b/SOURCES/gcc48-pr69644.patch
@@ -0,0 +1,51 @@
+2016-02-04 Jakub Jelinek
+
+ Backported from mainline
+ 2016-02-03 Jakub Jelinek
+
+ PR target/69644
+ * config/rs6000/rs6000.c (rs6000_expand_atomic_compare_and_swap):
+ Force oldval into register if it does not satisfy reg_or_short_operand
+ predicate. Fix up formatting.
+
+ * gcc.dg/pr69644.c: New test.
+
+--- gcc/config/rs6000/rs6000.c
++++ gcc/config/rs6000/rs6000.c
+@@ -20263,6 +20263,9 @@ rs6000_expand_atomic_compare_and_swap (rtx operands[])
+ else if (reg_overlap_mentioned_p (retval, oldval))
+ oldval = copy_to_reg (oldval);
+
++ if (mode != TImode && !reg_or_short_operand (oldval, mode))
++ oldval = copy_to_mode_reg (mode, oldval);
++
+ mem = rs6000_pre_atomic_barrier (mem, mod_s);
+
+ label1 = NULL_RTX;
+@@ -20277,10 +20280,8 @@ rs6000_expand_atomic_compare_and_swap (rtx operands[])
+
+ x = retval;
+ if (mask)
+- {
+- x = expand_simple_binop (SImode, AND, retval, mask,
+- NULL_RTX, 1, OPTAB_LIB_WIDEN);
+- }
++ x = expand_simple_binop (SImode, AND, retval, mask,
++ NULL_RTX, 1, OPTAB_LIB_WIDEN);
+
+ cond = gen_reg_rtx (CCmode);
+ /* If we have TImode, synthesize a comparison. */
+--- /dev/null
++++ gcc/testsuite/gcc.dg/pr69644.c
+@@ -0,0 +1,11 @@
++/* PR target/69644 */
++/* { dg-do compile } */
++
++int
++main ()
++{
++ unsigned short x = 0x8000;
++ if (!__sync_bool_compare_and_swap (&x, 0x8000, 0) || x)
++ __builtin_abort ();
++ return 0;
++}
diff --git a/SOURCES/gcc48-pr69891.patch b/SOURCES/gcc48-pr69891.patch
new file mode 100644
index 0000000..466b194
--- /dev/null
+++ b/SOURCES/gcc48-pr69891.patch
@@ -0,0 +1,51 @@
+2016-02-26 Jakub Jelinek
+ Eric Botcazou
+
+ PR rtl-optimization/69891
+ * dse.c (scan_insn): If we can't figure out memset arguments
+ or they are non-constant, call clear_rhs_from_active_local_stores.
+
+--- gcc/testsuite/gcc.target/i386/pr69891.c (nonexistent)
++++ gcc/testsuite/gcc.target/i386/pr69891.c (revision 238137)
+@@ -0,0 +1,30 @@
++/* PR rtl-optimization/69891 */
++/* { dg-do run } */
++/* { dg-options "-O -fno-tree-fre -mstringop-strategy=libcall -Wno-psabi" } */
++/* { dg-additional-options "-mno-sse" { target ia32 } } */
++
++typedef unsigned short A;
++typedef unsigned short B __attribute__ ((vector_size (32)));
++typedef unsigned int C;
++typedef unsigned int D __attribute__ ((vector_size (32)));
++typedef unsigned long long E;
++typedef unsigned long long F __attribute__ ((vector_size (32)));
++
++__attribute__((noinline, noclone)) unsigned
++foo(D a, B b, D c, F d)
++{
++ b /= (B) {1, -c[0]} | 1;
++ c[0] |= 7;
++ a %= c | 1;
++ c ^= c;
++ return a[0] + b[15] + c[0] + d[3];
++}
++
++int
++main ()
++{
++ unsigned x = foo ((D) {}, (B) {}, (D) {}, (F) {});
++ if (x != 0)
++ __builtin_abort ();
++ return 0;
++}
+--- gcc/dse.c (revision 238136)
++++ gcc/dse.c (revision 238137)
+@@ -2582,6 +2582,8 @@
+ active_local_stores = insn_info;
+ }
+ }
++ else
++ clear_rhs_from_active_local_stores ();
+ }
+ }
+
diff --git a/SOURCES/gcc48-pr70549.patch b/SOURCES/gcc48-pr70549.patch
new file mode 100644
index 0000000..429893f
--- /dev/null
+++ b/SOURCES/gcc48-pr70549.patch
@@ -0,0 +1,61 @@
+2017-03-08 Bernd Schmidt
+
+ PR target/70549
+ * config/aarch64/aarch64.c (aarch64_secondary_reload): Reload
+ CORE_REGS rclass constants in [SD]Fmode through FP_REGS.
+
+ * g++.dg/opt/pr70549.C: New test.
+
+--- gcc/config/aarch64/aarch64.c.jj 2017-03-08 15:50:55.000000000 +0100
++++ gcc/config/aarch64/aarch64.c 2017-03-08 16:01:15.426080172 +0100
+@@ -3846,8 +3846,13 @@ aarch64_secondary_reload (bool in_p ATTR
+ && GET_MODE_SIZE (mode) == 16 && MEM_P (x))
+ return FP_REGS;
+
++ if (rclass == CORE_REGS
++ && (mode == SFmode || mode == DFmode)
++ && CONSTANT_P (x))
++ return FP_REGS;
++
+ if (rclass == FP_REGS && (mode == TImode || mode == TFmode) && CONSTANT_P(x))
+- return CORE_REGS;
++ return CORE_REGS;
+
+ return NO_REGS;
+ }
+--- gcc/testsuite/g++.dg/opt/pr70549.C.jj 2017-03-08 16:02:45.104918249 +0100
++++ gcc/testsuite/g++.dg/opt/pr70549.C 2017-03-08 16:02:14.000000000 +0100
+@@ -0,0 +1,33 @@
++// PR target/70549
++// { dg-do compile }
++// { dg-options "-O2" }
++// { dg-additional-options "-fPIC" { target fpic } }
++
++struct A { float x; float y; };
++A a, b, c;
++int d, e;
++A bar ();
++void foo (A, A);
++inline A operator/ (A, A p2) { if (p2.x) return a; }
++struct B { A dval; };
++int baz (A, B, A, int);
++
++void
++test ()
++{
++ B q;
++ A f, g, h, k;
++ h.x = 1.0;
++ f = h;
++ struct A i, j = f;
++ do {
++ i = bar ();
++ g = i / j;
++ foo (g, c);
++ int l = baz (k, q, b, e);
++ if (l)
++ goto cleanup;
++ j = i;
++ } while (d);
++cleanup:;
++}
diff --git a/SOURCES/gcc48-pr72717.patch b/SOURCES/gcc48-pr72717.patch
new file mode 100644
index 0000000..0aa4d2e
--- /dev/null
+++ b/SOURCES/gcc48-pr72717.patch
@@ -0,0 +1,87 @@
+2016-12-13 Michael Meissner
+
+ Backport from mainline
+ 2016-12-07 Michael Meissner
+
+ PR target/72717
+ * config/rs6000/rs6000.c (rs6000_expand_vector_init): If the
+ V2DImode elements are SUBREG's convert the result into DImode
+ rather than failing in emit_move_insn.
+
+--- gcc/testsuite/gcc.target/powerpc/pr72717.c (nonexistent)
++++ gcc/testsuite/gcc.target/powerpc/pr72717.c (revision 243626)
+@@ -0,0 +1,18 @@
++/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
++/* { dg-require-effective-target powerpc_p8vector_ok } */
++/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */
++/* { dg-options "-mcpu=power8 -O2" } */
++
++typedef long V __attribute__((__vector_size__(32)));
++
++extern void foo (V *, V*);
++
++/* This test generated an failure in emit_move_insn. */
++
++void
++foo(V *p, V *q)
++{
++ V v = *q;
++ *p = v << v[0];
++}
+--- gcc/config/rs6000/rs6000.c (revision 243625)
++++ gcc/config/rs6000/rs6000.c (revision 243626)
+@@ -6667,25 +6667,43 @@
+ /* Double word values on VSX can use xxpermdi or lxvdsx. */
+ if (VECTOR_MEM_VSX_P (mode) && (mode == V2DFmode || mode == V2DImode))
+ {
+- rtx op0 = XVECEXP (vals, 0, 0);
+- rtx op1 = XVECEXP (vals, 0, 1);
++ rtx op[2];
++ size_t i;
++ size_t num_elements = (all_same) ? 1 : 2;
++ for (i = 0; i < num_elements; i++)
++ {
++ op[i] = XVECEXP (vals, 0, i);
++ /* Just in case there is a SUBREG with a smaller mode, do a
++ conversion. */
++ if (GET_MODE (op[i]) != inner_mode)
++ {
++ rtx tmp = gen_reg_rtx (inner_mode);
++ convert_move (tmp, op[i], 0);
++ op[i] = tmp;
++ }
++ /* Allow load with splat double word. */
++ else if (MEM_P (op[i]))
++ {
++ if (!all_same)
++ op[i] = force_reg (inner_mode, op[i]);
++ }
++ else if (!REG_P (op[i]))
++ op[i] = force_reg (inner_mode, op[i]);
++ }
++
+ if (all_same)
+ {
+- if (!MEM_P (op0) && !REG_P (op0))
+- op0 = force_reg (inner_mode, op0);
+ if (mode == V2DFmode)
+- emit_insn (gen_vsx_splat_v2df (target, op0));
++ emit_insn (gen_vsx_splat_v2df (target, op[0]));
+ else
+- emit_insn (gen_vsx_splat_v2di (target, op0));
++ emit_insn (gen_vsx_splat_v2di (target, op[0]));
+ }
+ else
+ {
+- op0 = force_reg (inner_mode, op0);
+- op1 = force_reg (inner_mode, op1);
+ if (mode == V2DFmode)
+- emit_insn (gen_vsx_concat_v2df (target, op0, op1));
++ emit_insn (gen_vsx_concat_v2df (target, op[0], op[1]));
+ else
+- emit_insn (gen_vsx_concat_v2di (target, op0, op1));
++ emit_insn (gen_vsx_concat_v2di (target, op[0], op[1]));
+ }
+ return;
+ }
diff --git a/SOURCES/gcc48-pr72747.patch b/SOURCES/gcc48-pr72747.patch
new file mode 100644
index 0000000..4216ada
--- /dev/null
+++ b/SOURCES/gcc48-pr72747.patch
@@ -0,0 +1,90 @@
+2016-11-02 Will Schmidt
+
+ Backport from trunk
+ 2016-10-26 Will Schmidt
+
+ PR middle-end/72747
+ * gimplify.c (gimplify_init_constructor): Move emit of constructor
+ assignment to earlier in the if/else logic.
+
+ * c-c++-common/pr72747-1.c: New test.
+ * c-c++-common/pr72747-2.c: Likewise.
+
+--- gcc/gimplify.c (revision 241792)
++++ gcc/gimplify.c (revision 241793)
+@@ -4273,24 +4273,23 @@ gimplify_init_constructor (tree *expr_p,
+
+ if (ret == GS_ERROR)
+ return GS_ERROR;
+- else if (want_value)
++ /* If we have gimplified both sides of the initializer but have
++ not emitted an assignment, do so now. */
++ if (*expr_p)
++ {
++ tree lhs = TREE_OPERAND (*expr_p, 0);
++ tree rhs = TREE_OPERAND (*expr_p, 1);
++ gimple init = gimple_build_assign (lhs, rhs);
++ gimplify_seq_add_stmt (pre_p, init);
++ }
++ if (want_value)
+ {
+ *expr_p = object;
+ return GS_OK;
+ }
+ else
+ {
+- /* If we have gimplified both sides of the initializer but have
+- not emitted an assignment, do so now. */
+- if (*expr_p)
+- {
+- tree lhs = TREE_OPERAND (*expr_p, 0);
+- tree rhs = TREE_OPERAND (*expr_p, 1);
+- gimple init = gimple_build_assign (lhs, rhs);
+- gimplify_seq_add_stmt (pre_p, init);
+- *expr_p = NULL;
+- }
+-
++ *expr_p = NULL;
+ return GS_ALL_DONE;
+ }
+ }
+--- gcc/testsuite/c-c++-common/pr72747-1.c (nonexistent)
++++ gcc/testsuite/c-c++-common/pr72747-1.c (revision 241793)
+@@ -0,0 +1,16 @@
++/* { dg-do compile } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-maltivec -fdump-tree-gimple" } */
++
++/* PR 72747: Test that cascaded definition is happening for constant vectors. */
++
++#include
++
++int main (int argc, char *argv[])
++{
++ __vector int v1,v2;
++ v1 = v2 = vec_splats ((int) 42);
++ return 0;
++}
++/* { dg-final { scan-tree-dump-times " v2 = { 42, 42, 42, 42 }" 1 "gimple" } } */
++
+--- gcc/testsuite/c-c++-common/pr72747-2.c (nonexistent)
++++ gcc/testsuite/c-c++-common/pr72747-2.c (revision 241793)
+@@ -0,0 +1,18 @@
++/* { dg-do compile } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-c -maltivec -fdump-tree-gimple" } */
++
++/* PR 72747: test that cascaded definition is happening for non constants. */
++
++void foo ()
++{
++ extern int i;
++ __vector int v,w;
++ v = w = (vector int) { i };
++}
++
++int main (int argc, char *argv[])
++{
++ return 0;
++}
++/* { dg-final { scan-tree-dump-times " w = " 1 "gimple" } } */
diff --git a/SOURCES/gcc48-pr72863.patch b/SOURCES/gcc48-pr72863.patch
new file mode 100644
index 0000000..87547f7
--- /dev/null
+++ b/SOURCES/gcc48-pr72863.patch
@@ -0,0 +1,73 @@
+2016-08-25 Bill Schmidt
+
+ Backport from mainline (minus test for POWER9 support)
+ 2016-08-11 Bill Schmidt
+
+ PR target/72863
+ * vsx.md (vsx_load_): For P8LE, emit swaps at expand time.
+ (vsx_store_): Likewise.
+
+ * gcc.target/powerpc/pr72863.c: New test.
+
+--- gcc/config/rs6000/vsx.md (revision 239761)
++++ gcc/config/rs6000/vsx.md (revision 239762)
+@@ -716,13 +716,27 @@ (define_expand "vsx_load_"
+ [(set (match_operand:VSX_M 0 "vsx_register_operand" "")
+ (match_operand:VSX_M 1 "memory_operand" ""))]
+ "VECTOR_MEM_VSX_P (mode)"
+- "")
++{
++ /* Expand to swaps if needed, prior to swap optimization. */
++ if (!BYTES_BIG_ENDIAN)
++ {
++ rs6000_emit_le_vsx_move (operands[0], operands[1], mode);
++ DONE;
++ }
++})
+
+ (define_expand "vsx_store_"
+ [(set (match_operand:VSX_M 0 "memory_operand" "")
+ (match_operand:VSX_M 1 "vsx_register_operand" ""))]
+ "VECTOR_MEM_VSX_P (mode)"
+- "")
++{
++ /* Expand to swaps if needed, prior to swap optimization. */
++ if (!BYTES_BIG_ENDIAN)
++ {
++ rs6000_emit_le_vsx_move (operands[0], operands[1], mode);
++ DONE;
++ }
++})
+
+
+ ;; VSX vector floating point arithmetic instructions. The VSX scalar
+--- gcc/testsuite/gcc.target/powerpc/pr72863.c (nonexistent)
++++ gcc/testsuite/gcc.target/powerpc/pr72863.c (revision 239762)
+@@ -0,0 +1,27 @@
++/* { dg-do compile { target { powerpc64le-*-* } } } */
++/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */
++/* { dg-options "-mcpu=power8 -O3" } */
++/* { dg-final { scan-assembler "lxvd2x" } } */
++/* { dg-final { scan-assembler "stxvd2x" } } */
++/* { dg-final { scan-assembler-not "xxpermdi" } } */
++
++#include
++
++extern unsigned char *src, *dst;
++
++void b(void)
++{
++ int i;
++
++ unsigned char *s8 = src;
++ unsigned char *d8 = dst;
++
++ for (i = 0; i < 100; i++) {
++ vector unsigned char vs = vec_vsx_ld(0, s8);
++ vector unsigned char vd = vec_vsx_ld(0, d8);
++ vector unsigned char vr = vec_xor(vs, vd);
++ vec_vsx_st(vr, 0, d8);
++ s8 += 16;
++ d8 += 16;
++ }
++}
diff --git a/SOURCES/gcc48-pr77375.patch b/SOURCES/gcc48-pr77375.patch
new file mode 100644
index 0000000..09158e2
--- /dev/null
+++ b/SOURCES/gcc48-pr77375.patch
@@ -0,0 +1,37 @@
+2017-05-30 Jakub Jelinek
+
+ Backported from mainline
+ 2016-09-16 Jakub Jelinek
+
+ PR c++/77375
+ * class.c (check_bases): Set CLASSTYPE_HAS_MUTABLE if any
+ TYPE_HAS_MUTABLE_P for any bases.
+
+ * g++.dg/cpp0x/mutable1.C: New test.
+
+--- gcc/cp/class.c 2017-10-17 17:27:32.287980595 +0200
++++ gcc/cp/class.c 2017-10-17 17:29:11.104213281 +0200
+@@ -1479,6 +1479,8 @@ check_bases (tree t,
+ |= CLASSTYPE_CONTAINS_EMPTY_CLASS_P (basetype);
+ TYPE_HAS_COMPLEX_DFLT (t) |= (!TYPE_HAS_DEFAULT_CONSTRUCTOR (basetype)
+ || TYPE_HAS_COMPLEX_DFLT (basetype));
++ if (TYPE_HAS_MUTABLE_P (basetype))
++ CLASSTYPE_HAS_MUTABLE (t) = 1;
+
+ /* A standard-layout class is a class that:
+ ...
+--- /dev/null
++++ gcc/testsuite/g++.dg/cpp0x/mutable1.C
+@@ -0,0 +1,12 @@
++// PR c++/77375
++// { dg-do run { target c++11 } }
++
++struct Base { mutable int i; };
++struct Derived : Base {};
++const Derived foo{};
++
++int
++main ()
++{
++ foo.i = 42;
++}
diff --git a/SOURCES/gcc48-pr77767.patch b/SOURCES/gcc48-pr77767.patch
new file mode 100644
index 0000000..ba80ac1
--- /dev/null
+++ b/SOURCES/gcc48-pr77767.patch
@@ -0,0 +1,56 @@
+2017-05-30 Jakub Jelinek
+
+ Backported from mainline
+ 2016-12-21 Jakub Jelinek
+
+ PR c/77767
+ * c-decl.c (grokdeclarator): If *expr is non-NULL, append expression
+ to *expr instead of overwriting it.
+
+ * gcc.c-torture/execute/pr77767.c: New test.
+
+--- gcc/c/c-decl.c
++++ gcc/c/c-decl.c
+@@ -5409,11 +5409,21 @@ grokdeclarator (const struct c_declarator *declarator,
+ if (TREE_CODE (type) == ERROR_MARK)
+ return error_mark_node;
+ if (expr == NULL)
+- expr = &expr_dummy;
++ {
++ expr = &expr_dummy;
++ expr_dummy = NULL_TREE;
++ }
+ if (expr_const_operands == NULL)
+ expr_const_operands = &expr_const_operands_dummy;
+
+- *expr = declspecs->expr;
++ if (declspecs->expr)
++ {
++ if (*expr)
++ *expr = build2 (COMPOUND_EXPR, TREE_TYPE (declspecs->expr), *expr,
++ declspecs->expr);
++ else
++ *expr = declspecs->expr;
++ }
+ *expr_const_operands = declspecs->expr_const_operands;
+
+ if (decl_context == FUNCDEF)
+--- /dev/null
++++ gcc/testsuite/gcc.c-torture/execute/pr77767.c
+@@ -0,0 +1,16 @@
++/* PR c/77767 */
++
++void
++foo (int a, int b[a++], int c, int d[c++])
++{
++ if (a != 2 || c != 2)
++ __builtin_abort ();
++}
++
++int
++main ()
++{
++ int e[10];
++ foo (1, e, 1, e);
++ return 0;
++}
diff --git a/SOURCES/gcc48-pr78064.patch b/SOURCES/gcc48-pr78064.patch
new file mode 100644
index 0000000..0773493
--- /dev/null
+++ b/SOURCES/gcc48-pr78064.patch
@@ -0,0 +1,15 @@
+2016-10-24 Florian Weimer
+
+ PR libgcc/78064
+ * unwind-c.c: Include auto-target.h.
+
+--- libgcc/unwind-c.c (revision 241490)
++++ libgcc/unwind-c.c (revision 241491)
+@@ -26,6 +26,7 @@ see the files COPYING3 and COPYING.RUNTI
+
+ #include "tconfig.h"
+ #include "tsystem.h"
++#include "auto-target.h"
+ #include "unwind.h"
+ #define NO_SIZE_OF_ENCODED_VALUE
+ #include "unwind-pe.h"
diff --git a/SOURCES/gcc48-pr78378.patch b/SOURCES/gcc48-pr78378.patch
new file mode 100644
index 0000000..bc78b81
--- /dev/null
+++ b/SOURCES/gcc48-pr78378.patch
@@ -0,0 +1,43 @@
+2017-05-30 Jakub Jelinek
+
+ Backported from mainline
+ 2016-11-16 Jakub Jelinek
+
+ PR rtl-optimization/78378
+ * combine.c (make_extraction): Use force_to_mode for non-{REG,MEM}
+ inner only if pos is 0.
+
+ * gcc.c-torture/execute/pr78378.c: New test.
+
+--- gcc/combine.c
++++ gcc/combine.c
+@@ -7342,6 +7342,7 @@ make_extraction (machine_mode mode, rtx inner, HOST_WIDE_INT pos,
+ if (tmode != BLKmode
+ && ((pos_rtx == 0 && (pos % BITS_PER_WORD) == 0
+ && !MEM_P (inner)
++ && (pos == 0 || REG_P (inner))
+ && (inner_mode == tmode
+ || !REG_P (inner)
+ || TRULY_NOOP_TRUNCATION_MODES_P (tmode, inner_mode)
+--- /dev/null
++++ gcc/testsuite/gcc.c-torture/execute/pr78378.c
+@@ -0,0 +1,18 @@
++/* PR rtl-optimization/78378 */
++
++unsigned long long __attribute__ ((noinline, noclone))
++foo (unsigned long long x)
++{
++ x <<= 41;
++ x /= 232;
++ return 1 + (unsigned short) x;
++}
++
++int
++main ()
++{
++ unsigned long long x = foo (1);
++ if (x != 0x2c24)
++ __builtin_abort();
++ return 0;
++}
+
diff --git a/SOURCES/gcc48-pr78416.patch b/SOURCES/gcc48-pr78416.patch
new file mode 100644
index 0000000..76e6e93
--- /dev/null
+++ b/SOURCES/gcc48-pr78416.patch
@@ -0,0 +1,108 @@
+2016-11-18 Jakub Jelinek
+
+ PR middle-end/78416
+ * expmed.c (expand_divmod): For modes wider than HWI, take into
+ account implicit 1 bits above msb for EXACT_POWER_OF_2_OR_ZERO_P.
+
+ * gcc.dg/torture/pr78416.c: New test.
+
+--- gcc/expmed.c
++++ gcc/expmed.c
+@@ -3844,7 +3844,15 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
+ if (unsignedp)
+ ext_op1 &= GET_MODE_MASK (mode);
+ op1_is_pow2 = ((EXACT_POWER_OF_2_OR_ZERO_P (ext_op1)
+- || (! unsignedp && EXACT_POWER_OF_2_OR_ZERO_P (-ext_op1))));
++ /* If mode is wider than HWI and op1 has msb set,
++ then it has there extra implicit 1 bits above it. */
++ && (GET_MODE_PRECISION (mode) <= HOST_BITS_PER_WIDE_INT
++ || INTVAL (op1) >= 0))
++ || (! unsignedp
++ && EXACT_POWER_OF_2_OR_ZERO_P (-ext_op1)
++ && (GET_MODE_PRECISION (mode)
++ <= HOST_BITS_PER_WIDE_INT
++ || INTVAL (op1) < 0)));
+ }
+
+ /*
+@@ -3987,8 +3995,17 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
+ op1_is_constant = CONST_INT_P (op1);
+ op1_is_pow2 = (op1_is_constant
+ && ((EXACT_POWER_OF_2_OR_ZERO_P (INTVAL (op1))
+- || (! unsignedp
+- && EXACT_POWER_OF_2_OR_ZERO_P (-UINTVAL (op1))))));
++ /* If mode is wider than HWI and op1 has msb set,
++ then it has there extra implicit 1 bits above
++ it. */
++ && (GET_MODE_PRECISION (compute_mode)
++ <= HOST_BITS_PER_WIDE_INT
++ || INTVAL (op1) >= 0))
++ || (! unsignedp
++ && EXACT_POWER_OF_2_OR_ZERO_P (-UINTVAL (op1))
++ && (GET_MODE_PRECISION (compute_mode)
++ <= HOST_BITS_PER_WIDE_INT
++ || INTVAL (op1) < 0))));
+ }
+
+ /* If one of the operands is a volatile MEM, copy it into a register. */
+@@ -4031,7 +4048,8 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
+ unsigned HOST_WIDE_INT d = (INTVAL (op1)
+ & GET_MODE_MASK (compute_mode));
+
+- if (EXACT_POWER_OF_2_OR_ZERO_P (d))
++ if (EXACT_POWER_OF_2_OR_ZERO_P (d)
++ && (INTVAL (op1) >= 0 || size <= HOST_BITS_PER_WIDE_INT))
+ {
+ pre_shift = floor_log2 (d);
+ if (rem_flag)
+@@ -4179,6 +4197,7 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
+ goto fail1;
+ }
+ else if (EXACT_POWER_OF_2_OR_ZERO_P (d)
++ && (size <= HOST_BITS_PER_WIDE_INT || d >= 0)
+ && (rem_flag
+ ? smod_pow2_cheap (speed, compute_mode)
+ : sdiv_pow2_cheap (speed, compute_mode))
+@@ -4192,7 +4211,9 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
+ compute_mode)
+ != CODE_FOR_nothing)))
+ ;
+- else if (EXACT_POWER_OF_2_OR_ZERO_P (abs_d))
++ else if (EXACT_POWER_OF_2_OR_ZERO_P (abs_d)
++ && (size <= HOST_BITS_PER_WIDE_INT
++ || abs_d != (unsigned HOST_WIDE_INT) d))
+ {
+ if (rem_flag)
+ {
+@@ -4504,7 +4525,10 @@ expand_divmod (int rem_flag, enum tree_code code, enum machine_mode mode,
+ case CEIL_MOD_EXPR:
+ if (unsignedp)
+ {
+- if (op1_is_constant && EXACT_POWER_OF_2_OR_ZERO_P (INTVAL (op1)))
++ if (op1_is_constant
++ && EXACT_POWER_OF_2_OR_ZERO_P (INTVAL (op1))
++ && (size <= HOST_BITS_PER_WIDE_INT
++ || INTVAL (op1) >= 0))
+ {
+ rtx t1, t2, t3;
+ unsigned HOST_WIDE_INT d = INTVAL (op1);
+--- gcc/testsuite/gcc.dg/torture/pr78416.c
++++ gcc/testsuite/gcc.dg/torture/pr78416.c
+@@ -0,0 +1,17 @@
++/* PR middle-end/78416 */
++/* { dg-do run { target int128 } } */
++
++int
++main ()
++{
++ unsigned __int128 x;
++ x = 0xFFFFFFFFFFFFFFFFULL;
++ x /= ~0x7FFFFFFFFFFFFFFFLL;
++ if (x != 0)
++ __builtin_abort ();
++ x = ~0x7FFFFFFFFFFFFFFELL;
++ x /= ~0x7FFFFFFFFFFFFFFFLL;
++ if (x != 1)
++ __builtin_abort ();
++ return 0;
++}
diff --git a/SOURCES/gcc48-pr78796.patch b/SOURCES/gcc48-pr78796.patch
new file mode 100644
index 0000000..6afd47a
--- /dev/null
+++ b/SOURCES/gcc48-pr78796.patch
@@ -0,0 +1,56 @@
+2016-12-14 Wilco Dijkstra
+ Jakub Jelinek
+
+ PR target/78796
+ * config/aarch64/aarch64.c (aarch64_classify_symbol): Merge large
+ model checks into switch.
+
+ * gcc.dg/tls/pr78796.c: New test.
+
+--- gcc/config/aarch64/aarch64.c (revision 243645)
++++ gcc/config/aarch64/aarch64.c (revision 243646)
+@@ -4986,6 +4986,9 @@ aarch64_classify_symbol (rtx x,
+ switch (aarch64_cmodel)
+ {
+ case AARCH64_CMODEL_LARGE:
++ if (aarch64_tls_symbol_p (x))
++ return aarch64_classify_tls_symbol (x);
++
+ return SYMBOL_FORCE_TO_MEM;
+
+ case AARCH64_CMODEL_TINY:
+--- gcc/testsuite/gcc.dg/tls/pr78796.c (nonexistent)
++++ gcc/testsuite/gcc.dg/tls/pr78796.c (revision 243646)
+@@ -0,0 +1,32 @@
++/* PR target/78796 */
++/* { dg-do run } */
++/* { dg-options "-O2" } */
++/* { dg-additional-options "-mcmodel=large" { target aarch64-*-* } } */
++/* { dg-require-effective-target tls } */
++
++struct S { int a, b, c, d, e; };
++struct S t;
++__thread struct S s;
++
++__attribute__((used, noinline, noclone)) void
++foo (int *x, int *y)
++{
++ asm volatile ("" : : "g" (x), "g" (y) : "memory");
++ if (*x != 1 || *y != 2)
++ __builtin_abort ();
++}
++
++__attribute__((used, noinline, noclone)) void
++bar (void)
++{
++ foo (&t.c, &s.c);
++}
++
++int
++main ()
++{
++ t.c = 1;
++ s.c = 2;
++ bar ();
++ return 0;
++}
diff --git a/SOURCES/gcc48-pr78875.patch b/SOURCES/gcc48-pr78875.patch
new file mode 100644
index 0000000..12dd0eb
--- /dev/null
+++ b/SOURCES/gcc48-pr78875.patch
@@ -0,0 +1,254 @@
+2017-01-17 Segher Boessenkool
+
+ PR target/78875
+ * config/rs6000/rs6000-opts.h (stack_protector_guard): New enum.
+ * config/rs6000/rs6000.c (rs6000_option_override_internal): Handle
+ the new options.
+ * config/rs6000/rs6000.md (stack_protect_set): Handle the new more
+ flexible settings.
+ (stack_protect_test): Ditto.
+ * config/rs6000/rs6000.opt (mstack-protector-guard=,
+ mstack-protector-guard-reg=, mstack-protector-guard-offset=): New
+ options.
+ * doc/invoke.texi (Option Summary) [RS/6000 and PowerPC Options]:
+ Add -mstack-protector-guard=, -mstack-protector-guard-reg=, and
+ -mstack-protector-guard-offset=.
+ (RS/6000 and PowerPC Options): Ditto.
+
+ * gcc.target/powerpc/ssp-1.c: New testcase.
+ * gcc.target/powerpc/ssp-2.c: New testcase.
+
+--- gcc/config/rs6000/rs6000.opt (revision 244555)
++++ gcc/config/rs6000/rs6000.opt (revision 244556)
+@@ -593,3 +593,31 @@ Allow float variables in upper registers
+ moptimize-swaps
+ Target Undocumented Var(rs6000_optimize_swaps) Init(1) Save
+ Analyze and remove doubleword swaps from VSX computations.
++
++mstack-protector-guard=
++Target RejectNegative Joined Enum(stack_protector_guard) Var(rs6000_stack_protector_guard) Init(SSP_TLS)
++Use given stack-protector guard.
++
++Enum
++Name(stack_protector_guard) Type(enum stack_protector_guard)
++Valid arguments to -mstack-protector-guard=:
++
++EnumValue
++Enum(stack_protector_guard) String(tls) Value(SSP_TLS)
++
++EnumValue
++Enum(stack_protector_guard) String(global) Value(SSP_GLOBAL)
++
++mstack-protector-guard-reg=
++Target RejectNegative Joined Var(rs6000_stack_protector_guard_reg_str)
++Use the given base register for addressing the stack-protector guard.
++
++TargetVariable
++int rs6000_stack_protector_guard_reg = 0
++
++mstack-protector-guard-offset=
++Target RejectNegative Joined Integer Var(rs6000_stack_protector_guard_offset_str)
++Use the given offset for addressing the stack-protector guard.
++
++TargetVariable
++long rs6000_stack_protector_guard_offset = 0
+--- gcc/config/rs6000/rs6000.c (revision 244555)
++++ gcc/config/rs6000/rs6000.c (revision 244556)
+@@ -3727,6 +3727,54 @@ rs6000_option_override_internal (bool gl
+ atoi (rs6000_sched_insert_nops_str));
+ }
+
++ /* Handle stack protector */
++ if (!global_options_set.x_rs6000_stack_protector_guard)
++#ifdef TARGET_THREAD_SSP_OFFSET
++ rs6000_stack_protector_guard = SSP_TLS;
++#else
++ rs6000_stack_protector_guard = SSP_GLOBAL;
++#endif
++
++#ifdef TARGET_THREAD_SSP_OFFSET
++ rs6000_stack_protector_guard_offset = TARGET_THREAD_SSP_OFFSET;
++ rs6000_stack_protector_guard_reg = TARGET_64BIT ? 13 : 2;
++#endif
++
++ if (global_options_set.x_rs6000_stack_protector_guard_offset_str)
++ {
++ char *endp;
++ const char *str = rs6000_stack_protector_guard_offset_str;
++
++ errno = 0;
++ long offset = strtol (str, &endp, 0);
++ if (!*str || *endp || errno)
++ error ("%qs is not a valid number "
++ "in -mstack-protector-guard-offset=", str);
++
++ if (!IN_RANGE (offset, -0x8000, 0x7fff)
++ || (TARGET_64BIT && (offset & 3)))
++ error ("%qs is not a valid offset "
++ "in -mstack-protector-guard-offset=", str);
++
++ rs6000_stack_protector_guard_offset = offset;
++ }
++
++ if (global_options_set.x_rs6000_stack_protector_guard_reg_str)
++ {
++ const char *str = rs6000_stack_protector_guard_reg_str;
++ int reg = decode_reg_name (str);
++
++ if (!IN_RANGE (reg, 1, 31))
++ error ("%qs is not a valid base register "
++ "in -mstack-protector-guard-reg=", str);
++
++ rs6000_stack_protector_guard_reg = reg;
++ }
++
++ if (rs6000_stack_protector_guard == SSP_TLS
++ && !IN_RANGE (rs6000_stack_protector_guard_reg, 1, 31))
++ error ("-mstack-protector-guard=tls needs a valid base register");
++
+ if (global_init_p)
+ {
+ #ifdef TARGET_REGNAMES
+--- gcc/config/rs6000/rs6000.md (revision 244555)
++++ gcc/config/rs6000/rs6000.md (revision 244556)
+@@ -13092,19 +13092,23 @@
+
+
+ (define_expand "stack_protect_set"
+- [(match_operand 0 "memory_operand" "")
+- (match_operand 1 "memory_operand" "")]
++ [(match_operand 0 "memory_operand")
++ (match_operand 1 "memory_operand")]
+ ""
+ {
+-#ifdef TARGET_THREAD_SSP_OFFSET
+- rtx tlsreg = gen_rtx_REG (Pmode, TARGET_64BIT ? 13 : 2);
+- rtx addr = gen_rtx_PLUS (Pmode, tlsreg, GEN_INT (TARGET_THREAD_SSP_OFFSET));
+- operands[1] = gen_rtx_MEM (Pmode, addr);
+-#endif
++ if (rs6000_stack_protector_guard == SSP_TLS)
++ {
++ rtx reg = gen_rtx_REG (Pmode, rs6000_stack_protector_guard_reg);
++ rtx offset = GEN_INT (rs6000_stack_protector_guard_offset);
++ rtx addr = gen_rtx_PLUS (Pmode, reg, offset);
++ operands[1] = gen_rtx_MEM (Pmode, addr);
++ }
++
+ if (TARGET_64BIT)
+ emit_insn (gen_stack_protect_setdi (operands[0], operands[1]));
+ else
+ emit_insn (gen_stack_protect_setsi (operands[0], operands[1]));
++
+ DONE;
+ })
+
+@@ -13127,21 +13131,26 @@
+ (set_attr "length" "12")])
+
+ (define_expand "stack_protect_test"
+- [(match_operand 0 "memory_operand" "")
+- (match_operand 1 "memory_operand" "")
+- (match_operand 2 "" "")]
++ [(match_operand 0 "memory_operand")
++ (match_operand 1 "memory_operand")
++ (match_operand 2 "")]
+ ""
+ {
+- rtx test, op0, op1;
+-#ifdef TARGET_THREAD_SSP_OFFSET
+- rtx tlsreg = gen_rtx_REG (Pmode, TARGET_64BIT ? 13 : 2);
+- rtx addr = gen_rtx_PLUS (Pmode, tlsreg, GEN_INT (TARGET_THREAD_SSP_OFFSET));
+- operands[1] = gen_rtx_MEM (Pmode, addr);
+-#endif
+- op0 = operands[0];
+- op1 = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, operands[1]), UNSPEC_SP_TEST);
+- test = gen_rtx_EQ (VOIDmode, op0, op1);
+- emit_jump_insn (gen_cbranchsi4 (test, op0, op1, operands[2]));
++ rtx guard = operands[1];
++
++ if (rs6000_stack_protector_guard == SSP_TLS)
++ {
++ rtx reg = gen_rtx_REG (Pmode, rs6000_stack_protector_guard_reg);
++ rtx offset = GEN_INT (rs6000_stack_protector_guard_offset);
++ rtx addr = gen_rtx_PLUS (Pmode, reg, offset);
++ guard = gen_rtx_MEM (Pmode, addr);
++ }
++
++ operands[1] = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, guard), UNSPEC_SP_TEST);
++ rtx test = gen_rtx_EQ (VOIDmode, operands[0], operands[1]);
++ rtx jump = gen_cbranchsi4 (test, operands[0], operands[1], operands[2]);
++ emit_jump_insn (jump);
++
+ DONE;
+ })
+
+--- gcc/config/rs6000/rs6000-opts.h (revision 244555)
++++ gcc/config/rs6000/rs6000-opts.h (revision 244556)
+@@ -154,6 +154,12 @@ enum rs6000_vector {
+ VECTOR_OTHER /* Some other vector unit */
+ };
+
++/* Where to get the canary for the stack protector. */
++enum stack_protector_guard {
++ SSP_TLS, /* per-thread canary in TLS block */
++ SSP_GLOBAL /* global canary */
++};
++
+ /* No enumeration is defined to index the -mcpu= values (entries in
+ processor_target_table), with the type int being used instead, but
+ we need to distinguish the special "native" value. */
+--- gcc/doc/invoke.texi (revision 244555)
++++ gcc/doc/invoke.texi (revision 244556)
+@@ -862,7 +862,9 @@ See RS/6000 and PowerPC Options.
+ -mcrypto -mno-crypto -mdirect-move -mno-direct-move @gol
+ -mquad-memory -mno-quad-memory @gol
+ -mquad-memory-atomic -mno-quad-memory-atomic @gol
+--mcompat-align-parm -mno-compat-align-parm}
++-mcompat-align-parm -mno-compat-align-parm @gol
++-mstack-protector-guard=@var{guard} -mstack-protector-guard-reg=@var{reg} @gol
++-mstack-protector-guard-offset=@var{offset}}
+
+ @emph{RX Options}
+ @gccoptlist{-m64bit-doubles -m32bit-doubles -fpu -nofpu@gol
+@@ -18295,6 +18297,23 @@ GCC.
+
+ In this version of the compiler, the @option{-mcompat-align-parm}
+ is the default, except when using the Linux ELFv2 ABI.
++
++@item -mstack-protector-guard=@var{guard}
++@itemx -mstack-protector-guard-reg=@var{reg}
++@itemx -mstack-protector-guard-offset=@var{offset}
++@opindex mstack-protector-guard
++@opindex mstack-protector-guard-reg
++@opindex mstack-protector-guard-offset
++Generate stack protection code using canary at @var{guard}. Supported
++locations are @samp{global} for global canary or @samp{tls} for per-thread
++canary in the TLS block (the default with GNU libc version 2.4 or later).
++
++With the latter choice the options
++@option{-mstack-protector-guard-reg=@var{reg}} and
++@option{-mstack-protector-guard-offset=@var{offset}} furthermore specify
++which register to use as base register for reading the canary, and from what
++offset from that base register. The default for those is as specified in the
++relevant ABI.
+ @end table
+
+ @node RX Options
+--- gcc/testsuite/gcc.target/powerpc/ssp-1.c (nonexistent)
++++ gcc/testsuite/gcc.target/powerpc/ssp-1.c (revision 244562)
+@@ -0,0 +1,6 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-protector-all -mstack-protector-guard=global" } */
++
++/* { dg-final { scan-assembler "__stack_chk_guard" } } */
++
++void f(void) { }
+--- gcc/testsuite/gcc.target/powerpc/ssp-2.c (nonexistent)
++++ gcc/testsuite/gcc.target/powerpc/ssp-2.c (revision 244562)
+@@ -0,0 +1,6 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-protector-all -mstack-protector-guard=tls -mstack-protector-guard-reg=r18 -mstack-protector-guard-offset=0x3038" } */
++
++/* { dg-final { scan-assembler {\m12344\(r?18\)} } } */
++
++void f(void) { }
diff --git a/SOURCES/gcc48-pr79439.patch b/SOURCES/gcc48-pr79439.patch
new file mode 100644
index 0000000..c593dfc
--- /dev/null
+++ b/SOURCES/gcc48-pr79439.patch
@@ -0,0 +1,53 @@
+2017-03-01 Michael Meissner
+
+ PR target/79439
+ * config/rs6000/predicates.md (current_file_function_operand): Do
+ not allow self calls to be local if the function is replaceable.
+
+ * gcc.target/powerpc/pr79439.c: New test.
+
+--- gcc/config/rs6000/predicates.md (revision 245812)
++++ gcc/config/rs6000/predicates.md (revision 245813)
+@@ -1086,8 +1086,8 @@
+ && ((DEFAULT_ABI != ABI_AIX
+ && DEFAULT_ABI != ABI_ELFv2)
+ || !SYMBOL_REF_EXTERNAL_P (op)))
+- || (op == XEXP (DECL_RTL (current_function_decl),
+- 0)))")))
++ || (op == XEXP (DECL_RTL (current_function_decl), 0)
++ && !decl_replaceable_p (current_function_decl)))")))
+
+ ;; Return 1 if this operand is a valid input for a move insn.
+ (define_predicate "input_operand"
+--- gcc/testsuite/gcc.target/powerpc/pr79439.c (nonexistent)
++++ gcc/testsuite/gcc.target/powerpc/pr79439.c (revision 245813)
+@@ -0,0 +1,29 @@
++/* { dg-do compile { target { powerpc64*-*-linux* && lp64 } } } */
++/* { dg-options "-O2 -fpic" } */
++
++/* On the Linux 64-bit ABIs, we should not eliminate NOP in the 'rec' call if
++ -fpic is used because rec can be interposed at link time (since it is
++ external), and the recursive call should call the interposed function. The
++ Linux 32-bit ABIs do not require NOPs after the BL instruction. */
++
++int f (void);
++
++void
++g (void)
++{
++}
++
++int
++rec (int a)
++{
++ int ret = 0;
++ if (a > 10 && f ())
++ ret += rec (a - 1);
++ g ();
++ return a + ret;
++}
++
++/* { dg-final { scan-assembler-times {\mbl f\M} 1 } } */
++/* { dg-final { scan-assembler-times {\mbl g\M} 2 } } */
++/* { dg-final { scan-assembler-times {\mbl rec\M} 1 } } */
++/* { dg-final { scan-assembler-times {\mnop\M} 4 } } */
diff --git a/SOURCES/gcc48-pr79969.patch b/SOURCES/gcc48-pr79969.patch
new file mode 100644
index 0000000..53a4ed7
--- /dev/null
+++ b/SOURCES/gcc48-pr79969.patch
@@ -0,0 +1,43 @@
+2017-03-09 Jakub Jelinek
+
+ PR c/79969
+ * c-decl.c (start_enum): Adjust DECL_SOURCE_LOCATION of
+ TYPE_STUB_DECL.
+
+ * gcc.dg/debug/dwarf2/enum-loc1.c: New test.
+
+--- gcc/c/c-decl.c.jj 2017-03-05 22:39:45.000000000 +0100
++++ gcc/c/c-decl.c 2017-03-09 08:19:33.100042166 +0100
+@@ -8201,6 +8201,10 @@ start_enum (location_t loc, struct c_enu
+ enumtype = make_node (ENUMERAL_TYPE);
+ pushtag (loc, name, enumtype);
+ }
++ /* Update type location to the one of the definition, instead of e.g.
++ a forward declaration. */
++ else if (TYPE_STUB_DECL (enumtype))
++ DECL_SOURCE_LOCATION (TYPE_STUB_DECL (enumtype)) = loc;
+
+ if (C_TYPE_BEING_DEFINED (enumtype))
+ error_at (loc, "nested redefinition of %", name);
+--- gcc/testsuite/gcc.dg/debug/dwarf2/enum-loc1.c.jj 2017-03-09 08:09:30.742037844 +0100
++++ gcc/testsuite/gcc.dg/debug/dwarf2/enum-loc1.c 2017-03-09 08:16:45.202268438 +0100
+@@ -0,0 +1,19 @@
++/* PR c/79969 */
++/* { dg-do compile } */
++/* { dg-options "-gdwarf-2 -dA -fno-merge-debug-strings" } */
++
++enum ENUMTAG;
++
++enum ENUMTAG
++{
++ B = 1,
++ C = 2
++};
++
++void
++bar (void)
++{
++ enum ENUMTAG a = C;
++}
++
++/* { dg-final { scan-assembler "DW_TAG_enumeration_type\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\"ENUMTAG\[^\\r\\n\]*DW_AT_name(\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_)*\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\[^0-9a-fA-FxX](0x)?7\[^0-9a-fA-FxX]\[^\\r\\n\]*DW_AT_decl_line" } } */
diff --git a/SOURCES/gcc48-pr80129.patch b/SOURCES/gcc48-pr80129.patch
new file mode 100644
index 0000000..34e160e
--- /dev/null
+++ b/SOURCES/gcc48-pr80129.patch
@@ -0,0 +1,45 @@
+2017-05-30 Jakub Jelinek
+
+ Backported from mainline
+ 2017-03-22 Jakub Jelinek
+
+ PR c++/80129
+ * gimplify.c (gimplify_modify_expr_rhs) : Clear
+ TREE_READONLY on result if writing it more than once.
+
+ * g++.dg/torture/pr80129.C: New test.
+
+--- gcc/gimplify.c
++++ gcc/gimplify.c
+@@ -4293,6 +4293,14 @@ gimplify_modify_expr_rhs (tree *expr_p, tree *from_p, tree *to_p,
+ if (ret != GS_ERROR)
+ ret = GS_OK;
+
++ /* If we are going to write RESULT more than once, clear
++ TREE_READONLY flag, otherwise we might incorrectly promote
++ the variable to static const and initialize it at compile
++ time in one of the branches. */
++ if (TREE_CODE (result) == VAR_DECL
++ && TREE_TYPE (TREE_OPERAND (cond, 1)) != void_type_node
++ && TREE_TYPE (TREE_OPERAND (cond, 2)) != void_type_node)
++ TREE_READONLY (result) = 0;
+ if (TREE_TYPE (TREE_OPERAND (cond, 1)) != void_type_node)
+ TREE_OPERAND (cond, 1)
+ = build2 (code, void_type_node, result,
+--- /dev/null
++++ gcc/testsuite/g++.dg/torture/pr80129.C
+@@ -0,0 +1,14 @@
++// PR c++/80129
++// { dg-do run }
++// { dg-options "-std=c++11" }
++
++struct A { bool a; int b; };
++
++int
++main ()
++{
++ bool c = false;
++ const A x = c ? A {true, 1} : A {false, 0};
++ if (x.a)
++ __builtin_abort ();
++}
diff --git a/SOURCES/gcc48-pr80362.patch b/SOURCES/gcc48-pr80362.patch
new file mode 100644
index 0000000..1137857
--- /dev/null
+++ b/SOURCES/gcc48-pr80362.patch
@@ -0,0 +1,38 @@
+2017-09-18 Richard Biener
+
+ Backport from mainline
+ 2017-04-10 Richard Biener
+
+ PR middle-end/80362
+ * fold-const.c (fold_binary_loc): Look at unstripped ops when
+ looking for NEGATE_EXPR in -A / -B to A / B folding.
+
+ * gcc.dg/torture/pr80362.c: New testcase.
+
+--- gcc/fold-const.c
++++ gcc/fold-const.c
+@@ -11940,8 +11942,8 @@ fold_binary_loc (location_t loc,
+ /* Convert -A / -B to A / B when the type is signed and overflow is
+ undefined. */
+ if ((!INTEGRAL_TYPE_P (type) || TYPE_OVERFLOW_UNDEFINED (type))
+- && TREE_CODE (arg0) == NEGATE_EXPR
+- && negate_expr_p (arg1))
++ && TREE_CODE (op0) == NEGATE_EXPR
++ && negate_expr_p (op1))
+ {
+ if (INTEGRAL_TYPE_P (type))
+ fold_overflow_warning (("assuming signed overflow does not occur "
+--- /dev/null
++++ gcc/testsuite/gcc.dg/torture/pr80362.c
+@@ -0,0 +1,11 @@
++/* { dg-do run } */
++/* { dg-additional-options "-fstrict-overflow" } */
++
++int main()
++{
++ signed char var_0, var_1 = -128;
++ var_0 = (signed char)(-var_1) / 3;
++ if (var_0 > 0)
++ __builtin_abort();
++ return 0;
++}
diff --git a/SOURCES/gcc48-pr80692.patch b/SOURCES/gcc48-pr80692.patch
new file mode 100644
index 0000000..2e3e352
--- /dev/null
+++ b/SOURCES/gcc48-pr80692.patch
@@ -0,0 +1,53 @@
+2017-06-27 Segher Boessenkool
+
+ Backport from trunk
+ 2017-05-17 Segher Boessenkool
+
+ PR middle-end/80692
+ * real.c (do_compare): Give decimal_do_compare preference over
+ comparing just the signs.
+
+ * gcc.c-torture/execute/pr80692.c: New testcase.
+
+--- gcc/real.c
++++ gcc/real.c
+@@ -950,12 +950,12 @@ do_compare (const REAL_VALUE_TYPE *a, const REAL_VALUE_TYPE *b,
+ gcc_unreachable ();
+ }
+
+- if (a->sign != b->sign)
+- return -a->sign - -b->sign;
+-
+ if (a->decimal || b->decimal)
+ return decimal_do_compare (a, b, nan_result);
+
++ if (a->sign != b->sign)
++ return -a->sign - -b->sign;
++
+ if (REAL_EXP (a) > REAL_EXP (b))
+ ret = 1;
+ else if (REAL_EXP (a) < REAL_EXP (b))
+--- /dev/null
++++ gcc/testsuite/gcc.c-torture/execute/pr80692.c
+@@ -0,0 +1,11 @@
++int main () {
++ _Decimal64 d64 = -0.DD;
++
++ if (d64 != 0.DD)
++ __builtin_abort ();
++
++ if (d64 != -0.DD)
++ __builtin_abort ();
++
++ return 0;
++}
+--- /dev/null
++++ gcc/testsuite/gcc.c-torture/execute/pr80692.x
+@@ -0,0 +1,7 @@
++load_lib target-supports.exp
++
++if { ! [check_effective_target_dfp] } {
++ return 1
++}
++
++return 0
diff --git a/SOURCES/gcc48-pr81395.patch b/SOURCES/gcc48-pr81395.patch
new file mode 100644
index 0000000..b99fb74
--- /dev/null
+++ b/SOURCES/gcc48-pr81395.patch
@@ -0,0 +1,67 @@
+2017-07-18 Jonathan Wakely
+
+ PR libstdc++/81395
+ * include/bits/fstream.tcc (basic_filebuf::xsgetn): Don't set buffer
+ pointers for write mode after reading.
+ * testsuite/27_io/basic_filebuf/sgetn/char/81395.cc: New.
+
+--- libstdc++-v3/include/bits/fstream.tcc (revision 254017)
++++ libstdc++-v3/include/bits/fstream.tcc (revision 254018)
+@@ -699,7 +699,7 @@
+
+ if (__n == 0)
+ {
+- _M_set_buffer(0);
++ // Set _M_reading. Buffer is already in initial 'read' mode.
+ _M_reading = true;
+ }
+ else if (__len == 0)
+--- libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/81395.cc (nonexistent)
++++ libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/81395.cc (revision 254018)
+@@ -0,0 +1,46 @@
++// Copyright (C) 2017 Free Software Foundation, Inc.
++//
++// This file is part of the GNU ISO C++ Library. This library 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 library 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 library; see the file COPYING3. If not see
++// .
++
++// { dg-require-fileio "" }
++
++// PR libstdc++/81395
++
++#include
++#include // for std::memset
++#include // For BUFSIZ
++
++using std::memset;
++
++int main()
++{
++ {
++ std::filebuf fb;
++ fb.open("test.txt", std::ios::out);
++ char data[BUFSIZ];
++ memset(data, 'A', sizeof(data));
++ fb.sputn(data, sizeof(data));
++ }
++
++ std::filebuf fb;
++ fb.open("test.txt", std::ios::in|std::ios::out);
++ char buf[BUFSIZ];
++ memset(buf, 0, sizeof(buf));
++ fb.sgetn(buf, sizeof(buf));
++ // Switch from reading to writing without seeking first:
++ fb.sputn("B", 1);
++ fb.pubsync();
++}
diff --git a/SOURCES/gcc48-pr82274.patch b/SOURCES/gcc48-pr82274.patch
new file mode 100644
index 0000000..5a330b9
--- /dev/null
+++ b/SOURCES/gcc48-pr82274.patch
@@ -0,0 +1,40 @@
+2017-10-13 Jakub Jelinek
+
+ PR target/82274
+ * libgcc2.c (__mulvDI3): If both operands have
+ the same highpart of -1 and the topmost bit of lowpart is 0,
+ multiplication overflows even if both lowparts are 0.
+
+ * gcc.dg/pr82274-1.c: New test.
+
+--- libgcc/libgcc2.c 2017/10/13 16:50:13 253733
++++ libgcc/libgcc2.c 2017/10/13 17:19:12 253734
+@@ -375,7 +375,8 @@
+ }
+ else
+ {
+- if (uu.s.high == (Wtype) -1 && vv.s.high == (Wtype) - 1)
++ if ((uu.s.high & vv.s.high) == (Wtype) -1
++ && (uu.s.low | vv.s.low) != 0)
+ {
+ DWunion ww = {.ll = (UDWtype) (UWtype) uu.s.low
+ * (UDWtype) (UWtype) vv.s.low};
+--- /dev/null
++++ gcc/testsuite/gcc.dg/pr82274-1.c
+@@ -0,0 +1,16 @@
++/* PR target/82274 */
++/* { dg-do run } */
++/* { dg-shouldfail "trapv" } */
++/* { dg-options "-ftrapv" } */
++
++int
++main ()
++{
++#ifdef __SIZEOF_INT128__
++ volatile __int128 m = -(((__int128) 1) << (__CHAR_BIT__ * __SIZEOF_INT128__ / 2));
++#else
++ volatile long long m = -(1LL << (__CHAR_BIT__ * __SIZEOF_LONG_LONG__ / 2));
++#endif
++ m = m * m;
++ return 0;
++}
diff --git a/SOURCES/gcc48-rh1180633.patch b/SOURCES/gcc48-rh1180633.patch
new file mode 100644
index 0000000..f3898f9
--- /dev/null
+++ b/SOURCES/gcc48-rh1180633.patch
@@ -0,0 +1,338 @@
+2016-01-22 Torvald Riegel
+
+ * beginend.cc (GTM::gtm_thread::serial_lock): Put on cacheline
+ boundary.
+ (htm_fastpath): Remove.
+ (gtm_thread::begin_transaction): Fix HTM fastpath.
+ (_ITM_commitTransaction): Adapt.
+ (_ITM_commitTransactionEH): Adapt.
+ * libitm/config/linux/rwlock.h (gtm_rwlock): Add htm_fastpath member
+ and accessors.
+ * libitm/config/posix/rwlock.h (gtm_rwlock): Likewise.
+ * libitm/config/posix/rwlock.cc (gtm_rwlock::gtm_rwlock): Adapt.
+ * libitm/libitm_i.h (htm_fastpath): Remove declaration.
+ * libitm/method-serial.cc (htm_mg): Adapt.
+ (gtm_thread::serialirr_mode): Adapt.
+ * libitm/query.cc (_ITM_inTransaction, _ITM_getTransactionId): Adapt.
+
+--- libitm/beginend.cc
++++ libitm/beginend.cc
+@@ -32,7 +32,11 @@ using namespace GTM;
+ extern __thread gtm_thread_tls _gtm_thr_tls;
+ #endif
+
+-gtm_rwlock GTM::gtm_thread::serial_lock;
++// Put this at the start of a cacheline so that serial_lock's writers and
++// htm_fastpath fields are on the same cacheline, so that HW transactions
++// only have to pay one cacheline capacity to monitor both.
++gtm_rwlock GTM::gtm_thread::serial_lock
++ __attribute__((aligned(HW_CACHELINE_SIZE)));
+ gtm_thread *GTM::gtm_thread::list_of_threads = 0;
+ unsigned GTM::gtm_thread::number_of_threads = 0;
+
+@@ -54,9 +58,6 @@ static pthread_mutex_t global_tid_lock = PTHREAD_MUTEX_INITIALIZER;
+ static pthread_key_t thr_release_key;
+ static pthread_once_t thr_release_once = PTHREAD_ONCE_INIT;
+
+-// See gtm_thread::begin_transaction.
+-uint32_t GTM::htm_fastpath = 0;
+-
+ /* Allocate a transaction structure. */
+ void *
+ GTM::gtm_thread::operator new (size_t s)
+@@ -174,9 +175,11 @@ GTM::gtm_thread::begin_transaction (uint32_t prop, const gtm_jmpbuf *jb)
+ // lock's writer flag and thus abort if another thread is or becomes a
+ // serial transaction. Therefore, if the fastpath is enabled, then a
+ // transaction is not executing as a HW transaction iff the serial lock is
+- // write-locked. This allows us to use htm_fastpath and the serial lock's
+- // writer flag to reliable determine whether the current thread runs a HW
+- // transaction, and thus we do not need to maintain this information in
++ // write-locked. Also, HW transactions monitor the fastpath control
++ // variable, so that they will only execute if dispatch_htm is still the
++ // current method group. This allows us to use htm_fastpath and the serial
++ // lock's writers flag to reliable determine whether the current thread runs
++ // a HW transaction, and thus we do not need to maintain this information in
+ // per-thread state.
+ // If an uninstrumented code path is not available, we can still run
+ // instrumented code from a HW transaction because the HTM fastpath kicks
+@@ -187,9 +190,14 @@ GTM::gtm_thread::begin_transaction (uint32_t prop, const gtm_jmpbuf *jb)
+ // indeed in serial mode, and HW transactions should never need serial mode
+ // for any internal changes (e.g., they never abort visibly to the STM code
+ // and thus do not trigger the standard retry handling).
+- if (likely(htm_fastpath && (prop & pr_hasNoAbort)))
++ if (likely(serial_lock.get_htm_fastpath() && (prop & pr_hasNoAbort)))
+ {
+- for (uint32_t t = htm_fastpath; t; t--)
++ // Note that the snapshot of htm_fastpath that we take here could be
++ // outdated, and a different method group than dispatch_htm may have
++ // been chosen in the meantime. Therefore, take care not not touch
++ // anything besides the serial lock, which is independent of method
++ // groups.
++ for (uint32_t t = serial_lock.get_htm_fastpath(); t; t--)
+ {
+ uint32_t ret = htm_begin();
+ if (htm_begin_success(ret))
+@@ -197,9 +205,11 @@ GTM::gtm_thread::begin_transaction (uint32_t prop, const gtm_jmpbuf *jb)
+ // We are executing a transaction now.
+ // Monitor the writer flag in the serial-mode lock, and abort
+ // if there is an active or waiting serial-mode transaction.
++ // Also checks that htm_fastpath is still nonzero and thus
++ // HW transactions are allowed to run.
+ // Note that this can also happen due to an enclosing
+ // serial-mode transaction; we handle this case below.
+- if (unlikely(serial_lock.is_write_locked()))
++ if (unlikely(serial_lock.htm_fastpath_disabled()))
+ htm_abort();
+ else
+ // We do not need to set a_saveLiveVariables because of HTM.
+@@ -210,9 +220,12 @@ GTM::gtm_thread::begin_transaction (uint32_t prop, const gtm_jmpbuf *jb)
+ // retrying the transaction will be successful.
+ if (!htm_abort_should_retry(ret))
+ break;
++ // Check whether the HTM fastpath has been disabled.
++ if (!serial_lock.get_htm_fastpath())
++ break;
+ // Wait until any concurrent serial-mode transactions have finished.
+ // This is an empty critical section, but won't be elided.
+- if (serial_lock.is_write_locked())
++ if (serial_lock.htm_fastpath_disabled())
+ {
+ tx = gtm_thr();
+ if (unlikely(tx == NULL))
+@@ -618,7 +631,7 @@ _ITM_commitTransaction(void)
+ // a serial-mode transaction. If we are, then there will be no other
+ // concurrent serial-mode transaction.
+ // See gtm_thread::begin_transaction.
+- if (likely(htm_fastpath && !gtm_thread::serial_lock.is_write_locked()))
++ if (likely(!gtm_thread::serial_lock.htm_fastpath_disabled()))
+ {
+ htm_commit();
+ return;
+@@ -634,7 +647,7 @@ _ITM_commitTransactionEH(void *exc_ptr)
+ {
+ #if defined(USE_HTM_FASTPATH)
+ // See _ITM_commitTransaction.
+- if (likely(htm_fastpath && !gtm_thread::serial_lock.is_write_locked()))
++ if (likely(!gtm_thread::serial_lock.htm_fastpath_disabled()))
+ {
+ htm_commit();
+ return;
+--- libitm/config/linux/rwlock.h
++++ libitm/config/linux/rwlock.h
+@@ -39,16 +39,29 @@ struct gtm_thread;
+ //
+ // In this implementation, writers are given highest priority access but
+ // read-to-write upgrades do not have a higher priority than writers.
++//
++// Do not change the layout of this class; it must remain a POD type with
++// standard layout, and the writers field must be first (i.e., so the
++// assembler code can assume that its address is equal to the address of the
++// respective instance of the class), and htm_fastpath must be second.
+
+ class gtm_rwlock
+ {
+- // TODO Put futexes on different cachelines?
+ std::atomic writers; // Writers' futex.
++ // We put the HTM fastpath control variable here so that HTM fastpath
++ // transactions can check efficiently whether they are allowed to run.
++ // This must be accessed atomically because threads can load this value
++ // when they are neither a registered reader nor writer (i.e., when they
++ // attempt to execute the HTM fastpath).
++ std::atomic htm_fastpath;
++ // TODO Put these futexes on different cachelines? (writers and htm_fastpath
++ // should remain on the same cacheline.
+ std::atomic writer_readers;// A confirmed writer waits here for readers.
+ std::atomic readers; // Readers wait here for writers (iff true).
+
+ public:
+- gtm_rwlock() : writers(0), writer_readers(0), readers(0) {};
++ gtm_rwlock() : writers(0), htm_fastpath(0), writer_readers(0), readers(0)
++ { }
+
+ void read_lock (gtm_thread *tx);
+ void read_unlock (gtm_thread *tx);
+@@ -59,12 +72,28 @@ class gtm_rwlock
+ bool write_upgrade (gtm_thread *tx);
+ void write_upgrade_finish (gtm_thread *tx);
+
+- // Returns true iff there is a concurrent active or waiting writer.
+- // This is primarily useful for simple HyTM approaches, and the value being
+- // checked is loaded with memory_order_relaxed.
+- bool is_write_locked()
++ // Returns true iff there is a concurrent active or waiting writer, or
++ // htm_fastpath is zero. This is primarily useful for simple HyTM
++ // approaches, and the values being checked are loaded with
++ // memory_order_relaxed.
++ bool htm_fastpath_disabled ()
++ {
++ return writers.load (memory_order_relaxed) != 0
++ || htm_fastpath.load (memory_order_relaxed) == 0;
++ }
++
++ // This does not need to return an exact value, hence relaxed MO is
++ // sufficient.
++ uint32_t get_htm_fastpath ()
++ {
++ return htm_fastpath.load (memory_order_relaxed);
++ }
++ // This must only be called while having acquired the write lock, and other
++ // threads do not need to load an exact value; hence relaxed MO is
++ // sufficient.
++ void set_htm_fastpath (uint32_t val)
+ {
+- return writers.load (memory_order_relaxed) != 0;
++ htm_fastpath.store (val, memory_order_relaxed);
+ }
+
+ protected:
+--- libitm/config/posix/rwlock.h
++++ libitm/config/posix/rwlock.h
+@@ -44,19 +44,32 @@ struct gtm_thread;
+ //
+ // In this implementation, writers are given highest priority access but
+ // read-to-write upgrades do not have a higher priority than writers.
++//
++// Do not change the layout of this class; it must remain a POD type with
++// standard layout, and the summary field must be first (i.e., so the
++// assembler code can assume that its address is equal to the address of the
++// respective instance of the class), and htm_fastpath must be second.
+
+ class gtm_rwlock
+ {
+- pthread_mutex_t mutex; // Held if manipulating any field.
+- pthread_cond_t c_readers; // Readers wait here
+- pthread_cond_t c_writers; // Writers wait here for writers
+- pthread_cond_t c_confirmed_writers; // Writers wait here for readers
+-
+ static const unsigned a_writer = 1; // An active writer.
+ static const unsigned w_writer = 2; // The w_writers field != 0
+ static const unsigned w_reader = 4; // The w_readers field != 0
+
+ std::atomic summary; // Bitmask of the above.
++
++ // We put the HTM fastpath control variable here so that HTM fastpath
++ // transactions can check efficiently whether they are allowed to run.
++ // This must be accessed atomically because threads can load this value
++ // when they are neither a registered reader nor writer (i.e., when they
++ // attempt to execute the HTM fastpath).
++ std::atomic htm_fastpath;
++
++ pthread_mutex_t mutex; // Held if manipulating any field.
++ pthread_cond_t c_readers; // Readers wait here
++ pthread_cond_t c_writers; // Writers wait here for writers
++ pthread_cond_t c_confirmed_writers; // Writers wait here for readers
++
+ unsigned int a_readers; // Nr active readers as observed by a writer
+ unsigned int w_readers; // Nr waiting readers
+ unsigned int w_writers; // Nr waiting writers
+@@ -74,12 +87,28 @@ class gtm_rwlock
+ bool write_upgrade (gtm_thread *tx);
+ void write_upgrade_finish (gtm_thread *tx);
+
+- // Returns true iff there is a concurrent active or waiting writer.
+- // This is primarily useful for simple HyTM approaches, and the value being
+- // checked is loaded with memory_order_relaxed.
+- bool is_write_locked()
++ // Returns true iff there is a concurrent active or waiting writer, or
++ // htm_fastpath is zero. This is primarily useful for simple HyTM
++ // approaches, and the values being checked are loaded with
++ // memory_order_relaxed.
++ bool htm_fastpath_disabled ()
++ {
++ return (summary.load (memory_order_relaxed) & (a_writer | w_writer))
++ || htm_fastpath.load (memory_order_relaxed) == 0;
++ }
++
++ // This does not need to return an exact value, hence relaxed MO is
++ // sufficient.
++ uint32_t get_htm_fastpath ()
++ {
++ return htm_fastpath.load (memory_order_relaxed);
++ }
++ // This must only be called while having acquired the write lock, and other
++ // threads do not need to load an exact value; hence relaxed MO is
++ // sufficient.
++ void set_htm_fastpath (uint32_t val)
+ {
+- return summary.load (memory_order_relaxed) & (a_writer | w_writer);
++ htm_fastpath.store (val, memory_order_relaxed);
+ }
+
+ protected:
+--- libitm/config/posix/rwlock.cc
++++ libitm/config/posix/rwlock.cc
+@@ -30,11 +30,12 @@ namespace GTM HIDDEN {
+ // ??? Move this back to the header file when constexpr is implemented.
+
+ gtm_rwlock::gtm_rwlock()
+- : mutex (PTHREAD_MUTEX_INITIALIZER),
++ : summary (0),
++ htm_fastpath (0),
++ mutex (PTHREAD_MUTEX_INITIALIZER),
+ c_readers (PTHREAD_COND_INITIALIZER),
+ c_writers (PTHREAD_COND_INITIALIZER),
+ c_confirmed_writers (PTHREAD_COND_INITIALIZER),
+- summary (0),
+ a_readers (0),
+ w_readers (0),
+ w_writers (0)
+--- libitm/libitm_i.h
++++ libitm/libitm_i.h
+@@ -336,10 +336,6 @@ extern abi_dispatch *dispatch_htm();
+
+ extern gtm_cacheline_mask gtm_mask_stack(gtm_cacheline *, gtm_cacheline_mask);
+
+-// Control variable for the HTM fastpath that uses serial mode as fallback.
+-// Non-zero if the HTM fastpath is enabled. See gtm_thread::begin_transaction.
+-extern uint32_t htm_fastpath;
+-
+ } // namespace GTM
+
+ #endif // LIBITM_I_H
+--- libitm/method-serial.cc
++++ libitm/method-serial.cc
+@@ -222,13 +222,13 @@ struct htm_mg : public method_group
+ // Enable the HTM fastpath if the HW is available. The fastpath is
+ // initially disabled.
+ #ifdef USE_HTM_FASTPATH
+- htm_fastpath = htm_init();
++ gtm_thread::serial_lock.set_htm_fastpath(htm_init());
+ #endif
+ }
+ virtual void fini()
+ {
+ // Disable the HTM fastpath.
+- htm_fastpath = 0;
++ gtm_thread::serial_lock.set_htm_fastpath(0);
+ }
+ };
+
+@@ -288,7 +288,7 @@ GTM::gtm_thread::serialirr_mode ()
+ #if defined(USE_HTM_FASTPATH)
+ // HTM fastpath. If we are executing a HW transaction, don't go serial but
+ // continue. See gtm_thread::begin_transaction.
+- if (likely(htm_fastpath && !gtm_thread::serial_lock.is_write_locked()))
++ if (likely(!gtm_thread::serial_lock.htm_fastpath_disabled()))
+ return;
+ #endif
+
+--- libitm/query.cc
++++ libitm/query.cc
+@@ -49,7 +49,7 @@ _ITM_inTransaction (void)
+ // a transaction and thus we can't deduce this by looking at just the serial
+ // lock. This function isn't used in practice currently, so the easiest
+ // way to handle it is to just abort.
+- if (htm_fastpath && htm_transaction_active())
++ if (gtm_thread::serial_lock.get_htm_fastpath() && htm_transaction_active())
+ htm_abort();
+ #endif
+ struct gtm_thread *tx = gtm_thr();
+@@ -69,7 +69,7 @@ _ITM_getTransactionId (void)
+ {
+ #if defined(USE_HTM_FASTPATH)
+ // See ITM_inTransaction.
+- if (htm_fastpath && htm_transaction_active())
++ if (gtm_thread::serial_lock.get_htm_fastpath() && htm_transaction_active())
+ htm_abort();
+ #endif
+ struct gtm_thread *tx = gtm_thr();
diff --git a/SOURCES/gcc48-rh1243366.patch b/SOURCES/gcc48-rh1243366.patch
new file mode 100644
index 0000000..da137f3
--- /dev/null
+++ b/SOURCES/gcc48-rh1243366.patch
@@ -0,0 +1,35 @@
+2015-07-15 Jonathan Wakely
+
+ PR libstdc++/57394
+ * include/std/streambuf (basic_streambuf(const basic_streambuf&)):
+ Fix initializer for _M_out_end.
+ (operator=(const basic_streambuf&)): Replace stub with actual
+ implementation.
+
+--- libstdc++-v3/include/std/streambuf
++++ libstdc++-v3/include/std/streambuf
+@@ -802,12 +802,22 @@
+ basic_streambuf(const basic_streambuf& __sb)
+ : _M_in_beg(__sb._M_in_beg), _M_in_cur(__sb._M_in_cur),
+ _M_in_end(__sb._M_in_end), _M_out_beg(__sb._M_out_beg),
+- _M_out_cur(__sb._M_out_cur), _M_out_end(__sb._M_out_cur),
++ _M_out_cur(__sb._M_out_cur), _M_out_end(__sb._M_out_end),
+ _M_buf_locale(__sb._M_buf_locale)
+ { }
+
+ basic_streambuf&
+- operator=(const basic_streambuf&) { return *this; };
++ operator=(const basic_streambuf& __sb)
++ {
++ _M_in_beg = __sb._M_in_beg;
++ _M_in_cur = __sb._M_in_cur;
++ _M_in_end = __sb._M_in_end;
++ _M_out_beg = __sb._M_out_beg;
++ _M_out_cur = __sb._M_out_cur;
++ _M_out_end = __sb._M_out_end;
++ _M_buf_locale = __sb._M_buf_locale;
++ return *this;
++ };
+ };
+
+ // Explicit specialization declarations, defined in src/streambuf.cc.
diff --git a/SOURCES/gcc48-rh1278872.patch b/SOURCES/gcc48-rh1278872.patch
new file mode 100644
index 0000000..ce82c3d
--- /dev/null
+++ b/SOURCES/gcc48-rh1278872.patch
@@ -0,0 +1,78 @@
+2013-07-25 Sterling Augustine
+
+ * dwarf2out.c (size_of_pubnames): Move code to...
+ (include_pubname_in_output): ...here. New.
+ (output_pubnames): Call include_pubname_in_output. Move assertion.
+
+--- gcc/dwarf2out.c (revision 201254)
++++ gcc/dwarf2out.c (revision 201255)
+@@ -7806,6 +7806,30 @@ unmark_all_dies (dw_die_ref die)
+ unmark_all_dies (AT_ref (a));
+ }
+
++/* Calculate if the entry should appear in the final output file. It may be
++ from a pruned a type. */
++
++static bool
++include_pubname_in_output (vec *table, pubname_entry *p)
++{
++ if (table == pubname_table)
++ {
++ /* Enumerator names are part of the pubname table, but the parent
++ DW_TAG_enumeration_type die may have been pruned. Don't output
++ them if that is the case. */
++ if (p->die->die_tag == DW_TAG_enumerator && !p->die->die_mark)
++ return false;
++
++ /* Everything else in the pubname table is included. */
++ return true;
++ }
++
++ /* The pubtypes table shouldn't include types that have been
++ pruned. */
++ return (p->die->die_offset != 0
++ || !flag_eliminate_unused_debug_types);
++}
++
+ /* Return the size of the .debug_pubnames or .debug_pubtypes table
+ generated for the compilation unit. */
+
+@@ -7818,9 +7842,7 @@ size_of_pubnames (vecdie->die_offset != 0
+- || !flag_eliminate_unused_debug_types)
++ if (include_pubname_in_output (names, p))
+ size += strlen (p->name) + DWARF_OFFSET_SIZE + 1;
+
+ size += DWARF_OFFSET_SIZE;
+@@ -8999,22 +9021,14 @@ output_pubnames (vecdie->die_tag == DW_TAG_enumerator && !pub->die->die_mark)
+- continue;
+-
+- /* We shouldn't see pubnames for DIEs outside of the main CU. */
+- if (names == pubname_table)
+- gcc_assert (pub->die->die_mark);
+-
+- if (names != pubtype_table
+- || pub->die->die_offset != 0
+- || !flag_eliminate_unused_debug_types)
++ if (include_pubname_in_output (names, pub))
+ {
+ dw_offset die_offset = pub->die->die_offset;
+
++ /* We shouldn't see pubnames for DIEs outside of the main CU. */
++ if (names == pubname_table)
++ gcc_assert (pub->die->die_mark);
++
+ /* If we're putting types in their own .debug_types sections,
+ the .debug_pubtypes table will still point to the compile
+ unit (not the type unit), so we want to use the offset of
diff --git a/SOURCES/gcc48-rh1296211.patch b/SOURCES/gcc48-rh1296211.patch
new file mode 100644
index 0000000..f1b084a
--- /dev/null
+++ b/SOURCES/gcc48-rh1296211.patch
@@ -0,0 +1,14 @@
+2015-09-02 Alan Modra
+
+ * config/rs6000/sysv4.h (LINK_SPEC): Delete link_target.
+
+--- gcc/config/rs6000/sysv4.h (revision 227396)
++++ gcc/config/rs6000/sysv4.h (revision 227397)
+@@ -574,7 +574,6 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+ %{R*} \
+ %(link_shlib) \
+ %{!T*: %(link_start) } \
+-%(link_target) \
+ %(link_os)"
+
+ /* Shared libraries are not default. */
diff --git a/SOURCES/gcc48-rh1304449.patch b/SOURCES/gcc48-rh1304449.patch
new file mode 100644
index 0000000..213ff0c
--- /dev/null
+++ b/SOURCES/gcc48-rh1304449.patch
@@ -0,0 +1,496 @@
+2015-12-24 Kirill Yukhin
+
+ * common/config/i386/i386-common.c (OPTION_MASK_ISA_PKU_SET): New.
+ (OPTION_MASK_ISA_PKU_UNSET): Ditto.
+ (ix86_handle_option): Handle OPT_mpku.
+ * config.gcc: Add pkuintrin.h to i[34567]86-*-* and x86_64-*-*
+ targets.
+ * config/i386/cpuid.h (host_detect_local_cpu): Detect PKU feature.
+ * config/i386/i386-c.c (ix86_target_macros_internal): Handle PKU ISA
+ flag.
+ * config/i386/i386.c (ix86_target_string): Add "-mpku" to
+ ix86_target_opts.
+ (ix86_option_override_internal): Define PTA_PKU, mention new key
+ in skylake-avx512. Handle new ISA bits.
+ (ix86_valid_target_attribute_inner_p): Add "pku".
+ (enum ix86_builtins): Add IX86_BUILTIN_RDPKRU and IX86_BUILTIN_WRPKRU.
+ (builtin_description bdesc_special_args[]): Add new built-ins.
+ * config/i386/i386.h (define TARGET_PKU): New.
+ (define TARGET_PKU_P): Ditto.
+ * config/i386/i386.md (define_c_enum "unspecv"): Add UNSPEC_PKU.
+ (define_expand "rdpkru"): New.
+ (define_insn "*rdpkru"): Ditto.
+ (define_expand "wrpkru"): Ditto.
+ (define_insn "*wrpkru"): Ditto.
+ * config/i386/i386.opt (mpku): Ditto.
+ * config/i386/pkuintrin.h: New file.
+ * config/i386/x86intrin.h: Include pkuintrin.h
+ * doc/extend.texi: Describe new built-ins.
+ * doc/invoke.texi: Describe new switches.
+
+ * g++.dg/other/i386-2.C: Add -mpku.
+ * g++.dg/other/i386-3.C: Ditto.
+ * gcc.target/i386/rdpku-1.c: New test.
+ * gcc.target/i386/sse-12.c: Add -mpku.
+ * gcc.target/i386/sse-13.c: Ditto.
+ * gcc.target/i386/sse-22.c: Ditto.
+ * gcc.target/i386/sse-33.c: Ditto.
+ * gcc.target/i386/wrpku-1.c: New test.
+
+--- gcc/config.gcc (revision 231943)
++++ gcc/config.gcc (revision 231945)
+@@ -368,7 +368,7 @@ i[34567]86-*-*)
+ lzcntintrin.h bmiintrin.h bmi2intrin.h tbmintrin.h
+ avx2intrin.h fmaintrin.h f16cintrin.h rtmintrin.h
+ xtestintrin.h rdseedintrin.h prfchwintrin.h adxintrin.h
+- fxsrintrin.h xsaveintrin.h xsaveoptintrin.h"
++ fxsrintrin.h xsaveintrin.h xsaveoptintrin.h pkuintrin.h"
+ ;;
+ x86_64-*-*)
+ cpu_type=i386
+@@ -383,7 +383,7 @@ x86_64-*-*)
+ lzcntintrin.h bmiintrin.h tbmintrin.h bmi2intrin.h
+ avx2intrin.h fmaintrin.h f16cintrin.h rtmintrin.h
+ xtestintrin.h rdseedintrin.h prfchwintrin.h adxintrin.h
+- fxsrintrin.h xsaveintrin.h xsaveoptintrin.h"
++ fxsrintrin.h xsaveintrin.h xsaveoptintrin.h pkuintrin.h"
+ need_64bit_hwint=yes
+ ;;
+ ia64-*-*)
+--- gcc/common/config/i386/i386-common.c (revision 231943)
++++ gcc/common/config/i386/i386-common.c (revision 231945)
+@@ -98,6 +98,7 @@ along with GCC; see the file COPYING3.
+ #define OPTION_MASK_ISA_RDRND_SET OPTION_MASK_ISA_RDRND
+ #define OPTION_MASK_ISA_F16C_SET \
+ (OPTION_MASK_ISA_F16C | OPTION_MASK_ISA_AVX_SET)
++#define OPTION_MASK_ISA_PKU_SET OPTION_MASK_ISA_PKU
+
+ /* Define a set of ISAs which aren't available when a given ISA is
+ disabled. MMX and SSE ISAs are handled separately. */
+@@ -164,6 +165,7 @@ along with GCC; see the file COPYING3.
+ #define OPTION_MASK_ISA_FSGSBASE_UNSET OPTION_MASK_ISA_FSGSBASE
+ #define OPTION_MASK_ISA_RDRND_UNSET OPTION_MASK_ISA_RDRND
+ #define OPTION_MASK_ISA_F16C_UNSET OPTION_MASK_ISA_F16C
++#define OPTION_MASK_ISA_PKU_UNSET OPTION_MASK_ISA_PKU
+
+ /* Implement TARGET_HANDLE_OPTION. */
+
+@@ -659,6 +661,19 @@ ix86_handle_option (struct gcc_options *
+ }
+ return true;
+
++ case OPT_mpku:
++ if (value)
++ {
++ opts->x_ix86_isa_flags |= OPTION_MASK_ISA_PKU_SET;
++ opts->x_ix86_isa_flags_explicit |= OPTION_MASK_ISA_PKU_SET;
++ }
++ else
++ {
++ opts->x_ix86_isa_flags &= ~OPTION_MASK_ISA_PKU_UNSET;
++ opts->x_ix86_isa_flags_explicit |= OPTION_MASK_ISA_PKU_UNSET;
++ }
++ return true;
++
+ /* Comes from final.c -- no real reason to change it. */
+ #define MAX_CODE_ALIGN 16
+
+--- gcc/config/i386/i386.h (revision 231943)
++++ gcc/config/i386/i386.h (revision 231945)
+@@ -80,6 +80,7 @@ see the files COPYING3 and COPYING.RUNTI
+ #define TARGET_FXSR TARGET_ISA_FXSR
+ #define TARGET_XSAVE TARGET_ISA_XSAVE
+ #define TARGET_XSAVEOPT TARGET_ISA_XSAVEOPT
++#define TARGET_PKU TARGET_ISA_PKU
+
+ #define TARGET_LP64 TARGET_ABI_64
+ #define TARGET_X32 TARGET_ABI_X32
+--- gcc/config/i386/i386.md (revision 231943)
++++ gcc/config/i386/i386.md (revision 231945)
+@@ -224,6 +224,9 @@ (define_c_enum "unspecv" [
+ UNSPECV_XTEST
+
+ UNSPECV_NLGR
++
++ ;; For RDPKRU and WRPKRU support
++ UNSPECV_PKU
+ ])
+
+ ;; Constants to represent rounding modes in the ROUND instruction
+@@ -18289,6 +18292,48 @@ (define_insn "xtest_1"
+ [(set_attr "type" "other")
+ (set_attr "length" "3")])
+
++;; RDPKRU and WRPKRU
++
++(define_expand "rdpkru"
++ [(parallel
++ [(set (match_operand:SI 0 "register_operand")
++ (unspec_volatile:SI [(match_dup 1)] UNSPECV_PKU))
++ (set (match_dup 2) (const_int 0))])]
++ "TARGET_PKU"
++{
++ operands[1] = force_reg (SImode, const0_rtx);
++ operands[2] = gen_reg_rtx (SImode);
++})
++
++(define_insn "*rdpkru"
++ [(set (match_operand:SI 0 "register_operand" "=a")
++ (unspec_volatile:SI [(match_operand:SI 2 "register_operand" "c")]
++ UNSPECV_PKU))
++ (set (match_operand:SI 1 "register_operand" "=d")
++ (const_int 0))]
++ "TARGET_PKU"
++ "rdpkru"
++ [(set_attr "type" "other")])
++
++(define_expand "wrpkru"
++ [(unspec_volatile:SI
++ [(match_operand:SI 0 "register_operand")
++ (match_dup 1) (match_dup 2)] UNSPECV_PKU)]
++ "TARGET_PKU"
++{
++ operands[1] = force_reg (SImode, const0_rtx);
++ operands[2] = force_reg (SImode, const0_rtx);
++})
++
++(define_insn "*wrpkru"
++ [(unspec_volatile:SI
++ [(match_operand:SI 0 "register_operand" "a")
++ (match_operand:SI 1 "register_operand" "d")
++ (match_operand:SI 2 "register_operand" "c")] UNSPECV_PKU)]
++ "TARGET_PKU"
++ "wrpkru"
++ [(set_attr "type" "other")])
++
+ (include "mmx.md")
+ (include "sse.md")
+ (include "sync.md")
+--- gcc/config/i386/pkuintrin.h (revision 0)
++++ gcc/config/i386/pkuintrin.h (revision 231945)
+@@ -0,0 +1,45 @@
++/* Copyright (C) 2015 Free Software Foundation, Inc.
++
++ This file is part of GCC.
++
++ GCC 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.
++
++ GCC 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
++ . */
++
++#if !defined _X86INTRIN_H_INCLUDED
++# error "Never use directly; include instead."
++#endif
++
++#ifndef _PKUINTRIN_H_INCLUDED
++#define _PKUINTRIN_H_INCLUDED
++
++extern __inline unsigned int
++__attribute__((__gnu_inline__, __always_inline__, __artificial__))
++_rdpkru_u32(void)
++{
++ return __builtin_ia32_rdpkru ();
++}
++
++extern __inline void
++__attribute__((__gnu_inline__, __always_inline__, __artificial__))
++_wrpkru(unsigned int key)
++{
++ return __builtin_ia32_wrpkru (key);
++}
++
++#endif /* _PKUINTRIN_H_INCLUDED */
+--- gcc/config/i386/cpuid.h (revision 231943)
++++ gcc/config/i386/cpuid.h (revision 231945)
+@@ -74,6 +74,10 @@
+ #define bit_RDSEED (1 << 18)
+ #define bit_ADX (1 << 19)
+
++/* %ecx */
++#define bit_PKU (1 << 3)
++#define bit_OSPKE (1 << 4)
++
+ /* Extended State Enumeration Sub-leaf (%eax == 13, %ecx == 1) */
+ #define bit_XSAVEOPT (1 << 0)
+
+--- gcc/config/i386/x86intrin.h (revision 231943)
++++ gcc/config/i386/x86intrin.h (revision 231945)
+@@ -119,4 +119,8 @@
+
+ #include
+
++#ifdef __PKU__
++#include
++#endif
++
+ #endif /* _X86INTRIN_H_INCLUDED */
+--- gcc/config/i386/i386-c.c (revision 231943)
++++ gcc/config/i386/i386-c.c (revision 231945)
+@@ -348,6 +348,8 @@ ix86_target_macros_internal (HOST_WIDE_I
+ def_or_undef (parse_in, "__XSAVE__");
+ if (isa_flag & OPTION_MASK_ISA_XSAVEOPT)
+ def_or_undef (parse_in, "__XSAVEOPT__");
++ if (isa_flag & OPTION_MASK_ISA_PKU)
++ def_or_undef (parse_in, "__PKU__");
+ if ((fpmath & FPMATH_SSE) && (isa_flag & OPTION_MASK_ISA_SSE))
+ def_or_undef (parse_in, "__SSE_MATH__");
+ if ((fpmath & FPMATH_SSE) && (isa_flag & OPTION_MASK_ISA_SSE2))
+--- gcc/config/i386/i386.opt (revision 231943)
++++ gcc/config/i386/i386.opt (revision 231945)
+@@ -626,3 +626,7 @@ Split 32-byte AVX unaligned store
+ mrtm
+ Target Report Mask(ISA_RTM) Var(ix86_isa_flags) Save
+ Support RTM built-in functions and code generation
++
++mpku
++Target Report Mask(ISA_PKU) Var(ix86_isa_flags) Save
++Support PKU built-in functions and code generation
+--- gcc/config/i386/driver-i386.c (revision 231943)
++++ gcc/config/i386/driver-i386.c (revision 231945)
+@@ -408,6 +408,7 @@ const char *host_detect_local_cpu (int a
+ unsigned int has_rdrnd = 0, has_f16c = 0, has_fsgsbase = 0;
+ unsigned int has_rdseed = 0, has_prfchw = 0, has_adx = 0;
+ unsigned int has_osxsave = 0, has_fxsr = 0, has_xsave = 0, has_xsaveopt = 0;
++ unsigned int has_pku = 0;
+
+ bool arch;
+
+@@ -479,6 +480,8 @@ const char *host_detect_local_cpu (int a
+ has_fsgsbase = ebx & bit_FSGSBASE;
+ has_rdseed = ebx & bit_RDSEED;
+ has_adx = ebx & bit_ADX;
++
++ has_pku = ecx & bit_OSPKE;
+ }
+
+ if (max_level >= 13)
+@@ -855,12 +858,13 @@ const char *host_detect_local_cpu (int a
+ const char *fxsr = has_fxsr ? " -mfxsr" : " -mno-fxsr";
+ const char *xsave = has_xsave ? " -mxsave" : " -mno-xsave";
+ const char *xsaveopt = has_xsaveopt ? " -mxsaveopt" : " -mno-xsaveopt";
++ const char *pku = has_pku ? " -mpku" : " -mno-pku";
+
+ options = concat (options, cx16, sahf, movbe, ase, pclmul,
+ popcnt, abm, lwp, fma, fma4, xop, bmi, bmi2,
+ tbm, avx, avx2, sse4_2, sse4_1, lzcnt, rtm,
+ hle, rdrnd, f16c, fsgsbase, rdseed, prfchw, adx,
+- fxsr, xsave, xsaveopt, NULL);
++ fxsr, xsave, xsaveopt, pku, NULL);
+ }
+
+ done:
+--- gcc/config/i386/i386.c (revision 231943)
++++ gcc/config/i386/i386.c (revision 231945)
+@@ -2632,6 +2632,7 @@ ix86_target_string (HOST_WIDE_INT isa, i
+ { "-mrtm", OPTION_MASK_ISA_RTM },
+ { "-mxsave", OPTION_MASK_ISA_XSAVE },
+ { "-mxsaveopt", OPTION_MASK_ISA_XSAVEOPT },
++ { "-mpku", OPTION_MASK_ISA_PKU },
+ };
+
+ /* Flag options. */
+@@ -2905,6 +2906,7 @@ ix86_option_override_internal (bool main
+ #define PTA_FXSR (HOST_WIDE_INT_1 << 37)
+ #define PTA_XSAVE (HOST_WIDE_INT_1 << 38)
+ #define PTA_XSAVEOPT (HOST_WIDE_INT_1 << 39)
++#define PTA_PKU (HOST_WIDE_INT_1 << 60)
+
+ /* if this reaches 64, need to widen struct pta flags below */
+
+@@ -3429,6 +3431,9 @@ ix86_option_override_internal (bool main
+ if (processor_alias_table[i].flags & PTA_XSAVEOPT
+ && !(ix86_isa_flags_explicit & OPTION_MASK_ISA_XSAVEOPT))
+ ix86_isa_flags |= OPTION_MASK_ISA_XSAVEOPT;
++ if (processor_alias_table[i].flags & PTA_PKU
++ && !(ix86_isa_flags_explicit & OPTION_MASK_ISA_PKU))
++ ix86_isa_flags |= OPTION_MASK_ISA_PKU;
+ if (processor_alias_table[i].flags & (PTA_PREFETCH_SSE | PTA_SSE))
+ x86_prefetch_sse = true;
+
+@@ -4220,6 +4225,7 @@ ix86_valid_target_attribute_inner_p (tre
+ IX86_ATTR_ISA ("fxsr", OPT_mfxsr),
+ IX86_ATTR_ISA ("xsave", OPT_mxsave),
+ IX86_ATTR_ISA ("xsaveopt", OPT_mxsaveopt),
++ IX86_ATTR_ISA ("pku", OPT_mpku),
+
+ /* enum options */
+ IX86_ATTR_ENUM ("fpmath=", OPT_mfpmath_),
+@@ -27042,6 +27048,10 @@ enum ix86_builtins
+ IX86_BUILTIN_CPU_IS,
+ IX86_BUILTIN_CPU_SUPPORTS,
+
++ /* PKU instructions. */
++ IX86_BUILTIN_RDPKRU,
++ IX86_BUILTIN_WRPKRU,
++
+ IX86_BUILTIN_MAX
+ };
+
+@@ -27357,6 +27367,10 @@ static const struct builtin_description
+ { OPTION_MASK_ISA_RTM, CODE_FOR_xbegin, "__builtin_ia32_xbegin", IX86_BUILTIN_XBEGIN, UNKNOWN, (int) UNSIGNED_FTYPE_VOID },
+ { OPTION_MASK_ISA_RTM, CODE_FOR_xend, "__builtin_ia32_xend", IX86_BUILTIN_XEND, UNKNOWN, (int) VOID_FTYPE_VOID },
+ { OPTION_MASK_ISA_RTM, CODE_FOR_xtest, "__builtin_ia32_xtest", IX86_BUILTIN_XTEST, UNKNOWN, (int) INT_FTYPE_VOID },
++
++ /* RDPKRU and WRPKRU. */
++ { OPTION_MASK_ISA_PKU, CODE_FOR_rdpkru, "__builtin_ia32_rdpkru", IX86_BUILTIN_RDPKRU, UNKNOWN, (int) UNSIGNED_FTYPE_VOID },
++ { OPTION_MASK_ISA_PKU, CODE_FOR_wrpkru, "__builtin_ia32_wrpkru", IX86_BUILTIN_WRPKRU, UNKNOWN, (int) VOID_FTYPE_UNSIGNED },
+ };
+
+ /* Builtins with variable number of arguments. */
+--- gcc/doc/extend.texi (revision 231943)
++++ gcc/doc/extend.texi (revision 231945)
+@@ -10996,6 +10996,13 @@ void __builtin_ia32_xabort (status)
+ int __builtin_ia32_xtest ()
+ @end smallexample
+
++The following built-in functions are available when @option{-mpku} is used.
++They generate reads and writes to PKRU.
++@smallexample
++void __builtin_ia32_wrpkru (unsigned int)
++unsigned int __builtin_ia32_rdpkru ()
++@end smallexample
++
+ @node X86 transactional memory intrinsics
+ @subsection X86 transaction memory intrinsics
+
+--- gcc/doc/invoke.texi (revision 231943)
++++ gcc/doc/invoke.texi (revision 231945)
+@@ -645,7 +645,7 @@ Objective-C and Objective-C++ Dialects}.
+ -mmmx -msse -msse2 -msse3 -mssse3 -msse4.1 -msse4.2 -msse4 -mavx @gol
+ -mavx2 -maes -mpclmul -mfsgsbase -mrdrnd -mf16c -mfma @gol
+ -msse4a -m3dnow -mpopcnt -mabm -mbmi -mtbm -mfma4 -mxop -mlzcnt @gol
+--mbmi2 -mrtm -mlwp -mthreads @gol
++-mbmi2 -mrtm -mlwp -mpku -mthreads @gol
+ -mno-align-stringops -minline-all-stringops @gol
+ -minline-stringops-dynamically -mstringop-strategy=@var{alg} @gol
+ -mpush-args -maccumulate-outgoing-args -m128bit-long-double @gol
+@@ -14326,6 +14326,8 @@ preferred alignment to @option{-mpreferr
+ @itemx -mlzcnt
+ @itemx -mno-lzcnt
+ @itemx -mrtm
++@itemx -mpku
++@itemx -mno-pku
+ @itemx -mtbm
+ @itemx -mno-tbm
+ @opindex mmmx
+@@ -14336,7 +14338,7 @@ preferred alignment to @option{-mpreferr
+ @opindex mno-3dnow
+ These switches enable or disable the use of instructions in the MMX, SSE,
+ SSE2, SSE3, SSSE3, SSE4.1, AVX, AVX2, AES, PCLMUL, FSGSBASE, RDRND, F16C,
+-FMA, SSE4A, FMA4, XOP, LWP, ABM, BMI, BMI2, LZCNT, RTM or 3DNow!@:
++FMA, SSE4A, FMA4, XOP, LWP, ABM, BMI, BMI2, LZCNT, RTM, PKU or 3DNow!@:
+ extended instruction sets.
+ These extensions are also available as built-in functions: see
+ @ref{X86 Built-in Functions}, for details of the functions enabled and
+--- gcc/testsuite/gcc.target/i386/sse-12.c (revision 231943)
++++ gcc/testsuite/gcc.target/i386/sse-12.c (revision 231945)
+@@ -3,7 +3,7 @@
+ popcntintrin.h and mm_malloc.h are usable
+ with -O -std=c89 -pedantic-errors. */
+ /* { dg-do compile } */
+-/* { dg-options "-O -std=c89 -pedantic-errors -march=k8 -msse4a -m3dnow -mavx -mavx2 -mfma4 -mxop -maes -mpclmul -mpopcnt -mabm -mlzcnt -mbmi -mbmi2 -mtbm -mlwp -mfsgsbase -mrdrnd -mf16c -mfma -mrtm -mrdseed -mprfchw -madx -mfxsr -mxsaveopt" } */
++/* { dg-options "-O -std=c89 -pedantic-errors -march=k8 -msse4a -m3dnow -mavx -mavx2 -mfma4 -mxop -maes -mpclmul -mpopcnt -mabm -mlzcnt -mbmi -mbmi2 -mtbm -mlwp -mfsgsbase -mrdrnd -mf16c -mfma -mrtm -mrdseed -mprfchw -madx -mfxsr -mxsaveopt -mpku" } */
+
+ #include
+
+--- gcc/testsuite/gcc.target/i386/sse-13.c (revision 231943)
++++ gcc/testsuite/gcc.target/i386/sse-13.c (revision 231945)
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -Werror-implicit-function-declaration -march=k8 -msse4a -m3dnow -mavx -mavx2 -mfma4 -mxop -maes -mpclmul -mpopcnt -mabm -mlzcnt -mbmi -mbmi2 -mtbm -mlwp -mfsgsbase -mrdrnd -mf16c -mfma -mrtm -mrdseed -mprfchw -madx -mfxsr -mxsaveopt" } */
++/* { dg-options "-O2 -Werror-implicit-function-declaration -march=k8 -msse4a -m3dnow -mavx -mavx2 -mfma4 -mxop -maes -mpclmul -mpopcnt -mabm -mlzcnt -mbmi -mbmi2 -mtbm -mlwp -mfsgsbase -mrdrnd -mf16c -mfma -mrtm -mrdseed -mprfchw -madx -mfxsr -mxsaveopt -mpku" } */
+
+ #include
+
+--- gcc/testsuite/gcc.target/i386/sse-22.c (revision 231943)
++++ gcc/testsuite/gcc.target/i386/sse-22.c (revision 231945)
+@@ -268,7 +268,7 @@ test_2 (_mm_clmulepi64_si128, __m128i, _
+
+ /* x86intrin.h (FMA4/XOP/LWP/BMI/BMI2/TBM/LZCNT/FMA). */
+ #ifdef DIFFERENT_PRAGMAS
+-#pragma GCC target ("fma4,xop,lwp,bmi,bmi2,tbm,lzcnt,fma,rdseed,prfchw,adx,fxsr,xsaveopt")
++#pragma GCC target ("fma4,xop,lwp,bmi,bmi2,tbm,lzcnt,fma,rdseed,prfchw,adx,fxsr,xsaveopt,pku")
+ #endif
+ #include
+ /* xopintrin.h */
+--- gcc/testsuite/gcc.target/i386/sse-23.c (revision 231943)
++++ gcc/testsuite/gcc.target/i386/sse-23.c (revision 231945)
+@@ -183,7 +183,7 @@
+ /* rtmintrin.h */
+ #define __builtin_ia32_xabort(M) __builtin_ia32_xabort(1)
+
+-#pragma GCC target ("sse4a,3dnow,avx,avx2,fma4,xop,aes,pclmul,popcnt,abm,lzcnt,bmi,bmi2,tbm,lwp,fsgsbase,rdrnd,f16c,fma,rtm,rdseed,prfchw,adx,fxsr,xsaveopt")
++#pragma GCC target ("sse4a,3dnow,avx,avx2,fma4,xop,aes,pclmul,popcnt,abm,lzcnt,bmi,bmi2,tbm,lwp,fsgsbase,rdrnd,f16c,fma,rtm,rdseed,prfchw,adx,fxsr,xsaveopt,pku")
+ #include
+ #include
+ #include
+--- gcc/testsuite/gcc.target/i386/rdpku-1.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/rdpku-1.c (revision 231945)
+@@ -0,0 +1,11 @@
++/* { dg-do compile } */
++/* { dg-options "-mpku -O2" } */
++/* { dg-final { scan-assembler "rdpkru\n" } } */
++
++#include
++
++unsigned extern
++rdpku_test (void)
++{
++ return _rdpkru_u32 ();
++}
+--- gcc/testsuite/gcc.target/i386/wrpku-1.c (revision 0)
++++ gcc/testsuite/gcc.target/i386/wrpku-1.c (revision 231945)
+@@ -0,0 +1,11 @@
++/* { dg-do compile } */
++/* { dg-options "-mpku -O2" } */
++/* { dg-final { scan-assembler "wrpkru\n" } } */
++
++#include
++
++void extern
++wrpku_test (unsigned int key)
++{
++ _wrpkru (key);
++}
+--- gcc/testsuite/g++.dg/other/i386-2.C (revision 231943)
++++ gcc/testsuite/g++.dg/other/i386-2.C (revision 231945)
+@@ -1,9 +1,9 @@
+ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+-/* { dg-options "-O -pedantic-errors -march=k8 -msse4a -m3dnow -mavx -mavx2 -mfma4 -mxop -maes -mpclmul -mpopcnt -mabm -mlzcnt -mbmi -mbmi2 -mtbm -mlwp -mfsgsbase -mrdrnd -mf16c -mfma -mrtm -mrdseed -mprfchw -madx -mfxsr -mxsaveopt" } */
++/* { dg-options "-O -pedantic-errors -march=k8 -msse4a -m3dnow -mavx -mavx2 -mfma4 -mxop -maes -mpclmul -mpopcnt -mabm -mlzcnt -mbmi -mbmi2 -mtbm -mlwp -mfsgsbase -mrdrnd -mf16c -mfma -mrtm -mrdseed -mprfchw -madx -mfxsr -mxsaveopt -mpku" } */
+
+ /* Test that {,x,e,p,t,s,w,a,b,i}mmintrin.h, mm3dnow.h, fma4intrin.h,
+ xopintrin.h, abmintrin.h, bmiintrin.h, tbmintrin.h, lwpintrin.h,
+- popcntintrin.h, fmaintrin.h and mm_malloc.h.h are usable with
++ popcntintrin.h, fmaintrin.h, pkuintrin.h and mm_malloc.h.h are usable with
+ -O -pedantic-errors. */
+
+ #include
+--- gcc/testsuite/g++.dg/other/i386-3.C (revision 231943)
++++ gcc/testsuite/g++.dg/other/i386-3.C (revision 231945)
+@@ -1,9 +1,9 @@
+ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+-/* { dg-options "-O -fkeep-inline-functions -march=k8 -msse4a -m3dnow -mavx -mavx2 -mfma4 -mxop -maes -mpclmul -mpopcnt -mabm -mlzcnt -mbmi -mbmi2 -mtbm -mlwp -mfsgsbase -mrdrnd -mf16c -mfma -mrtm -mrdseed -mprfchw -madx -mfxsr -mxsaveopt" } */
++/* { dg-options "-O -fkeep-inline-functions -march=k8 -msse4a -m3dnow -mavx -mavx2 -mfma4 -mxop -maes -mpclmul -mpopcnt -mabm -mlzcnt -mbmi -mbmi2 -mtbm -mlwp -mfsgsbase -mrdrnd -mf16c -mfma -mrtm -mrdseed -mprfchw -madx -mfxsr -mxsaveopt -mpku" } */
+
+ /* Test that {,x,e,p,t,s,w,a,b,i}mmintrin.h, mm3dnow.h, fma4intrin.h,
+ xopintrin.h, abmintrin.h, bmiintrin.h, tbmintrin.h, lwpintrin.h,
+- popcntintrin.h, fmaintrin.h and mm_malloc.h are usable with
++ popcntintrin.h, fmaintrin.h, pkuintrin.h and mm_malloc.h are usable with
+ -O -fkeep-inline-functions. */
+
+ #include
diff --git a/SOURCES/gcc48-rh1312436.patch b/SOURCES/gcc48-rh1312436.patch
new file mode 100644
index 0000000..6bf9313
--- /dev/null
+++ b/SOURCES/gcc48-rh1312436.patch
@@ -0,0 +1,76 @@
+2015-12-02 Pierre-Marie de Rodat
+
+ * dwarf2out.c (dwar2out_var_location): Enhance pattern matching to get
+ the SYMBOL_REF they embed.
+ (gen_subprogram_die): Handle such calls.
+
+--- gcc/dwarf2out.c (revision 231184)
++++ gcc/dwarf2out.c (revision 231185)
+@@ -18051,18 +18051,23 @@ gen_subprogram_die (tree decl, dw_die_re
+ }
+ if (mode == VOIDmode || mode == BLKmode)
+ continue;
+- if (XEXP (XEXP (arg, 0), 0) == pc_rtx)
++ /* Get dynamic information about call target only if we
++ have no static information: we cannot generate both
++ DW_AT_abstract_origin and DW_AT_GNU_call_site_target
++ attributes. */
++ if (ca_loc->symbol_ref == NULL_RTX)
+ {
+- gcc_assert (ca_loc->symbol_ref == NULL_RTX);
+- tloc = XEXP (XEXP (arg, 0), 1);
+- continue;
+- }
+- else if (GET_CODE (XEXP (XEXP (arg, 0), 0)) == CLOBBER
+- && XEXP (XEXP (XEXP (arg, 0), 0), 0) == pc_rtx)
+- {
+- gcc_assert (ca_loc->symbol_ref == NULL_RTX);
+- tlocc = XEXP (XEXP (arg, 0), 1);
+- continue;
++ if (XEXP (XEXP (arg, 0), 0) == pc_rtx)
++ {
++ tloc = XEXP (XEXP (arg, 0), 1);
++ continue;
++ }
++ else if (GET_CODE (XEXP (XEXP (arg, 0), 0)) == CLOBBER
++ && XEXP (XEXP (XEXP (arg, 0), 0), 0) == pc_rtx)
++ {
++ tlocc = XEXP (XEXP (arg, 0), 1);
++ continue;
++ }
+ }
+ reg = NULL;
+ if (REG_P (XEXP (XEXP (arg, 0), 0)))
+@@ -20842,15 +20847,27 @@ dwarf2out_var_location (rtx loc_note)
+ if (!CALL_P (prev))
+ prev = XVECEXP (PATTERN (prev), 0, 0);
+ ca_loc->tail_call_p = SIBLING_CALL_P (prev);
++
++ /* Look for a SYMBOL_REF in the "prev" instruction. */
+ x = get_call_rtx_from (PATTERN (prev));
+ if (x)
+ {
+- x = XEXP (XEXP (x, 0), 0);
+- if (GET_CODE (x) == SYMBOL_REF
+- && SYMBOL_REF_DECL (x)
+- && TREE_CODE (SYMBOL_REF_DECL (x)) == FUNCTION_DECL)
+- ca_loc->symbol_ref = x;
++ /* Try to get the call symbol, if any. */
++ if (MEM_P (XEXP (x, 0)))
++ x = XEXP (x, 0);
++ /* First, look for a memory access to a symbol_ref. */
++ if (GET_CODE (XEXP (x, 0)) == SYMBOL_REF
++ && SYMBOL_REF_DECL (XEXP (x, 0))
++ && TREE_CODE (SYMBOL_REF_DECL (XEXP (x, 0))) == FUNCTION_DECL)
++ ca_loc->symbol_ref = XEXP (x, 0);
++ /* Otherwise, look at a compile-time known user-level function
++ declaration. */
++ else if (MEM_P (x)
++ && MEM_EXPR (x)
++ && TREE_CODE (MEM_EXPR (x)) == FUNCTION_DECL)
++ ca_loc->symbol_ref = XEXP (DECL_RTL (MEM_EXPR (x)), 0);
+ }
++
+ ca_loc->block = insn_scope (prev);
+ if (call_arg_locations)
+ call_arg_loc_last->next = ca_loc;
diff --git a/SOURCES/gcc48-rh1312850.patch b/SOURCES/gcc48-rh1312850.patch
new file mode 100644
index 0000000..841627f
--- /dev/null
+++ b/SOURCES/gcc48-rh1312850.patch
@@ -0,0 +1,24 @@
+2016-05-26 Martin Sebor
+ Jakub Jelinek
+
+ * asan/asan_rtl.cc (InitializeHighMemEnd): Backport part of upstream
+ r221457 fix and typo fix from r206158.
+
+--- libsanitizer/asan/asan_rtl.cc.jj 2013-03-04 12:44:18.000000000 +0100
++++ libsanitizer/asan/asan_rtl.cc 2016-05-26 09:57:10.761973999 +0200
+@@ -308,11 +308,13 @@ static void InitializeHighMemEnd() {
+ # if defined(__powerpc64__)
+ // FIXME:
+ // On PowerPC64 we have two different address space layouts: 44- and 46-bit.
+- // We somehow need to figure our which one we are using now and choose
++ // We somehow need to figure out which one we are using now and choose
+ // one of 0x00000fffffffffffUL and 0x00003fffffffffffUL.
+ // Note that with 'ulimit -s unlimited' the stack is moved away from the top
+ // of the address space, so simply checking the stack address is not enough.
+- kHighMemEnd = (1ULL << 44) - 1; // 0x00000fffffffffffUL
++ // This should (does) work for both PowerPC64 Endian modes.
++ kHighMemEnd =
++ (1ULL << (MostSignificantSetBitIndex(GET_CURRENT_FRAME()) + 1)) - 1;
+ # else
+ kHighMemEnd = (1ULL << 47) - 1; // 0x00007fffffffffffUL;
+ # endif
diff --git a/SOURCES/gcc48-rh1344807.patch b/SOURCES/gcc48-rh1344807.patch
new file mode 100644
index 0000000..130f558
--- /dev/null
+++ b/SOURCES/gcc48-rh1344807.patch
@@ -0,0 +1,37 @@
+2016-06-14 Jason Merrill
+
+ * call.c (add_function_candidate): Be more careful about
+ ref-to-ptr conversion.
+
+2016-06-15 Jakub Jelinek
+
+ * g++.dg/cpp0x/ref-qual17.C: New test.
+
+--- gcc/cp/call.c.jj 2014-08-06 10:45:03.260163142 +0200
++++ gcc/cp/call.c 2016-06-15 11:15:06.663878423 +0200
+@@ -1975,7 +1975,9 @@ add_function_candidate (struct z_candida
+ bool rv = FUNCTION_RVALUE_QUALIFIED (TREE_TYPE (fn));
+ parmtype = cp_build_reference_type (parmtype, rv);
+ if (TREE_CODE (arg) == CONVERT_EXPR
+- && TYPE_PTR_P (TREE_TYPE (arg)))
++ && TYPE_PTR_P (TREE_TYPE (arg))
++ && (TREE_CODE (TREE_TYPE (TREE_OPERAND (arg, 0)))
++ == REFERENCE_TYPE))
+ /* Strip conversion from reference to pointer. */
+ arg = TREE_OPERAND (arg, 0);
+ arg = build_fold_indirect_ref (arg);
+--- gcc/testsuite/g++.dg/cpp0x/ref-qual17.C.jj 2016-06-15 11:12:57.692558903 +0200
++++ gcc/testsuite/g++.dg/cpp0x/ref-qual17.C 2016-06-15 11:07:02.000000000 +0200
+@@ -0,0 +1,12 @@
++// { dg-do compile { target c++11 } }
++
++struct A
++{
++ void foo () &;
++};
++
++void
++bar (__UINTPTR_TYPE__ a)
++{
++ reinterpret_cast(a)->foo ();
++}
diff --git a/SOURCES/gcc48-rh1369183.patch b/SOURCES/gcc48-rh1369183.patch
new file mode 100644
index 0000000..7127d15
--- /dev/null
+++ b/SOURCES/gcc48-rh1369183.patch
@@ -0,0 +1,52 @@
+2017-03-07 Jakub Jelinek
+
+ Partial backport
+ 2016-05-07 Fritz Reese
+
+ PR fortran/56226
+ * interface.c (gfc_compare_derived_types): Don't ICE if the
+ derived type or both types have no components.
+
+ * gfortran.dg/rh1369183.f90: New test.
+
+--- gcc/fortran/interface.c.jj 2015-06-18 16:32:45.000000000 +0200
++++ gcc/fortran/interface.c 2017-03-07 18:35:38.982302826 +0100
+@@ -418,6 +418,13 @@ gfc_compare_derived_types (gfc_symbol *d
+ && !(derived1->attr.is_bind_c && derived2->attr.is_bind_c))
+ return 0;
+
++ /* Protect against null components. */
++ if (derived1->attr.zero_comp != derived2->attr.zero_comp)
++ return 0;
++
++ if (derived1->attr.zero_comp)
++ return 1;
++
+ dt1 = derived1->components;
+ dt2 = derived2->components;
+
+--- gcc/testsuite/gfortran.dg/rh1369183.f90.jj 2017-03-07 18:37:39.574775432 +0100
++++ gcc/testsuite/gfortran.dg/rh1369183.f90 2017-03-07 18:38:38.423993194 +0100
+@@ -0,0 +1,22 @@
++! { dg-do compile }
++
++module mod1369183
++ implicit none
++ contains
++ subroutine sub(test)
++ type test_t
++ sequence
++ integer(4) type
++ end type test_t
++ type(test_t),intent(inout) :: test
++ end subroutine sub
++end module mod1369183
++subroutine rh1369183
++ use mod1369183
++ implicit none
++ type test_t
++ sequence
++ end type test_t
++ type(test_t) :: tst
++ call sub(tst) ! { dg-error "Type mismatch in argument" }
++end subroutine rh1369183
diff --git a/SOURCES/gcc48-rh1402585.patch b/SOURCES/gcc48-rh1402585.patch
new file mode 100644
index 0000000..3aa1cae
--- /dev/null
+++ b/SOURCES/gcc48-rh1402585.patch
@@ -0,0 +1,32 @@
+--- gcc/reload.c (revision 235552)
++++ gcc/reload.c (working copy)
+@@ -4054,14 +4054,14 @@ find_reloads (rtx insn, int replace, int
+ &XEXP (recog_data.operand[i], 0), (rtx*) 0,
+ base_reg_class (VOIDmode, as, MEM, SCRATCH),
+ address_mode,
+- VOIDmode, 0, 0, i, RELOAD_FOR_INPUT);
++ VOIDmode, 0, 0, i, RELOAD_OTHER);
+ rld[operand_reloadnum[i]].inc
+ = GET_MODE_SIZE (GET_MODE (recog_data.operand[i]));
+
+ /* If this operand is an output, we will have made any
+ reloads for its address as RELOAD_FOR_OUTPUT_ADDRESS, but
+ now we are treating part of the operand as an input, so
+- we must change these to RELOAD_FOR_INPUT_ADDRESS. */
++ we must change these to RELOAD_FOR_OTHER_ADDRESS. */
+
+ if (modified[i] == RELOAD_WRITE)
+ {
+@@ -4070,10 +4070,10 @@ find_reloads (rtx insn, int replace, int
+ if (rld[j].opnum == i)
+ {
+ if (rld[j].when_needed == RELOAD_FOR_OUTPUT_ADDRESS)
+- rld[j].when_needed = RELOAD_FOR_INPUT_ADDRESS;
++ rld[j].when_needed = RELOAD_FOR_OTHER_ADDRESS;
+ else if (rld[j].when_needed
+ == RELOAD_FOR_OUTADDR_ADDRESS)
+- rld[j].when_needed = RELOAD_FOR_INPADDR_ADDRESS;
++ rld[j].when_needed = RELOAD_FOR_OTHER_ADDRESS;
+ }
+ }
+ }
diff --git a/SOURCES/gcc48-rh1457969.patch b/SOURCES/gcc48-rh1457969.patch
new file mode 100644
index 0000000..84178fe
--- /dev/null
+++ b/SOURCES/gcc48-rh1457969.patch
@@ -0,0 +1,16 @@
+2014-01-15 Pat Haugen
+
+ * config/rs6000/rs6000.c (rs6000_output_function_prologue): Check if
+ current procedure should be profiled.
+
+--- gcc/config/rs6000/rs6000.c
++++ gcc/config/rs6000/rs6000.c
+@@ -23198,7 +23198,7 @@ rs6000_output_function_prologue (FILE *file,
+ /* Output -mprofile-kernel code. This needs to be done here instead of
+ in output_function_profile since it must go after the ELFv2 ABI
+ local entry point. */
+- if (TARGET_PROFILE_KERNEL)
++ if (TARGET_PROFILE_KERNEL && crtl->profile)
+ {
+ gcc_assert (DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_ELFv2);
+ gcc_assert (!TARGET_32BIT);
diff --git a/SOURCES/gcc48-rh1468546.patch b/SOURCES/gcc48-rh1468546.patch
new file mode 100644
index 0000000..2e8e616
--- /dev/null
+++ b/SOURCES/gcc48-rh1468546.patch
@@ -0,0 +1,163 @@
+2014-05-05 Andreas Krebbel
+
+ * target.def: Add new target hook.
+ * doc/tm.texi: Regenerate.
+ * targhooks.h (default_keep_leaf_when_profiled): Add prototype.
+ * targhooks.c (default_keep_leaf_when_profiled): New function.
+
+2015-04-23 Anton Blanchard
+
+ * config/rs6000/rs6000.c (rs6000_output_function_prologue): No
+ need for -mprofile-kernel to save LR to stack.
+
+2016-01-21 Anton Blanchard
+ Bill Schmidt
+
+ PR target/63354
+ * config/rs6000/linux64.h (TARGET_KEEP_LEAF_WHEN_PROFILED): New
+ #define.
+ * config/rs6000/rs6000.c (rs6000_keep_leaf_when_profiled): New
+ function.
+
+ * gcc.target/powerpc/pr63354.c: New test.
+
+--- gcc/doc/tm.texi
++++ gcc/doc/tm.texi
+@@ -4953,6 +4953,10 @@ Define this macro if the code for function profiling should come before
+ the function prologue. Normally, the profiling code comes after.
+ @end defmac
+
++@deftypefn {Target Hook} bool TARGET_KEEP_LEAF_WHEN_PROFILED (void)
++This target hook returns true if the target wants the leaf flag for the current function to stay true even if it calls mcount. This might make sense for targets using the leaf flag only to determine whether a stack frame needs to be generated or not and for which the call to mcount is generated before the function prologue.
++@end deftypefn
++
+ @node Tail Calls
+ @subsection Permitting tail calls
+ @cindex tail calls
+--- gcc/doc/tm.texi.in
++++ gcc/doc/tm.texi.in
+@@ -3963,6 +3963,8 @@ Define this macro if the code for function profiling should come before
+ the function prologue. Normally, the profiling code comes after.
+ @end defmac
+
++@hook TARGET_KEEP_LEAF_WHEN_PROFILED
++
+ @node Tail Calls
+ @subsection Permitting tail calls
+ @cindex tail calls
+--- gcc/final.c
++++ gcc/final.c
+@@ -4241,7 +4241,9 @@ leaf_function_p (void)
+ {
+ rtx insn;
+
+- if (crtl->profile || profile_arc_flag)
++ /* Some back-ends (e.g. s390) want leaf functions to stay leaf
++ functions even if they call mcount. */
++ if (crtl->profile && !targetm.keep_leaf_when_profiled ())
+ return 0;
+
+ for (insn = get_insns (); insn; insn = NEXT_INSN (insn))
+--- gcc/target.def
++++ gcc/target.def
+@@ -2658,6 +2658,18 @@ The default version of this hook use the target macro\n\
+ bool, (void),
+ default_profile_before_prologue)
+
++/* Return true if a leaf function should stay leaf even with profiling
++ enabled. */
++DEFHOOK
++(keep_leaf_when_profiled,
++ "This target hook returns true if the target wants the leaf flag for\
++ the current function to stay true even if it calls mcount. This might\
++ make sense for targets using the leaf flag only to determine whether a\
++ stack frame needs to be generated or not and for which the call to\
++ mcount is generated before the function prologue.",
++ bool, (void),
++ default_keep_leaf_when_profiled)
++
+ /* Modify and return the identifier of a DECL's external name,
+ originally identified by ID, as required by the target,
+ (eg, append @nn to windows32 stdcall function names).
+--- gcc/targhooks.c
++++ gcc/targhooks.c
+@@ -1447,6 +1447,15 @@ default_get_reg_raw_mode (int regno)
+ return reg_raw_mode[regno];
+ }
+
++/* Return true if a leaf function should stay leaf even with profiling
++ enabled. */
++
++bool
++default_keep_leaf_when_profiled ()
++{
++ return false;
++}
++
+ /* Return true if the state of option OPTION should be stored in PCH files
+ and checked by default_pch_valid_p. Store the option's current state
+ in STATE if so. */
+--- gcc/targhooks.h
++++ gcc/targhooks.h
+@@ -188,6 +188,7 @@ extern section * default_function_sectio
+ bool startup, bool exit);
+ extern enum machine_mode default_dwarf_frame_reg_mode (int);
+ extern enum machine_mode default_get_reg_raw_mode(int);
++extern bool default_keep_leaf_when_profiled ();
+
+ extern void *default_get_pch_validity (size_t *);
+ extern const char *default_pch_valid_p (const void *, size_t);
+--- gcc/config/rs6000/rs6000.c
++++ gcc/config/rs6000/rs6000.c
+@@ -24433,7 +24433,6 @@ rs6000_output_function_prologue (FILE *file,
+ gcc_assert (!TARGET_32BIT);
+
+ asm_fprintf (file, "\tmflr %s\n", reg_names[0]);
+- asm_fprintf (file, "\tstd %s,16(%s)\n", reg_names[0], reg_names[1]);
+
+ /* In the ELFv2 ABI we have no compiler stack word. It must be
+ the resposibility of _mcount to preserve the static chain
+--- gcc/config/rs6000/linux64.h
++++ gcc/config/rs6000/linux64.h
+@@ -59,6 +59,9 @@ extern int dot_symbols;
+
+ #define TARGET_PROFILE_KERNEL profile_kernel
+
++#undef TARGET_KEEP_LEAF_WHEN_PROFILED
++#define TARGET_KEEP_LEAF_WHEN_PROFILED rs6000_keep_leaf_when_profiled
++
+ #define TARGET_USES_LINUX64_OPT 1
+ #ifdef HAVE_LD_LARGE_TOC
+ #undef TARGET_CMODEL
+--- gcc/config/rs6000/rs6000.c
++++ gcc/config/rs6000/rs6000.c
+@@ -26237,6 +26237,14 @@ rs6000_output_function_prologue (FILE *file,
+ rs6000_pic_labelno++;
+ }
+
++/* -mprofile-kernel code calls mcount before the function prolog,
++ so a profiled leaf function should stay a leaf function. */
++static bool
++rs6000_keep_leaf_when_profiled ()
++{
++ return TARGET_PROFILE_KERNEL;
++}
++
+ /* Non-zero if vmx regs are restored before the frame pop, zero if
+ we restore after the pop when possible. */
+ #define ALWAYS_RESTORE_ALTIVEC_BEFORE_POP 0
+--- /dev/null
++++ gcc/testsuite/gcc.target/powerpc/pr63354.c
+@@ -0,0 +1,12 @@
++/* Verify that we don't stack a frame for leaf functions when using
++ -pg -mprofile-kernel. */
++
++/* { dg-do compile { target { powerpc64*-*-* } } } */
++/* { dg-options "-O2 -pg -mprofile-kernel" } */
++/* { dg-require-effective-target lp64 } */
++/* { dg-final { scan-assembler-not "mtlr" } } */
++
++int foo(void)
++{
++ return 1;
++}
diff --git a/SOURCES/gcc48-rh1469384.patch b/SOURCES/gcc48-rh1469384.patch
new file mode 100644
index 0000000..c6b9ad5
--- /dev/null
+++ b/SOURCES/gcc48-rh1469384.patch
@@ -0,0 +1,223 @@
+2017-07-25 Jonathan Wakely
+
+ PR libstdc++/53984
+ * include/bits/basic_ios.h (basic_ios::_M_setstate): Adjust comment.
+ * include/bits/istream.tcc (basic_istream::sentry): Handle exceptions
+ during construction.
+ * include/std/istream: Adjust comments for formatted input functions
+ and unformatted input functions.
+ * testsuite/27_io/basic_fstream/53984.cc: New.
+ * testsuite/27_io/basic_istream/sentry/char/53984.cc: New.
+
+--- libstdc++-v3/include/bits/basic_ios.h
++++ libstdc++-v3/include/bits/basic_ios.h
+@@ -157,8 +157,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+ setstate(iostate __state)
+ { this->clear(this->rdstate() | __state); }
+
+- // Flip the internal state on for the proper state bits, then re
+- // throws the propagated exception if bit also set in
++ // Flip the internal state on for the proper state bits, then
++ // rethrows the propagated exception if bit also set in
+ // exceptions().
+ void
+ _M_setstate(iostate __state)
+--- libstdc++-v3/include/bits/istream.tcc
++++ libstdc++-v3/include/bits/istream.tcc
+@@ -48,28 +48,36 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+ {
+ ios_base::iostate __err = ios_base::goodbit;
+ if (__in.good())
+- {
+- if (__in.tie())
+- __in.tie()->flush();
+- if (!__noskip && bool(__in.flags() & ios_base::skipws))
+- {
+- const __int_type __eof = traits_type::eof();
+- __streambuf_type* __sb = __in.rdbuf();
+- __int_type __c = __sb->sgetc();
+-
+- const __ctype_type& __ct = __check_facet(__in._M_ctype);
+- while (!traits_type::eq_int_type(__c, __eof)
+- && __ct.is(ctype_base::space,
+- traits_type::to_char_type(__c)))
+- __c = __sb->snextc();
++ __try
++ {
++ if (__in.tie())
++ __in.tie()->flush();
++ if (!__noskip && bool(__in.flags() & ios_base::skipws))
++ {
++ const __int_type __eof = traits_type::eof();
++ __streambuf_type* __sb = __in.rdbuf();
++ __int_type __c = __sb->sgetc();
++
++ const __ctype_type& __ct = __check_facet(__in._M_ctype);
++ while (!traits_type::eq_int_type(__c, __eof)
++ && __ct.is(ctype_base::space,
++ traits_type::to_char_type(__c)))
++ __c = __sb->snextc();
+
+- // _GLIBCXX_RESOLVE_LIB_DEFECTS
+- // 195. Should basic_istream::sentry's constructor ever
+- // set eofbit?
+- if (traits_type::eq_int_type(__c, __eof))
+- __err |= ios_base::eofbit;
+- }
+- }
++ // _GLIBCXX_RESOLVE_LIB_DEFECTS
++ // 195. Should basic_istream::sentry's constructor ever
++ // set eofbit?
++ if (traits_type::eq_int_type(__c, __eof))
++ __err |= ios_base::eofbit;
++ }
++ }
++ __catch(__cxxabiv1::__forced_unwind&)
++ {
++ __in._M_setstate(ios_base::badbit);
++ __throw_exception_again;
++ }
++ __catch(...)
++ { __in._M_setstate(ios_base::badbit); }
+
+ if (__in.good() && __err == ios_base::goodbit)
+ _M_ok = true;
+--- libstdc++-v3/include/std/istream
++++ libstdc++-v3/include/std/istream
+@@ -150,9 +150,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+ * whatever data is appropriate for the type of the argument.
+ *
+ * If an exception is thrown during extraction, ios_base::badbit
+- * will be turned on in the stream's error state without causing an
+- * ios_base::failure to be thrown. The original exception will then
+- * be rethrown.
++ * will be turned on in the stream's error state (without causing an
++ * ios_base::failure to be thrown) and the original exception will
++ * be rethrown if badbit is set in the exceptions mask.
+ */
+
+ //@{
+@@ -286,9 +286,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+ * by gcount().
+ *
+ * If an exception is thrown during extraction, ios_base::badbit
+- * will be turned on in the stream's error state without causing an
+- * ios_base::failure to be thrown. The original exception will then
+- * be rethrown.
++ * will be turned on in the stream's error state (without causing an
++ * ios_base::failure to be thrown) and the original exception will
++ * be rethrown if badbit is set in the exceptions mask.
+ */
+
+ /**
+--- /dev/null
++++ libstdc++-v3/testsuite/27_io/basic_fstream/53984.cc
+@@ -0,0 +1,64 @@
++// Copyright (C) 2017 Free Software Foundation, Inc.
++//
++// This file is part of the GNU ISO C++ Library. This library 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 library 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 library; see the file COPYING3. If not see
++// .
++
++// { dg-require-fileio "" }
++
++// PR libstdc++/53984
++
++#include
++#include
++
++void
++test01()
++{
++ std::ifstream in(".");
++ if (in)
++ {
++ char c;
++ if (in.get(c))
++ {
++ // Reading a directory doesn't produce an error on this target
++ // so the formatted input functions below wouldn't fail anyway
++ // (see PR libstdc++/81808).
++ return;
++ }
++ int x;
++ in.clear();
++ // Formatted input function should set badbit, but not throw:
++ in >> x;
++ VERIFY( in.bad() );
++
++ in.clear();
++ in.exceptions(std::ios::badbit);
++ try
++ {
++ // Formatted input function should set badbit, and throw:
++ in >> x;
++ VERIFY( false );
++ }
++ catch (const std::exception&)
++ {
++ VERIFY( in.bad() );
++ }
++ }
++}
++
++int
++main()
++{
++ test01();
++}
+--- /dev/null
++++ libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/53984.cc
+@@ -0,0 +1,41 @@
++// Copyright (C) 2017 Free Software Foundation, Inc.
++//
++// This file is part of the GNU ISO C++ Library. This library 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 library 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 library; see the file COPYING3. If not see
++// .
++
++#include
++#include
++#include
++
++struct SB : std::streambuf
++{
++ virtual int_type underflow() { throw 1; }
++};
++
++void
++test01()
++{
++ SB sb;
++ std::istream is(&sb);
++ int i;
++ is >> i;
++ VERIFY( is.bad() );
++}
++
++int
++main()
++{
++ test01();
++}
diff --git a/SOURCES/gcc48-rh1469697-1.patch b/SOURCES/gcc48-rh1469697-1.patch
new file mode 100644
index 0000000..99a0a47
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-1.patch
@@ -0,0 +1,60 @@
+2015-10-02 Uros Bizjak
+
+ * system.h (ROUND_UP): New macro definition.
+ (ROUND_DOWN): Ditto.
+ * ggc-page.c (ROUND_UP): Remove local macro definition.
+ (PAGE_ALIGN): Implement using ROUND_UP macro.
+
+2013-08-24 Marc Glisse
+
+ PR other/57324
+ * hwint.h (HOST_WIDE_INT_UC, HOST_WIDE_INT_1U, HOST_WIDE_INT_M1,
+ HOST_WIDE_INT_M1U): New macros.
+
+
+diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
+index 5b18468439d..4fb41b1112b 100644
+--- a/gcc/ggc-page.c
++++ b/gcc/ggc-page.c
+@@ -216,10 +216,6 @@ static const size_t extra_order_size_table[] = {
+
+ #define ROUND_UP_VALUE(x, f) ((f) - 1 - ((f) - 1 + (x)) % (f))
+
+-/* Compute the smallest multiple of F that is >= X. */
+-
+-#define ROUND_UP(x, f) (CEIL (x, f) * (f))
+-
+ /* Round X to next multiple of the page size */
+
+ #define PAGE_ALIGN(x) (((x) + G.pagesize - 1) & ~(G.pagesize - 1))
+diff --git a/gcc/hwint.h b/gcc/hwint.h
+index da62fadcc9e..64b1805345d 100644
+--- a/gcc/hwint.h
++++ b/gcc/hwint.h
+@@ -76,7 +76,9 @@ extern char sizeof_long_long_must_be_8[sizeof(long long) == 8 ? 1 : -1];
+ # endif
+ #endif
+
++#define HOST_WIDE_INT_UC(X) HOST_WIDE_INT_C (X ## U)
+ #define HOST_WIDE_INT_1 HOST_WIDE_INT_C(1)
++#define HOST_WIDE_INT_1U HOST_WIDE_INT_UC(1)
+
+ /* This is a magic identifier which allows GCC to figure out the type
+ of HOST_WIDE_INT for %wd specifier checks. You must issue this
+diff --git a/gcc/system.h b/gcc/system.h
+index 41cd565538a..8230d506fc3 100644
+--- a/gcc/system.h
++++ b/gcc/system.h
+@@ -348,6 +348,12 @@ extern int errno;
+ /* Returns the least number N such that N * Y >= X. */
+ #define CEIL(x,y) (((x) + (y) - 1) / (y))
+
++/* This macro rounds x up to the y boundary. */
++#define ROUND_UP(x,y) (((x) + (y) - 1) & ~((y) - 1))
++
++/* This macro rounds x down to the y boundary. */
++#define ROUND_DOWN(x,y) ((x) & ~((y) - 1))
++
+ #ifdef HAVE_SYS_WAIT_H
+ #include
+ #endif
diff --git a/SOURCES/gcc48-rh1469697-10.patch b/SOURCES/gcc48-rh1469697-10.patch
new file mode 100644
index 0000000..df9ae9f
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-10.patch
@@ -0,0 +1,52 @@
+commit c22c3dee4bbf4a99b234307c63e4845052a15890
+Author: law
+Date: Thu Sep 21 22:03:59 2017 +0000
+
+ * config/i386/i386.c (ix86_adjust_stack_and_probe_stack_clash):
+ Fix dump output if the only stack space is for pushed registers.
+
+ * lib/target-supports.exp
+ (check_effective_target_frame_pointer_for_non_leaf): Add
+ case for x86 Solaris.
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@253082 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index a9072f58f50..d8a225195ae 100644
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
+@@ -9856,7 +9856,16 @@ ix86_adjust_stack_and_probe_stack_clash (const HOST_WIDE_INT size)
+ no probes are needed. */
+ if (!size)
+ {
+- dump_stack_clash_frame_info (NO_PROBE_NO_FRAME, false);
++ struct ix86_frame frame;
++ ix86_compute_frame_layout (&frame);
++
++ /* However, the allocation of space via pushes for register
++ saves could be viewed as allocating space, but without the
++ need to probe. */
++ if (frame.nregs || frame.nsseregs || frame_pointer_needed)
++ dump_stack_clash_frame_info (NO_PROBE_SMALL_FRAME, true);
++ else
++ dump_stack_clash_frame_info (NO_PROBE_NO_FRAME, false);
+ return;
+ }
+
+diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
+index f24c5c6e0ac..7c126e4122b 100644
+--- a/gcc/testsuite/lib/target-supports.exp
++++ b/gcc/testsuite/lib/target-supports.exp
+@@ -5439,6 +5439,12 @@ proc check_effective_target_frame_pointer_for_non_leaf { } {
+ if { [istarget aarch*-*-*] } {
+ return 1
+ }
++
++ # Solaris/x86 defaults to -fno-omit-frame-pointer.
++ if { [istarget i?86-*-solaris*] || [istarget x86_64-*-solaris*] } {
++ return 1
++ }
++
+ return 0
+ }
+
diff --git a/SOURCES/gcc48-rh1469697-11.patch b/SOURCES/gcc48-rh1469697-11.patch
new file mode 100644
index 0000000..16332f1
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-11.patch
@@ -0,0 +1,573 @@
+commit 27d2a2d27f3e0060ade9a1a82ce2292aad6c6931
+Author: law
+Date: Mon Sep 25 23:13:55 2017 +0000
+
+ * config/rs6000/rs6000-protos.h (output_probe_stack_range): Update
+ prototype for new argument.
+ * config/rs6000/rs6000.c (rs6000_emit_allocate_stack_1): New function,
+ mostly extracted from rs6000_emit_allocate_stack.
+ (rs6000_emit_probe_stack_range_stack_clash): New function.
+ (rs6000_emit_allocate_stack): Call
+ rs6000_emit_probe_stack_range_stack_clash as needed.
+ (rs6000_emit_probe_stack_range): Add additional argument
+ to call to gen_probe_stack_range{si,di}.
+ (output_probe_stack_range): New.
+ (output_probe_stack_range_1): Renamed from output_probe_stack_range.
+ (output_probe_stack_range_stack_clash): New.
+ (rs6000_emit_prologue): Emit notes into dump file as requested.
+ * rs6000.md (allocate_stack): Handle -fstack-clash-protection.
+ (probe_stack_range): Operand 0 is now early-clobbered.
+ Add additional operand and pass it to output_probe_stack_range.
+
+ * lib/target-supports.exp
+ (check_effective_target_supports_stack_clash_protection): Enable for
+ rs6000 and powerpc targets.
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@253179 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
+index d4b93d9970d..cfb23ab80cc 100644
+--- a/gcc/config/rs6000/rs6000-protos.h
++++ b/gcc/config/rs6000/rs6000-protos.h
+@@ -114,7 +114,7 @@ extern void rs6000_emit_sCOND (enum machine_mode, rtx[]);
+ extern void rs6000_emit_cbranch (enum machine_mode, rtx[]);
+ extern char * output_cbranch (rtx, const char *, int, rtx);
+ extern char * output_e500_flip_gt_bit (rtx, rtx);
+-extern const char * output_probe_stack_range (rtx, rtx);
++extern const char * output_probe_stack_range (rtx, rtx, rtx);
+ extern rtx rs6000_emit_set_const (rtx, enum machine_mode, rtx, int);
+ extern int rs6000_emit_cmove (rtx, rtx, rtx, rtx);
+ extern int rs6000_emit_vector_cond_expr (rtx, rtx, rtx, rtx, rtx, rtx);
+diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
+index a9052c6becf..c5d9988c1d9 100644
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -22320,6 +22320,220 @@ rs6000_emit_stack_tie (rtx fp, bool hard_frame_needed)
+ emit_insn (gen_stack_tie (gen_rtx_PARALLEL (VOIDmode, p)));
+ }
+
++/* Allocate SIZE_INT bytes on the stack using a store with update style insn
++ and set the appropriate attributes for the generated insn. Return the
++ first insn which adjusts the stack pointer or the last insn before
++ the stack adjustment loop.
++
++ SIZE_INT is used to create the CFI note for the allocation.
++
++ SIZE_RTX is an rtx containing the size of the adjustment. Note that
++ since stacks grow to lower addresses its runtime value is -SIZE_INT.
++
++ ORIG_SP contains the backchain value that must be stored at *sp. */
++
++static rtx
++rs6000_emit_allocate_stack_1 (HOST_WIDE_INT size_int, rtx orig_sp)
++{
++ rtx insn;
++
++ rtx size_rtx = GEN_INT (-size_int);
++ if (size_int > 32767)
++ {
++ rtx tmp_reg = gen_rtx_REG (Pmode, 0);
++ /* Need a note here so that try_split doesn't get confused. */
++ if (get_last_insn () == NULL_RTX)
++ emit_note (NOTE_INSN_DELETED);
++ insn = emit_move_insn (tmp_reg, size_rtx);
++ try_split (PATTERN (insn), insn, 0);
++ size_rtx = tmp_reg;
++ }
++
++ if (Pmode == SImode)
++ insn = emit_insn (gen_movsi_update_stack (stack_pointer_rtx,
++ stack_pointer_rtx,
++ size_rtx,
++ orig_sp));
++ else
++ insn = emit_insn (gen_movdi_di_update_stack (stack_pointer_rtx,
++ stack_pointer_rtx,
++ size_rtx,
++ orig_sp));
++ rtx par = PATTERN (insn);
++ gcc_assert (GET_CODE (par) == PARALLEL);
++ rtx set = XVECEXP (par, 0, 0);
++ gcc_assert (GET_CODE (set) == SET);
++ rtx mem = SET_DEST (set);
++ gcc_assert (MEM_P (mem));
++ MEM_NOTRAP_P (mem) = 1;
++ set_mem_alias_set (mem, get_frame_alias_set ());
++
++ RTX_FRAME_RELATED_P (insn) = 1;
++ add_reg_note (insn, REG_FRAME_RELATED_EXPR,
++ gen_rtx_SET (VOIDmode, stack_pointer_rtx,
++ gen_rtx_PLUS (Pmode,
++ stack_pointer_rtx,
++ GEN_INT (-size_int))));
++
++ /* Emit a blockage to ensure the allocation/probing insns are
++ not optimized, combined, removed, etc. Add REG_STACK_CHECK
++ note for similar reasons. */
++ if (flag_stack_clash_protection)
++ {
++ add_reg_note (insn, REG_STACK_CHECK, const0_rtx);
++ emit_insn (gen_blockage ());
++ }
++
++ return insn;
++}
++
++static HOST_WIDE_INT
++get_stack_clash_protection_probe_interval (void)
++{
++ return (HOST_WIDE_INT_1U
++ << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL));
++}
++
++static HOST_WIDE_INT
++get_stack_clash_protection_guard_size (void)
++{
++ return (HOST_WIDE_INT_1U
++ << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE));
++}
++
++/* Allocate ORIG_SIZE bytes on the stack and probe the newly
++ allocated space every STACK_CLASH_PROTECTION_PROBE_INTERVAL bytes.
++
++ COPY_REG, if non-null, should contain a copy of the original
++ stack pointer at exit from this function.
++
++ This is subtly different than the Ada probing in that it tries hard to
++ prevent attacks that jump the stack guard. Thus it is never allowed to
++ allocate more than STACK_CLASH_PROTECTION_PROBE_INTERVAL bytes of stack
++ space without a suitable probe. */
++static rtx
++rs6000_emit_probe_stack_range_stack_clash (HOST_WIDE_INT orig_size,
++ rtx copy_reg)
++{
++ rtx orig_sp = copy_reg;
++
++ HOST_WIDE_INT probe_interval = get_stack_clash_protection_probe_interval ();
++
++ /* Round the size down to a multiple of PROBE_INTERVAL. */
++ HOST_WIDE_INT rounded_size = ROUND_DOWN (orig_size, probe_interval);
++
++ /* If explicitly requested,
++ or the rounded size is not the same as the original size
++ or the the rounded size is greater than a page,
++ then we will need a copy of the original stack pointer. */
++ if (rounded_size != orig_size
++ || rounded_size > probe_interval
++ || copy_reg)
++ {
++ /* If the caller did not request a copy of the incoming stack
++ pointer, then we use r0 to hold the copy. */
++ if (!copy_reg)
++ orig_sp = gen_rtx_REG (Pmode, 0);
++ emit_move_insn (orig_sp, stack_pointer_rtx);
++ }
++
++ /* There's three cases here.
++
++ One is a single probe which is the most common and most efficiently
++ implemented as it does not have to have a copy of the original
++ stack pointer if there are no residuals.
++
++ Second is unrolled allocation/probes which we use if there's just
++ a few of them. It needs to save the original stack pointer into a
++ temporary for use as a source register in the allocation/probe.
++
++ Last is a loop. This is the most uncommon case and least efficient. */
++ rtx retval = NULL;
++ if (rounded_size == probe_interval)
++ {
++ retval = rs6000_emit_allocate_stack_1 (probe_interval, stack_pointer_rtx);
++
++ dump_stack_clash_frame_info (PROBE_INLINE, rounded_size != orig_size);
++ }
++ else if (rounded_size <= 8 * probe_interval)
++ {
++ /* The ABI requires using the store with update insns to allocate
++ space and store the backchain into the stack
++
++ So we save the current stack pointer into a temporary, then
++ emit the store-with-update insns to store the saved stack pointer
++ into the right location in each new page. */
++ for (int i = 0; i < rounded_size; i += probe_interval)
++ {
++ rtx insn = rs6000_emit_allocate_stack_1 (probe_interval, orig_sp);
++
++ /* Save the first stack adjustment in RETVAL. */
++ if (i == 0)
++ retval = insn;
++ }
++
++ dump_stack_clash_frame_info (PROBE_INLINE, rounded_size != orig_size);
++ }
++ else
++ {
++ /* Compute the ending address. */
++ rtx end_addr
++ = copy_reg ? gen_rtx_REG (Pmode, 0) : gen_rtx_REG (Pmode, 12);
++ rtx rs = GEN_INT (-rounded_size);
++ rtx insn;
++ if (add_operand (rs, Pmode))
++ insn = emit_insn (gen_add3_insn (end_addr, stack_pointer_rtx, rs));
++ else
++ {
++ emit_move_insn (end_addr, GEN_INT (-rounded_size));
++ insn = emit_insn (gen_add3_insn (end_addr, end_addr,
++ stack_pointer_rtx));
++ /* Describe the effect of INSN to the CFI engine. */
++ add_reg_note (insn, REG_FRAME_RELATED_EXPR,
++ gen_rtx_SET (VOIDmode, end_addr,
++ gen_rtx_PLUS (Pmode, stack_pointer_rtx,
++ rs)));
++ }
++ RTX_FRAME_RELATED_P (insn) = 1;
++
++ /* Emit the loop. */
++ if (TARGET_64BIT)
++ retval = emit_insn (gen_probe_stack_rangedi (stack_pointer_rtx,
++ stack_pointer_rtx, orig_sp,
++ end_addr));
++ else
++ retval = emit_insn (gen_probe_stack_rangesi (stack_pointer_rtx,
++ stack_pointer_rtx, orig_sp,
++ end_addr));
++ RTX_FRAME_RELATED_P (retval) = 1;
++ /* Describe the effect of INSN to the CFI engine. */
++ add_reg_note (retval, REG_FRAME_RELATED_EXPR,
++ gen_rtx_SET (VOIDmode, stack_pointer_rtx, end_addr));
++
++ /* Emit a blockage to ensure the allocation/probing insns are
++ not optimized, combined, removed, etc. Other cases handle this
++ within their call to rs6000_emit_allocate_stack_1. */
++ emit_insn (gen_blockage ());
++
++ dump_stack_clash_frame_info (PROBE_LOOP, rounded_size != orig_size);
++ }
++
++ if (orig_size != rounded_size)
++ {
++ /* Allocate (and implicitly probe) any residual space. */
++ HOST_WIDE_INT residual = orig_size - rounded_size;
++
++ rtx insn = rs6000_emit_allocate_stack_1 (residual, orig_sp);
++
++ /* If the residual was the only allocation, then we can return the
++ allocating insn. */
++ if (!retval)
++ retval = insn;
++ }
++
++ return retval;
++}
++
+ /* Emit the correct code for allocating stack space, as insns.
+ If COPY_REG, make sure a copy of the old frame is left there.
+ The generated code may use hard register 0 as a temporary. */
+@@ -22331,7 +22545,6 @@ rs6000_emit_allocate_stack (HOST_WIDE_INT size, rtx copy_reg, int copy_off)
+ rtx stack_reg = gen_rtx_REG (Pmode, STACK_POINTER_REGNUM);
+ rtx tmp_reg = gen_rtx_REG (Pmode, 0);
+ rtx todec = gen_int_mode (-size, Pmode);
+- rtx par, set, mem;
+
+ if (INTVAL (todec) != -size)
+ {
+@@ -22368,6 +22581,22 @@ rs6000_emit_allocate_stack (HOST_WIDE_INT size, rtx copy_reg, int copy_off)
+ warning (0, "stack limit expression is not supported");
+ }
+
++ if (flag_stack_clash_protection)
++ {
++ if (size < get_stack_clash_protection_guard_size ())
++ dump_stack_clash_frame_info (NO_PROBE_SMALL_FRAME, true);
++ else
++ {
++ rtx insn = rs6000_emit_probe_stack_range_stack_clash (size, copy_reg);
++
++ /* If we asked for a copy with an offset, then we still need add in
++ the offset. */
++ if (copy_reg && copy_off)
++ emit_insn (gen_add3_insn (copy_reg, copy_reg, GEN_INT (copy_off)));
++ return;
++ }
++ }
++
+ if (copy_reg)
+ {
+ if (copy_off != 0)
+@@ -22376,39 +22605,12 @@ rs6000_emit_allocate_stack (HOST_WIDE_INT size, rtx copy_reg, int copy_off)
+ emit_move_insn (copy_reg, stack_reg);
+ }
+
+- if (size > 32767)
+- {
+- /* Need a note here so that try_split doesn't get confused. */
+- if (get_last_insn () == NULL_RTX)
+- emit_note (NOTE_INSN_DELETED);
+- insn = emit_move_insn (tmp_reg, todec);
+- try_split (PATTERN (insn), insn, 0);
+- todec = tmp_reg;
+- }
+-
+- insn = emit_insn (TARGET_32BIT
+- ? gen_movsi_update_stack (stack_reg, stack_reg,
+- todec, stack_reg)
+- : gen_movdi_di_update_stack (stack_reg, stack_reg,
+- todec, stack_reg));
+ /* Since we didn't use gen_frame_mem to generate the MEM, grab
+ it now and set the alias set/attributes. The above gen_*_update
+ calls will generate a PARALLEL with the MEM set being the first
+ operation. */
+- par = PATTERN (insn);
+- gcc_assert (GET_CODE (par) == PARALLEL);
+- set = XVECEXP (par, 0, 0);
+- gcc_assert (GET_CODE (set) == SET);
+- mem = SET_DEST (set);
+- gcc_assert (MEM_P (mem));
+- MEM_NOTRAP_P (mem) = 1;
+- set_mem_alias_set (mem, get_frame_alias_set ());
+-
+- RTX_FRAME_RELATED_P (insn) = 1;
+- add_reg_note (insn, REG_FRAME_RELATED_EXPR,
+- gen_rtx_SET (VOIDmode, stack_reg,
+- gen_rtx_PLUS (Pmode, stack_reg,
+- GEN_INT (-size))));
++ insn = rs6000_emit_allocate_stack_1 (size, stack_reg);
++ return;
+ }
+
+ #define PROBE_INTERVAL (1 << STACK_CHECK_PROBE_INTERVAL_EXP)
+@@ -22490,9 +22692,9 @@ rs6000_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size)
+ until it is equal to ROUNDED_SIZE. */
+
+ if (TARGET_64BIT)
+- emit_insn (gen_probe_stack_rangedi (r12, r12, r0));
++ emit_insn (gen_probe_stack_rangedi (r12, r12, stack_pointer_rtx, r0));
+ else
+- emit_insn (gen_probe_stack_rangesi (r12, r12, r0));
++ emit_insn (gen_probe_stack_rangesi (r12, r12, stack_pointer_rtx, r0));
+
+
+ /* Step 4: probe at FIRST + SIZE if we cannot assert at compile-time
+@@ -22504,10 +22706,10 @@ rs6000_emit_probe_stack_range (HOST_WIDE_INT first, HOST_WIDE_INT size)
+ }
+
+ /* Probe a range of stack addresses from REG1 to REG2 inclusive. These are
+- absolute addresses. */
++ addresses, not offsets. */
+
+-const char *
+-output_probe_stack_range (rtx reg1, rtx reg2)
++static const char *
++output_probe_stack_range_1 (rtx reg1, rtx reg2)
+ {
+ static int labelno = 0;
+ char loop_lab[32], end_lab[32];
+@@ -22546,6 +22748,63 @@ output_probe_stack_range (rtx reg1, rtx reg2)
+ return "";
+ }
+
++/* Probe a range of stack addresses from REG1 to REG3 inclusive. These are
++ addresses, not offsets.
++
++ REG2 contains the backchain that must be stored into *sp at each allocation.
++
++ This is subtly different than the Ada probing above in that it tries hard
++ to prevent attacks that jump the stack guard. Thus, it is never allowed
++ to allocate more than PROBE_INTERVAL bytes of stack space without a
++ suitable probe. */
++
++static const char *
++output_probe_stack_range_stack_clash (rtx reg1, rtx reg2, rtx reg3)
++{
++ static int labelno = 0;
++ char loop_lab[32];
++ rtx xops[3];
++
++ HOST_WIDE_INT probe_interval = get_stack_clash_protection_probe_interval ();
++
++ ASM_GENERATE_INTERNAL_LABEL (loop_lab, "LPSRL", labelno++);
++
++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, loop_lab);
++
++ /* This allocates and probes. */
++ xops[0] = reg1;
++ xops[1] = reg2;
++ xops[2] = GEN_INT (-probe_interval);
++ if (TARGET_64BIT)
++ output_asm_insn ("stdu %1,%2(%0)", xops);
++ else
++ output_asm_insn ("stwu %1,%2(%0)", xops);
++
++ /* Jump to LOOP_LAB if TEST_ADDR != LAST_ADDR. */
++ xops[0] = reg1;
++ xops[1] = reg3;
++ if (TARGET_64BIT)
++ output_asm_insn ("cmpd 0,%0,%1", xops);
++ else
++ output_asm_insn ("cmpw 0,%0,%1", xops);
++
++ fputs ("\tbne 0,", asm_out_file);
++ assemble_name_raw (asm_out_file, loop_lab);
++ fputc ('\n', asm_out_file);
++
++ return "";
++}
++
++/* Wrapper around the output_probe_stack_range routines. */
++const char *
++output_probe_stack_range (rtx reg1, rtx reg2, rtx reg3)
++{
++ if (flag_stack_clash_protection)
++ return output_probe_stack_range_stack_clash (reg1, reg2, reg3);
++ else
++ return output_probe_stack_range_1 (reg1, reg3);
++}
++
+ /* Add to 'insn' a note which is PATTERN (INSN) but with REG replaced
+ with (plus:P (reg 1) VAL), and with REG2 replaced with RREG if REG2
+ is not NULL. It would be nice if dwarf2out_frame_debug_expr could
+@@ -23857,6 +24116,13 @@ rs6000_emit_prologue (void)
+ }
+ }
+
++ /* If we are emitting stack probes, but allocate no stack, then
++ just note that in the dump file. */
++ if (flag_stack_clash_protection
++ && dump_file
++ && !info->push_p)
++ dump_stack_clash_frame_info (NO_PROBE_NO_FRAME, false);
++
+ /* Update stack and set back pointer unless this is V.4,
+ for which it was done previously. */
+ if (!WORLD_SAVE_P (info) && info->push_p
+diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
+index cd197213480..3cd70e592c1 100644
+--- a/gcc/config/rs6000/rs6000.md
++++ b/gcc/config/rs6000/rs6000.md
+@@ -11822,10 +11822,20 @@
+ ;;
+ ;; First, an insn to allocate new stack space for dynamic use (e.g., alloca).
+ ;; We move the back-chain and decrement the stack pointer.
+-
++;;
++;; Operand1 is more naturally reg_or_short_operand. However, for a large
++;; constant alloca, using that predicate will force the generic code to put
++;; the constant size into a register before calling the expander.
++;;
++;; As a result the expander would not have the constant size information
++;; in those cases and would have to generate less efficient code.
++;;
++;; Thus we allow reg_or_cint_operand instead so that the expander can see
++;; the constant size. The value is forced into a register if necessary.
++;;
+ (define_expand "allocate_stack"
+ [(set (match_operand 0 "gpc_reg_operand" "")
+- (minus (reg 1) (match_operand 1 "reg_or_short_operand" "")))
++ (minus (reg 1) (match_operand 1 "reg_or_cint_operand" "")))
+ (set (reg 1)
+ (minus (reg 1) (match_dup 1)))]
+ ""
+@@ -11835,6 +11845,15 @@
+ rtx neg_op0;
+ rtx insn, par, set, mem;
+
++ /* By allowing reg_or_cint_operand as the predicate we can get
++ better code for stack-clash-protection because we do not lose
++ size information. But the rest of the code expects the operand
++ to be reg_or_short_operand. If it isn't, then force it into
++ a register. */
++ rtx orig_op1 = operands[1];
++ if (!reg_or_short_operand (operands[1], Pmode))
++ operands[1] = force_reg (Pmode, operands[1]);
++
+ emit_move_insn (chain, stack_bot);
+
+ /* Check stack bounds if necessary. */
+@@ -11847,6 +11866,51 @@
+ emit_insn (gen_cond_trap (LTU, available, operands[1], const0_rtx));
+ }
+
++ /* Allocate and probe if requested.
++ This may look similar to the loop we use for prologue allocations,
++ but it is critically different. For the former we know the loop
++ will iterate, but do not know that generally here. The former
++ uses that knowledge to rotate the loop. Combining them would be
++ possible with some performance cost. */
++ if (flag_stack_clash_protection)
++ {
++ rtx rounded_size, last_addr, residual;
++ HOST_WIDE_INT probe_interval;
++ compute_stack_clash_protection_loop_data (&rounded_size, &last_addr,
++ &residual, &probe_interval,
++ orig_op1);
++
++ /* We do occasionally get in here with constant sizes, we might
++ as well do a reasonable job when we obviously can. */
++ if (rounded_size != const0_rtx)
++ {
++ rtx loop_lab, end_loop;
++ bool rotated = CONST_INT_P (rounded_size);
++
++ emit_stack_clash_protection_probe_loop_start (&loop_lab, &end_loop,
++ last_addr, rotated);
++
++ if (Pmode == SImode)
++ emit_insn (gen_movsi_update_stack (stack_pointer_rtx,
++ stack_pointer_rtx,
++ GEN_INT (-probe_interval),
++ chain));
++ else
++ emit_insn (gen_movdi_di_update_stack (stack_pointer_rtx,
++ stack_pointer_rtx,
++ GEN_INT (-probe_interval),
++ chain));
++ emit_stack_clash_protection_probe_loop_end (loop_lab, end_loop,
++ last_addr, rotated);
++ }
++
++ /* Now handle residuals. We just have to set operands[1] correctly
++ and let the rest of the expander run. */
++ operands[1] = residual;
++ if (!CONST_INT_P (residual))
++ operands[1] = force_reg (Pmode, operands[1]);
++ }
++
+ if (GET_CODE (operands[1]) != CONST_INT
+ || INTVAL (operands[1]) < -32767
+ || INTVAL (operands[1]) > 32768)
+@@ -12994,12 +13058,13 @@
+ (set_attr "length" "4")])
+
+ (define_insn "probe_stack_range"
+- [(set (match_operand:P 0 "register_operand" "=r")
++ [(set (match_operand:P 0 "register_operand" "=&r")
+ (unspec_volatile:P [(match_operand:P 1 "register_operand" "0")
+- (match_operand:P 2 "register_operand" "r")]
++ (match_operand:P 2 "register_operand" "r")
++ (match_operand:P 3 "register_operand" "r")]
+ UNSPECV_PROBE_STACK_RANGE))]
+ ""
+- "* return output_probe_stack_range (operands[0], operands[2]);"
++ "* return output_probe_stack_range (operands[0], operands[2], operands[3]);"
+ [(set_attr "type" "three")])
+
+ ;; Compare insns are next. Note that the RS/6000 has two types of compares,
+diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
+index 7c126e4122b..aba99513ed0 100644
+--- a/gcc/testsuite/lib/target-supports.exp
++++ b/gcc/testsuite/lib/target-supports.exp
+@@ -5421,12 +5421,12 @@ proc check_effective_target_autoincdec { } {
+ proc check_effective_target_supports_stack_clash_protection { } {
+
+ # Temporary until the target bits are fully ACK'd.
+-# if { [istarget aarch*-*-*]
+-# || [istarget powerpc*-*-*] || [istarget rs6000*-*-*] } {
++# if { [istarget aarch*-*-*] } {
+ # return 1
+ # }
+
+ if { [istarget x86_64-*-*] || [istarget i?86-*-*]
++ || [istarget powerpc*-*-*] || [istarget rs6000*-*-*]
+ || [istarget s390*-*-*] } {
+ return 1
+ }
diff --git a/SOURCES/gcc48-rh1469697-12.patch b/SOURCES/gcc48-rh1469697-12.patch
new file mode 100644
index 0000000..2a7dd8f
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-12.patch
@@ -0,0 +1,47 @@
+commit 15d5202e75021f2c41b8a1cb344c04b8915e9d4e
+Author: law
+Date: Sun Oct 8 15:44:39 2017 +0000
+
+ * gcc.dg/stack-check-5.c: Skip with -fstack-protector.
+ * gcc.dg/stack-check-6.c: Likewise.
+ * gcc.dg/stack-check-6a.c: Likewise.
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@253527 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/testsuite/gcc.dg/stack-check-5.c b/gcc/testsuite/gcc.dg/stack-check-5.c
+index 3178f5d8ce5..850e023ea4e 100644
+--- a/gcc/testsuite/gcc.dg/stack-check-5.c
++++ b/gcc/testsuite/gcc.dg/stack-check-5.c
+@@ -1,6 +1,7 @@
+ /* { dg-do compile } */
+ /* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=12" } */
+ /* { dg-require-effective-target supports_stack_clash_protection } */
++/* { dg-skip-if "" { *-*-* } { "-fstack-protector" } { "" } } */
+
+
+ /* Otherwise the S/390 back-end might save the stack pointer in f2 ()
+diff --git a/gcc/testsuite/gcc.dg/stack-check-6.c b/gcc/testsuite/gcc.dg/stack-check-6.c
+index ad2021c9037..ab4b0e8894c 100644
+--- a/gcc/testsuite/gcc.dg/stack-check-6.c
++++ b/gcc/testsuite/gcc.dg/stack-check-6.c
+@@ -1,6 +1,7 @@
+ /* { dg-do compile } */
+ /* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=12" } */
+ /* { dg-require-effective-target supports_stack_clash_protection } */
++/* { dg-skip-if "" { *-*-* } { "-fstack-protector" } { "" } } */
+
+
+ extern void foo (char *);
+diff --git a/gcc/testsuite/gcc.dg/stack-check-6a.c b/gcc/testsuite/gcc.dg/stack-check-6a.c
+index 6f8e7128921..468d649a4fa 100644
+--- a/gcc/testsuite/gcc.dg/stack-check-6a.c
++++ b/gcc/testsuite/gcc.dg/stack-check-6a.c
+@@ -4,6 +4,8 @@
+ /* { dg-do compile } */
+ /* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=16" } */
+ /* { dg-require-effective-target supports_stack_clash_protection } */
++/* { dg-skip-if "" { *-*-* } { "-fstack-protector" } { "" } } */
++
+
+ #include "stack-check-6.c"
+
diff --git a/SOURCES/gcc48-rh1469697-13.patch b/SOURCES/gcc48-rh1469697-13.patch
new file mode 100644
index 0000000..64c98aa
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-13.patch
@@ -0,0 +1,21 @@
+ * config/i386/i386.c (ix86_expand_prologue): Tighten assert
+ for int_registers_saved.
+
+diff -rup a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+--- a/gcc/config/i386/i386.c 2017-11-03 10:39:24.585633524 -0600
++++ b/gcc/config/i386/i386.c 2017-11-03 10:41:10.654774032 -0600
+@@ -10686,8 +10686,12 @@ ix86_expand_prologue (void)
+ && (flag_stack_check == STATIC_BUILTIN_STACK_CHECK
+ || flag_stack_clash_protection))
+ {
+- /* We expect the registers to be saved when probes are used. */
+- gcc_assert (int_registers_saved);
++ /* This assert wants to verify that integer registers were saved
++ prior to probing. This is necessary when probing may be implemented
++ as a function call (Windows). It is not necessary for stack clash
++ protection probing. */
++ if (!flag_stack_clash_protection)
++ gcc_assert (int_registers_saved);
+
+ if (flag_stack_clash_protection)
+ {
diff --git a/SOURCES/gcc48-rh1469697-14.patch b/SOURCES/gcc48-rh1469697-14.patch
new file mode 100644
index 0000000..bb060fd
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-14.patch
@@ -0,0 +1,301 @@
+commit 21397732bbcef3347c0d5ff8a0ee5163e803e2fb
+Author: Jeff Law
+Date: Mon Oct 2 12:30:26 2017 -0600
+
+ Dependencies for aarch64 work
+
+diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h
+index 07ff7031b35..91dd5b7fc02 100644
+--- a/gcc/config/aarch64/aarch64-protos.h
++++ b/gcc/config/aarch64/aarch64-protos.h
+@@ -181,6 +181,7 @@ unsigned aarch64_dbx_register_number (unsigned);
+ unsigned aarch64_trampoline_size (void);
+ void aarch64_asm_output_labelref (FILE *, const char *);
+ void aarch64_elf_asm_named_section (const char *, unsigned, tree);
++const char * aarch64_output_probe_stack_range (rtx, rtx);
+ void aarch64_expand_epilogue (bool);
+ void aarch64_expand_mov_immediate (rtx, rtx);
+ void aarch64_expand_prologue (void);
+diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
+index 5afc167d569..cadf193cfcf 100644
+--- a/gcc/config/aarch64/aarch64.c
++++ b/gcc/config/aarch64/aarch64.c
+@@ -969,6 +969,199 @@ aarch64_function_ok_for_sibcall (tree decl, tree exp ATTRIBUTE_UNUSED)
+ return true;
+ }
+
++static int
++aarch64_internal_mov_immediate (rtx dest, rtx imm, bool generate,
++ enum machine_mode mode)
++{
++ int i;
++ unsigned HOST_WIDE_INT val, val2, mask;
++ int one_match, zero_match;
++ int num_insns;
++
++ val = INTVAL (imm);
++
++ if (aarch64_move_imm (val, mode))
++ {
++ if (generate)
++ emit_insn (gen_rtx_SET (VOIDmode, dest, imm));
++ return 1;
++ }
++
++ /* Check to see if the low 32 bits are either 0xffffXXXX or 0xXXXXffff
++ (with XXXX non-zero). In that case check to see if the move can be done in
++ a smaller mode. */
++ val2 = val & 0xffffffff;
++ if (mode == DImode
++ && aarch64_move_imm (val2, SImode)
++ && (((val >> 32) & 0xffff) == 0 || (val >> 48) == 0))
++ {
++ if (generate)
++ emit_insn (gen_rtx_SET (VOIDmode, dest, GEN_INT (val2)));
++
++ /* Check if we have to emit a second instruction by checking to see
++ if any of the upper 32 bits of the original DI mode value is set. */
++ if (val == val2)
++ return 1;
++
++ i = (val >> 48) ? 48 : 32;
++
++ if (generate)
++ emit_insn (gen_insv_immdi (dest, GEN_INT (i),
++ GEN_INT ((val >> i) & 0xffff)));
++
++ return 2;
++ }
++
++ if ((val >> 32) == 0 || mode == SImode)
++ {
++ if (generate)
++ {
++ emit_insn (gen_rtx_SET (VOIDmode, dest, GEN_INT (val & 0xffff)));
++ if (mode == SImode)
++ emit_insn (gen_insv_immsi (dest, GEN_INT (16),
++ GEN_INT ((val >> 16) & 0xffff)));
++ else
++ emit_insn (gen_insv_immdi (dest, GEN_INT (16),
++ GEN_INT ((val >> 16) & 0xffff)));
++ }
++ return 2;
++ }
++
++ /* Remaining cases are all for DImode. */
++
++ mask = 0xffff;
++ zero_match = ((val & mask) == 0) + ((val & (mask << 16)) == 0) +
++ ((val & (mask << 32)) == 0) + ((val & (mask << 48)) == 0);
++ one_match = ((~val & mask) == 0) + ((~val & (mask << 16)) == 0) +
++ ((~val & (mask << 32)) == 0) + ((~val & (mask << 48)) == 0);
++
++ if (zero_match != 2 && one_match != 2)
++ {
++ /* Try emitting a bitmask immediate with a movk replacing 16 bits.
++ For a 64-bit bitmask try whether changing 16 bits to all ones or
++ zeroes creates a valid bitmask. To check any repeated bitmask,
++ try using 16 bits from the other 32-bit half of val. */
++
++ for (i = 0; i < 64; i += 16, mask <<= 16)
++ {
++ val2 = val & ~mask;
++ if (val2 != val && aarch64_bitmask_imm (val2, mode))
++ break;
++ val2 = val | mask;
++ if (val2 != val && aarch64_bitmask_imm (val2, mode))
++ break;
++ val2 = val2 & ~mask;
++ val2 = val2 | (((val2 >> 32) | (val2 << 32)) & mask);
++ if (val2 != val && aarch64_bitmask_imm (val2, mode))
++ break;
++ }
++ if (i != 64)
++ {
++ if (generate)
++ {
++ emit_insn (gen_rtx_SET (VOIDmode, dest, GEN_INT (val2)));
++ emit_insn (gen_insv_immdi (dest, GEN_INT (i),
++ GEN_INT ((val >> i) & 0xffff)));
++ }
++ return 2;
++ }
++ }
++
++ /* Generate 2-4 instructions, skipping 16 bits of all zeroes or ones which
++ are emitted by the initial mov. If one_match > zero_match, skip set bits,
++ otherwise skip zero bits. */
++
++ num_insns = 1;
++ mask = 0xffff;
++ val2 = one_match > zero_match ? ~val : val;
++ i = (val2 & mask) != 0 ? 0 : (val2 & (mask << 16)) != 0 ? 16 : 32;
++
++ if (generate)
++ emit_insn (gen_rtx_SET (VOIDmode, dest, GEN_INT (one_match > zero_match
++ ? (val | ~(mask << i))
++ : (val & (mask << i)))));
++ for (i += 16; i < 64; i += 16)
++ {
++ if ((val2 & (mask << i)) == 0)
++ continue;
++ if (generate)
++ emit_insn (gen_insv_immdi (dest, GEN_INT (i),
++ GEN_INT ((val >> i) & 0xffff)));
++ num_insns ++;
++ }
++
++ return num_insns;
++}
++
++/* Add DELTA to REGNUM in mode MODE. SCRATCHREG can be used to hold a
++ temporary value if necessary. FRAME_RELATED_P should be true if
++ the RTX_FRAME_RELATED flag should be set and CFA adjustments added
++ to the generated instructions. If SCRATCHREG is known to hold
++ abs (delta), EMIT_MOVE_IMM can be set to false to avoid emitting the
++ immediate again.
++
++ Since this function may be used to adjust the stack pointer, we must
++ ensure that it cannot cause transient stack deallocation (for example
++ by first incrementing SP and then decrementing when adjusting by a
++ large immediate). */
++
++static void
++aarch64_add_constant_internal (enum machine_mode mode, int regnum,
++ int scratchreg, HOST_WIDE_INT delta,
++ bool frame_related_p, bool emit_move_imm)
++{
++ HOST_WIDE_INT mdelta = abs_hwi (delta);
++ rtx this_rtx = gen_rtx_REG (mode, regnum);
++ rtx insn;
++
++ if (!mdelta)
++ return;
++
++ /* Single instruction adjustment. */
++ if (aarch64_uimm12_shift (mdelta))
++ {
++ insn = emit_insn (gen_add2_insn (this_rtx, GEN_INT (delta)));
++ RTX_FRAME_RELATED_P (insn) = frame_related_p;
++ return;
++ }
++
++ /* Emit 2 additions/subtractions if the adjustment is less than 24 bits.
++ Only do this if mdelta is not a 16-bit move as adjusting using a move
++ is better. */
++ if (mdelta < 0x1000000 && !aarch64_move_imm (mdelta, mode))
++ {
++ HOST_WIDE_INT low_off = mdelta & 0xfff;
++
++ low_off = delta < 0 ? -low_off : low_off;
++ insn = emit_insn (gen_add2_insn (this_rtx, GEN_INT (low_off)));
++ RTX_FRAME_RELATED_P (insn) = frame_related_p;
++ insn = emit_insn (gen_add2_insn (this_rtx, GEN_INT (delta - low_off)));
++ RTX_FRAME_RELATED_P (insn) = frame_related_p;
++ return;
++ }
++
++ /* Emit a move immediate if required and an addition/subtraction. */
++ rtx scratch_rtx = gen_rtx_REG (mode, scratchreg);
++ if (emit_move_imm)
++ aarch64_internal_mov_immediate (scratch_rtx, GEN_INT (mdelta), true, mode);
++ insn = emit_insn (delta < 0 ? gen_sub2_insn (this_rtx, scratch_rtx)
++ : gen_add2_insn (this_rtx, scratch_rtx));
++ if (frame_related_p)
++ {
++ RTX_FRAME_RELATED_P (insn) = frame_related_p;
++ rtx adj = plus_constant (mode, this_rtx, delta);
++ add_reg_note (insn , REG_CFA_ADJUST_CFA,
++ gen_rtx_SET (VOIDmode, this_rtx, adj));
++ }
++}
++
++static inline void
++aarch64_sub_sp (int scratchreg, HOST_WIDE_INT delta, bool frame_related_p)
++{
++ aarch64_add_constant_internal (Pmode, SP_REGNUM, scratchreg, -delta,
++ frame_related_p, true);
++}
++
+ /* Implement TARGET_PASS_BY_REFERENCE. */
+
+ static bool
+@@ -1476,6 +1669,47 @@ aarch64_libgcc_cmp_return_mode (void)
+ return SImode;
+ }
+
++#define PROBE_INTERVAL (1 << STACK_CHECK_PROBE_INTERVAL_EXP)
++
++/* We use the 12-bit shifted immediate arithmetic instructions so values
++ must be multiple of (1 << 12), i.e. 4096. */
++#define ARITH_FACTOR 4096
++
++/* Probe a range of stack addresses from REG1 to REG2 inclusive. These are
++ absolute addresses. */
++
++const char *
++aarch64_output_probe_stack_range (rtx reg1, rtx reg2)
++{
++ static int labelno = 0;
++ char loop_lab[32];
++ rtx xops[2];
++
++ ASM_GENERATE_INTERNAL_LABEL (loop_lab, "LPSRL", labelno++);
++
++ /* Loop. */
++ ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, loop_lab);
++
++ /* TEST_ADDR = TEST_ADDR + PROBE_INTERVAL. */
++ xops[0] = reg1;
++ xops[1] = GEN_INT (PROBE_INTERVAL);
++ output_asm_insn ("sub\t%0, %0, %1", xops);
++
++ /* Probe at TEST_ADDR. */
++ output_asm_insn ("str\txzr, [%0]", xops);
++
++ /* Test if TEST_ADDR == LAST_ADDR. */
++ xops[1] = reg2;
++ output_asm_insn ("cmp\t%0, %1", xops);
++
++ /* Branch. */
++ fputs ("\tb.ne\t", asm_out_file);
++ assemble_name_raw (asm_out_file, loop_lab);
++ fputc ('\n', asm_out_file);
++
++ return "";
++}
++
+ static bool
+ aarch64_frame_pointer_required (void)
+ {
+diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
+index 91299901bbf..17082486ac8 100644
+--- a/gcc/config/aarch64/aarch64.md
++++ b/gcc/config/aarch64/aarch64.md
+@@ -88,6 +88,7 @@
+ UNSPEC_ST4
+ UNSPEC_TLS
+ UNSPEC_TLSDESC
++ UNSPECV_PROBE_STACK_RANGE ; Represent stack range probing.
+ UNSPEC_VSTRUCTDUMMY
+ ])
+
+@@ -3399,6 +3400,18 @@
+ [(set_attr "length" "0")]
+ )
+
++(define_insn "probe_stack_range"
++ [(set (match_operand:DI 0 "register_operand" "=r")
++ (unspec_volatile:DI [(match_operand:DI 1 "register_operand" "0")
++ (match_operand:DI 2 "register_operand" "r")]
++ UNSPECV_PROBE_STACK_RANGE))]
++ ""
++{
++ return aarch64_output_probe_stack_range (operands[0], operands[2]);
++}
++ [(set_attr "length" "32")]
++)
++
+ ;; Named pattern for expanding thread pointer reference.
+ (define_expand "get_thread_pointerdi"
+ [(match_operand:DI 0 "register_operand" "=r")]
diff --git a/SOURCES/gcc48-rh1469697-15.patch b/SOURCES/gcc48-rh1469697-15.patch
new file mode 100644
index 0000000..e2df531
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-15.patch
@@ -0,0 +1,147 @@
+commit 54a2f1efc188660df9da78523b6925aab4c3a668
+Author: rsandifo
+Date: Tue Jan 13 14:11:15 2015 +0000
+
+ gcc/
+ * config/aarch64/aarch64.md (subsi3, *subsi3_uxtw, subdi3)
+ (*sub__, *sub__si_uxtw)
+ (*sub__shft_)
+ (*sub__shft_si_uxtw, *sub__multp2)
+ (*sub_si_multp2_uxtw, *sub_uxt_multp2)
+ (*sub_uxtsi_multp2_uxtw): Add stack pointer sources.
+
+ gcc/testsuite/
+ * gcc.target/aarch64/subsp.c: New test.
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219533 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
+index 17082486ac8..a085c6acaf5 100644
+--- a/gcc/config/aarch64/aarch64.md
++++ b/gcc/config/aarch64/aarch64.md
+@@ -1610,8 +1610,8 @@
+
+ (define_insn "subsi3"
+ [(set (match_operand:SI 0 "register_operand" "=rk")
+- (minus:SI (match_operand:SI 1 "register_operand" "r")
+- (match_operand:SI 2 "register_operand" "r")))]
++ (minus:SI (match_operand:SI 1 "register_operand" "rk")
++ (match_operand:SI 2 "register_operand" "r")))]
+ ""
+ "sub\\t%w0, %w1, %w2"
+ [(set_attr "v8type" "alu")
+@@ -1622,7 +1622,7 @@
+ (define_insn "*subsi3_uxtw"
+ [(set (match_operand:DI 0 "register_operand" "=rk")
+ (zero_extend:DI
+- (minus:SI (match_operand:SI 1 "register_operand" "r")
++ (minus:SI (match_operand:SI 1 "register_operand" "rk")
+ (match_operand:SI 2 "register_operand" "r"))))]
+ ""
+ "sub\\t%w0, %w1, %w2"
+@@ -1632,7 +1632,7 @@
+
+ (define_insn "subdi3"
+ [(set (match_operand:DI 0 "register_operand" "=rk,!w")
+- (minus:DI (match_operand:DI 1 "register_operand" "r,!w")
++ (minus:DI (match_operand:DI 1 "register_operand" "rk,!w")
+ (match_operand:DI 2 "register_operand" "r,!w")))]
+ ""
+ "@
+@@ -1725,7 +1725,7 @@
+
+ (define_insn "*sub__"
+ [(set (match_operand:GPI 0 "register_operand" "=rk")
+- (minus:GPI (match_operand:GPI 1 "register_operand" "r")
++ (minus:GPI (match_operand:GPI 1 "register_operand" "rk")
+ (ANY_EXTEND:GPI
+ (match_operand:ALLX 2 "register_operand" "r"))))]
+ ""
+@@ -1738,7 +1738,7 @@
+ (define_insn "*sub__si_uxtw"
+ [(set (match_operand:DI 0 "register_operand" "=rk")
+ (zero_extend:DI
+- (minus:SI (match_operand:SI 1 "register_operand" "r")
++ (minus:SI (match_operand:SI 1 "register_operand" "rk")
+ (ANY_EXTEND:SI
+ (match_operand:SHORT 2 "register_operand" "r")))))]
+ ""
+@@ -1749,7 +1749,7 @@
+
+ (define_insn "*sub__shft_"
+ [(set (match_operand:GPI 0 "register_operand" "=rk")
+- (minus:GPI (match_operand:GPI 1 "register_operand" "r")
++ (minus:GPI (match_operand:GPI 1 "register_operand" "rk")
+ (ashift:GPI (ANY_EXTEND:GPI
+ (match_operand:ALLX 2 "register_operand" "r"))
+ (match_operand 3 "aarch64_imm3" "Ui3"))))]
+@@ -1763,7 +1763,7 @@
+ (define_insn "*sub__shft_si_uxtw"
+ [(set (match_operand:DI 0 "register_operand" "=rk")
+ (zero_extend:DI
+- (minus:SI (match_operand:SI 1 "register_operand" "r")
++ (minus:SI (match_operand:SI 1 "register_operand" "rk")
+ (ashift:SI (ANY_EXTEND:SI
+ (match_operand:SHORT 2 "register_operand" "r"))
+ (match_operand 3 "aarch64_imm3" "Ui3")))))]
+@@ -1775,7 +1775,7 @@
+
+ (define_insn "*sub__multp2"
+ [(set (match_operand:GPI 0 "register_operand" "=rk")
+- (minus:GPI (match_operand:GPI 4 "register_operand" "r")
++ (minus:GPI (match_operand:GPI 4 "register_operand" "rk")
+ (ANY_EXTRACT:GPI
+ (mult:GPI (match_operand:GPI 1 "register_operand" "r")
+ (match_operand 2 "aarch64_pwr_imm3" "Up3"))
+@@ -1791,7 +1791,7 @@
+ (define_insn "*sub_si_multp2_uxtw"
+ [(set (match_operand:DI 0 "register_operand" "=rk")
+ (zero_extend:DI
+- (minus:SI (match_operand:SI 4 "register_operand" "r")
++ (minus:SI (match_operand:SI 4 "register_operand" "rk")
+ (ANY_EXTRACT:SI
+ (mult:SI (match_operand:SI 1 "register_operand" "r")
+ (match_operand 2 "aarch64_pwr_imm3" "Up3"))
+@@ -1805,7 +1805,7 @@
+
+ (define_insn "*sub_uxt_multp2"
+ [(set (match_operand:GPI 0 "register_operand" "=rk")
+- (minus:GPI (match_operand:GPI 4 "register_operand" "r")
++ (minus:GPI (match_operand:GPI 4 "register_operand" "rk")
+ (and:GPI
+ (mult:GPI (match_operand:GPI 1 "register_operand" "r")
+ (match_operand 2 "aarch64_pwr_imm3" "Up3"))
+@@ -1823,7 +1823,7 @@
+ (define_insn "*sub_uxtsi_multp2_uxtw"
+ [(set (match_operand:DI 0 "register_operand" "=rk")
+ (zero_extend:DI
+- (minus:SI (match_operand:SI 4 "register_operand" "r")
++ (minus:SI (match_operand:SI 4 "register_operand" "rk")
+ (and:SI
+ (mult:SI (match_operand:SI 1 "register_operand" "r")
+ (match_operand 2 "aarch64_pwr_imm3" "Up3"))
+diff --git a/gcc/testsuite/gcc.target/aarch64/subsp.c b/gcc/testsuite/gcc.target/aarch64/subsp.c
+new file mode 100644
+index 00000000000..70d848c59d1
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/aarch64/subsp.c
+@@ -0,0 +1,19 @@
++/* { dg-options "-O" } */
++
++int foo (void *);
++
++int
++f1 (int *x, long y)
++{
++ return foo (__builtin_alloca (y));
++}
++
++int
++f2 (int *x, int y)
++{
++ char a[y + 1][16];
++ return foo (a);
++}
++
++/* { dg-final { scan-assembler "sub\tsp, sp, x\[0-9\]*\n" } } */
++/* { dg-final { scan-assembler "sub\tsp, sp, x\[0-9\]*, sxtw 4\n" } } */
diff --git a/SOURCES/gcc48-rh1469697-16.patch b/SOURCES/gcc48-rh1469697-16.patch
new file mode 100644
index 0000000..423f448
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-16.patch
@@ -0,0 +1,462 @@
+commit 5d7a77ede3e91948ee125bd82533d7e692543fff
+Author: Jeff Law
+Date: Mon Oct 2 13:43:01 2017 -0600
+
+ aarch64 support
+
+diff --git a/gcc/config/aarch64/.aarch64.c.rej.swp b/gcc/config/aarch64/.aarch64.c.rej.swp
+new file mode 100644
+index 00000000000..b899e21b855
+Binary files /dev/null and b/gcc/config/aarch64/.aarch64.c.rej.swp differ
+diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
+index cadf193cfcf..e08632ffa88 100644
+--- a/gcc/config/aarch64/aarch64.c
++++ b/gcc/config/aarch64/aarch64.c
+@@ -45,6 +45,8 @@
+ #include "gimple.h"
+ #include "optabs.h"
+ #include "dwarf2.h"
++#include "params.h"
++#include "dumpfile.h"
+
+ /* Classifies an address.
+
+@@ -1696,7 +1698,14 @@ aarch64_output_probe_stack_range (rtx reg1, rtx reg2)
+ output_asm_insn ("sub\t%0, %0, %1", xops);
+
+ /* Probe at TEST_ADDR. */
+- output_asm_insn ("str\txzr, [%0]", xops);
++ if (flag_stack_clash_protection)
++ {
++ gcc_assert (xops[0] == stack_pointer_rtx);
++ xops[1] = GEN_INT (PROBE_INTERVAL - 8);
++ output_asm_insn ("str\txzr, [%0, %1]", xops);
++ }
++ else
++ output_asm_insn ("str\txzr, [%0]", xops);
+
+ /* Test if TEST_ADDR == LAST_ADDR. */
+ xops[1] = reg2;
+@@ -2001,6 +2010,123 @@ aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT offset,
+ base_rtx, cfi_ops);
+ }
+
++/* Allocate SIZE bytes of stack space using SCRATCH_REG as a scratch
++ register. */
++
++static void
++aarch64_allocate_and_probe_stack_space (int scratchreg, HOST_WIDE_INT size)
++{
++ HOST_WIDE_INT probe_interval
++ = 1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL);
++ HOST_WIDE_INT guard_size
++ = 1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE);
++ HOST_WIDE_INT guard_used_by_caller = 1024;
++
++ /* SIZE should be large enough to require probing here. ie, it
++ must be larger than GUARD_SIZE - GUARD_USED_BY_CALLER.
++
++ We can allocate GUARD_SIZE - GUARD_USED_BY_CALLER as a single chunk
++ without any probing. */
++ gcc_assert (size >= guard_size - guard_used_by_caller);
++ aarch64_sub_sp (scratchreg, guard_size - guard_used_by_caller, true);
++ HOST_WIDE_INT orig_size = size;
++ size -= (guard_size - guard_used_by_caller);
++
++ HOST_WIDE_INT rounded_size = size & -probe_interval;
++ HOST_WIDE_INT residual = size - rounded_size;
++
++ /* We can handle a small number of allocations/probes inline. Otherwise
++ punt to a loop. */
++ if (rounded_size && rounded_size <= 4 * probe_interval)
++ {
++ /* We don't use aarch64_sub_sp here because we don't want to
++ repeatedly load SCRATCHREG. */
++ rtx scratch_rtx = gen_rtx_REG (Pmode, scratchreg);
++ if (probe_interval > ARITH_FACTOR)
++ emit_move_insn (scratch_rtx, GEN_INT (-probe_interval));
++ else
++ scratch_rtx = GEN_INT (-probe_interval);
++
++ for (HOST_WIDE_INT i = 0; i < rounded_size; i += probe_interval)
++ {
++ rtx insn = emit_insn (gen_add2_insn (stack_pointer_rtx, scratch_rtx));
++ add_reg_note (insn, REG_STACK_CHECK, const0_rtx);
++
++ if (probe_interval > ARITH_FACTOR)
++ {
++ RTX_FRAME_RELATED_P (insn) = 1;
++ rtx adj = plus_constant (Pmode, stack_pointer_rtx, -probe_interval);
++ add_reg_note (insn, REG_CFA_ADJUST_CFA,
++ gen_rtx_SET (VOIDmode, stack_pointer_rtx, adj));
++ }
++
++ emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx,
++ (probe_interval
++ - GET_MODE_SIZE (word_mode))));
++ emit_insn (gen_blockage ());
++ }
++ dump_stack_clash_frame_info (PROBE_INLINE, size != rounded_size);
++ }
++ else if (rounded_size)
++ {
++ /* Compute the ending address. */
++ rtx temp = gen_rtx_REG (word_mode, scratchreg);
++ emit_move_insn (temp, GEN_INT (-rounded_size));
++ rtx insn = emit_insn (gen_add3_insn (temp, stack_pointer_rtx, temp));
++
++ /* For the initial allocation, we don't have a frame pointer
++ set up, so we always need CFI notes. If we're doing the
++ final allocation, then we may have a frame pointer, in which
++ case it is the CFA, otherwise we need CFI notes.
++
++ We can determine which allocation we are doing by looking at
++ the temporary register. IP0 is the initial allocation, IP1
++ is the final allocation. */
++ if (scratchreg == IP0_REGNUM || !frame_pointer_needed)
++ {
++ /* We want the CFA independent of the stack pointer for the
++ duration of the loop. */
++ add_reg_note (insn, REG_CFA_DEF_CFA,
++ plus_constant (Pmode, temp,
++ (rounded_size + (orig_size - size))));
++ RTX_FRAME_RELATED_P (insn) = 1;
++ }
++
++ /* This allocates and probes the stack.
++
++ It also probes at a 4k interval regardless of the value of
++ PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL. */
++ insn = emit_insn (gen_probe_stack_range (stack_pointer_rtx,
++ stack_pointer_rtx, temp));
++
++ /* Now reset the CFA register if needed. */
++ if (scratchreg == IP0_REGNUM || !frame_pointer_needed)
++ {
++ add_reg_note (insn, REG_CFA_DEF_CFA,
++ plus_constant (Pmode, stack_pointer_rtx,
++ (rounded_size + (orig_size - size))));
++ RTX_FRAME_RELATED_P (insn) = 1;
++ }
++
++ emit_insn (gen_blockage ());
++ dump_stack_clash_frame_info (PROBE_LOOP, size != rounded_size);
++ }
++ else
++ dump_stack_clash_frame_info (PROBE_INLINE, size != rounded_size);
++
++ /* Handle any residuals.
++ Note that any residual must be probed. */
++ if (residual)
++ {
++ aarch64_sub_sp (scratchreg, residual, true);
++ add_reg_note (get_last_insn (), REG_STACK_CHECK, const0_rtx);
++ emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx,
++ (residual - GET_MODE_SIZE (word_mode))));
++ emit_insn (gen_blockage ());
++ }
++ return;
++}
++
+ /* AArch64 stack frames generated by this compiler look like:
+
+ +-------------------------------+
+@@ -2073,6 +2199,44 @@ aarch64_expand_prologue (void)
+ - original_frame_size
+ - cfun->machine->frame.saved_regs_size);
+
++ /* We do not fully protect aarch64 against stack clash style attacks
++ as doing so would be prohibitively expensive with less utility over
++ time as newer compilers are deployed.
++
++ We assume the guard is at least 64k. Furthermore, we assume that
++ the caller has not pushed the stack pointer more than 1k into
++ the guard. A caller that pushes the stack pointer than 1k into
++ the guard is considered invalid.
++
++ Note that the caller's ability to push the stack pointer into the
++ guard is a function of the number and size of outgoing arguments and/or
++ dynamic stack allocations due to the mandatory save of the link register
++ in the caller's frame.
++
++ With those assumptions the callee can allocate up to 63k of stack
++ space without probing.
++
++ When probing is needed, we emit a probe at the start of the prologue
++ and every PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL bytes thereafter.
++
++ We have to track how much space has been allocated, but we do not
++ track stores into the stack as implicit probes except for the
++ fp/lr store. */
++ HOST_WIDE_INT guard_size
++ = 1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE);
++ HOST_WIDE_INT guard_used_by_caller = 1024;
++ HOST_WIDE_INT final_adjust = crtl->outgoing_args_size;
++ HOST_WIDE_INT initial_adjust = frame_size;
++
++ if (flag_stack_clash_protection)
++ {
++ if (initial_adjust == 0)
++ dump_stack_clash_frame_info (NO_PROBE_NO_FRAME, false);
++ else if (offset < guard_size - guard_used_by_caller
++ && final_adjust < guard_size - guard_used_by_caller)
++ dump_stack_clash_frame_info (NO_PROBE_SMALL_FRAME, true);
++ }
++
+ /* Store pairs and load pairs have a range only -512 to 504. */
+ if (offset >= 512)
+ {
+@@ -2089,7 +2253,10 @@ aarch64_expand_prologue (void)
+ frame_size -= (offset + crtl->outgoing_args_size);
+ fp_offset = 0;
+
+- if (frame_size >= 0x1000000)
++ if (flag_stack_clash_protection
++ && frame_size >= guard_size - guard_used_by_caller)
++ aarch64_allocate_and_probe_stack_space (IP0_REGNUM, frame_size);
++ else if (frame_size >= 0x1000000)
+ {
+ rtx op0 = gen_rtx_REG (Pmode, IP0_REGNUM);
+ emit_move_insn (op0, GEN_INT (-frame_size));
+@@ -2206,10 +2373,30 @@ aarch64_expand_prologue (void)
+ {
+ if (crtl->outgoing_args_size > 0)
+ {
+- insn = emit_insn (gen_add2_insn
+- (stack_pointer_rtx,
+- GEN_INT (- crtl->outgoing_args_size)));
+- RTX_FRAME_RELATED_P (insn) = 1;
++ if (flag_stack_clash_protection)
++ {
++ /* First probe if the final adjustment is larger than the
++ guard size less the amount of guard reserved for use by
++ the caller's outgoing args. */
++ if (final_adjust >= guard_size - guard_used_by_caller)
++ aarch64_allocate_and_probe_stack_space (IP1_REGNUM,
++ final_adjust);
++ else
++ aarch64_sub_sp (IP1_REGNUM, final_adjust, !frame_pointer_needed);
++
++ /* We must also probe if the final adjustment is larger than the
++ guard that is assumed used by the caller. This may be
++ sub-optimal. */
++ if (final_adjust >= guard_used_by_caller)
++ {
++ if (dump_file)
++ fprintf (dump_file,
++ "Stack clash aarch64 large outgoing arg, probing\n");
++ emit_stack_probe (stack_pointer_rtx);
++ }
++ }
++ else
++ aarch64_sub_sp (IP1_REGNUM, final_adjust, !frame_pointer_needed);
+ }
+ }
+ }
+@@ -5088,6 +5275,12 @@ aarch64_override_options (void)
+ #endif
+ }
+
++ /* We assume the guard page is 64k. */
++ maybe_set_param_value (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE,
++ 16,
++ global_options.x_param_values,
++ global_options_set.x_param_values);
++
+ aarch64_override_options_after_change ();
+ }
+
+@@ -8161,6 +8354,28 @@ aarch64_vectorize_vec_perm_const_ok (enum machine_mode vmode,
+ return ret;
+ }
+
++/* It has been decided that to allow up to 1kb of outgoing argument
++ space to be allocated w/o probing. If more than 1kb of outgoing
++ argment space is allocated, then it must be probed and the last
++ probe must occur no more than 1kbyte away from the end of the
++ allocated space.
++
++ This implies that the residual part of an alloca allocation may
++ need probing in cases where the generic code might not otherwise
++ think a probe is needed.
++
++ This target hook returns TRUE when allocating RESIDUAL bytes of
++ alloca space requires an additional probe, otherwise FALSE is
++ returned. */
++
++static bool
++aarch64_stack_clash_protection_final_dynamic_probe (rtx residual)
++{
++ return (residual == CONST0_RTX (Pmode)
++ || GET_CODE (residual) != CONST_INT
++ || INTVAL (residual) >= 1024);
++}
++
+ #undef TARGET_ADDRESS_COST
+ #define TARGET_ADDRESS_COST aarch64_address_cost
+
+@@ -8378,6 +8593,10 @@ aarch64_vectorize_vec_perm_const_ok (enum machine_mode vmode,
+ #undef TARGET_FIXED_CONDITION_CODE_REGS
+ #define TARGET_FIXED_CONDITION_CODE_REGS aarch64_fixed_condition_code_regs
+
++#undef TARGET_STACK_CLASH_PROTECTION_FINAL_DYNAMIC_PROBE
++#define TARGET_STACK_CLASH_PROTECTION_FINAL_DYNAMIC_PROBE \
++ aarch64_stack_clash_protection_final_dynamic_probe
++
+ struct gcc_target targetm = TARGET_INITIALIZER;
+
+ #include "gt-aarch64.h"
+diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
+index a085c6acaf5..5485a5f70b1 100644
+--- a/gcc/config/aarch64/aarch64.md
++++ b/gcc/config/aarch64/aarch64.md
+@@ -3401,7 +3401,7 @@
+ )
+
+ (define_insn "probe_stack_range"
+- [(set (match_operand:DI 0 "register_operand" "=r")
++ [(set (match_operand:DI 0 "register_operand" "=rk")
+ (unspec_volatile:DI [(match_operand:DI 1 "register_operand" "0")
+ (match_operand:DI 2 "register_operand" "r")]
+ UNSPECV_PROBE_STACK_RANGE))]
+diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-12.c b/gcc/testsuite/gcc.target/aarch64/stack-check-12.c
+new file mode 100644
+index 00000000000..2ce38483b6b
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/aarch64/stack-check-12.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++extern void arf (unsigned long int *, unsigned long int *);
++void
++frob ()
++{
++ unsigned long int num[1000];
++ unsigned long int den[1000];
++ arf (den, num);
++}
++
++/* This verifies that the scheduler did not break the dependencies
++ by adjusting the offsets within the probe and that the scheduler
++ did not reorder around the stack probes. */
++/* { dg-final { scan-assembler-times "sub\\tsp, sp, #4096\\n\\tstr\\txzr, .sp, 4088." 3 } } */
++
++
++
+diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-13.c b/gcc/testsuite/gcc.target/aarch64/stack-check-13.c
+new file mode 100644
+index 00000000000..d8886835989
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/aarch64/stack-check-13.c
+@@ -0,0 +1,28 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++#define ARG32(X) X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X,X
++#define ARG192(X) ARG32(X),ARG32(X),ARG32(X),ARG32(X),ARG32(X),ARG32(X)
++void out1(ARG192(__int128));
++int t1(int);
++
++int t3(int x)
++{
++ if (x < 1000)
++ return t1 (x) + 1;
++
++ out1 (ARG192(1));
++ return 0;
++}
++
++
++
++/* This test creates a large (> 1k) outgoing argument area that needs
++ to be probed. We don't test the exact size of the space or the
++ exact offset to make the test a little less sensitive to trivial
++ output changes. */
++/* { dg-final { scan-assembler-times "sub\\tsp, sp, #....\\n\\tstr\\txzr, \\\[sp" 1 } } */
++
++
++
+diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-14.c b/gcc/testsuite/gcc.target/aarch64/stack-check-14.c
+new file mode 100644
+index 00000000000..59ffe01376d
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/aarch64/stack-check-14.c
+@@ -0,0 +1,25 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++int t1(int);
++
++int t2(int x)
++{
++ char *p = __builtin_alloca (4050);
++ x = t1 (x);
++ return p[x];
++}
++
++
++/* This test has a constant sized alloca that is smaller than the
++ probe interval. But it actually requires two probes instead
++ of one because of the optimistic assumptions we made in the
++ aarch64 prologue code WRT probing state.
++
++ The form can change quite a bit so we just check for two
++ probes without looking at the actual address. */
++/* { dg-final { scan-assembler-times "str\\txzr," 2 } } */
++
++
++
+diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-15.c b/gcc/testsuite/gcc.target/aarch64/stack-check-15.c
+new file mode 100644
+index 00000000000..e06db6dc2f0
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/aarch64/stack-check-15.c
+@@ -0,0 +1,24 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++int t1(int);
++
++int t2(int x)
++{
++ char *p = __builtin_alloca (x);
++ x = t1 (x);
++ return p[x];
++}
++
++
++/* This test has a variable sized alloca. It requires 3 probes.
++ One in the loop, one for the residual and at the end of the
++ alloca area.
++
++ The form can change quite a bit so we just check for two
++ probes without looking at the actual address. */
++/* { dg-final { scan-assembler-times "str\\txzr," 3 } } */
++
++
++
+diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
+index aba99513ed0..a8451c98b08 100644
+--- a/gcc/testsuite/lib/target-supports.exp
++++ b/gcc/testsuite/lib/target-supports.exp
+@@ -5420,14 +5420,9 @@ proc check_effective_target_autoincdec { } {
+ #
+ proc check_effective_target_supports_stack_clash_protection { } {
+
+- # Temporary until the target bits are fully ACK'd.
+-# if { [istarget aarch*-*-*] } {
+-# return 1
+-# }
+-
+ if { [istarget x86_64-*-*] || [istarget i?86-*-*]
+ || [istarget powerpc*-*-*] || [istarget rs6000*-*-*]
+- || [istarget s390*-*-*] } {
++ || [istarget aarch64*-**] || [istarget s390*-*-*] } {
+ return 1
+ }
+ return 0
diff --git a/SOURCES/gcc48-rh1469697-17.patch b/SOURCES/gcc48-rh1469697-17.patch
new file mode 100644
index 0000000..614a8db
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-17.patch
@@ -0,0 +1,58 @@
+
+ * config/i386/i386.c (ix86_emit_restore_reg_using_pop): Prototype.
+ (ix86_adjust_stack_and_probe_stack_clash): Use a push/pop sequence
+ to probe at the start of a noreturn function.
+
+ * gcc.target/i386/stack-check-12.c: New test
+
+diff -Nrup a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+--- a/gcc/config/i386/i386.c 2017-11-03 13:35:17.641528205 -0600
++++ b/gcc/config/i386/i386.c 2017-11-03 13:37:39.489361692 -0600
+@@ -64,6 +64,7 @@ along with GCC; see the file COPYING3.
+ #include "tree-flow.h"
+
+ static rtx legitimize_dllimport_symbol (rtx, bool);
++static void ix86_emit_restore_reg_using_pop (rtx);
+
+ #ifndef CHECK_STACK_LIMIT
+ #define CHECK_STACK_LIMIT (-1)
+@@ -9884,8 +9885,14 @@ ix86_adjust_stack_and_probe_stack_clash
+ we just probe when we cross PROBE_INTERVAL. */
+ if (TREE_THIS_VOLATILE (cfun->decl))
+ {
+- emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx,
+- -GET_MODE_SIZE (word_mode)));
++ /* We can safely use any register here since we're just going to push
++ its value and immediately pop it back. But we do try and avoid
++ argument passing registers so as not to introduce dependencies in
++ the pipeline. For 32 bit we use %esi and for 64 bit we use %rax. */
++ rtx dummy_reg = gen_rtx_REG (word_mode, TARGET_64BIT ? AX_REG : SI_REG);
++ rtx insn = emit_insn (gen_push (dummy_reg));
++ RTX_FRAME_RELATED_P (insn) = 1;
++ ix86_emit_restore_reg_using_pop (dummy_reg);
+ emit_insn (gen_blockage ());
+ }
+
+diff -Nrup a/gcc/testsuite/gcc.target/i386/stack-check-12.c b/gcc/testsuite/gcc.target/i386/stack-check-12.c
+--- a/gcc/testsuite/gcc.target/i386/stack-check-12.c 1969-12-31 17:00:00.000000000 -0700
++++ b/gcc/testsuite/gcc.target/i386/stack-check-12.c 2017-11-03 13:36:15.104055651 -0600
+@@ -0,0 +1,19 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection -mtune=generic -fomit-frame-pointer" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++__attribute__ ((noreturn)) void exit (int);
++
++__attribute__ ((noreturn)) void
++f (void)
++{
++ asm volatile ("nop" ::: "edi");
++ exit (1);
++}
++
++/* { dg-final { scan-assembler-not "or\[ql\]" } } */
++/* { dg-final { scan-assembler "pushl %esi" { target ia32 } } } */
++/* { dg-final { scan-assembler "popl %esi" { target ia32 } } }*/
++/* { dg-final { scan-assembler "pushq %rax" { target { ! ia32 } } } } */
++/* { dg-final { scan-assembler "popq %rax" { target { ! ia32 } } } }*/
++
diff --git a/SOURCES/gcc48-rh1469697-18.patch b/SOURCES/gcc48-rh1469697-18.patch
new file mode 100644
index 0000000..612fad4
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-18.patch
@@ -0,0 +1,191 @@
+
+ * config/i386/i386.c (PROBE_INTERVAL): Remove.
+ (get_probe_interval): New function.
+ (ix86_adjust_stack_and_probe_stack_clash): Use get_probe_interval.
+ (ix86_adjust_stack_and_probe): Likewise.
+ (output_adjust_stack_and_probe): Likewise.
+ (ix86_emit_probe_stack_range): Likewise.
+ (ix86_expand_prologue): Likewise.
+
+ * gcc.dg/pr82788.c: New test.
+
+diff -Nrup a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+--- a/gcc/config/i386/i386.c 2017-11-06 09:54:43.814921056 -0700
++++ b/gcc/config/i386/i386.c 2017-11-06 09:55:25.327589661 -0700
+@@ -9839,7 +9839,17 @@ release_scratch_register_on_entry (struc
+ }
+ }
+
+-#define PROBE_INTERVAL (1 << STACK_CHECK_PROBE_INTERVAL_EXP)
++/* Return the probing interval for -fstack-clash-protection. */
++
++static HOST_WIDE_INT
++get_probe_interval (void)
++{
++ if (flag_stack_clash_protection)
++ return (HOST_WIDE_INT_1U
++ << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL));
++ else
++ return (HOST_WIDE_INT_1U << STACK_CHECK_PROBE_INTERVAL_EXP);
++}
+
+ /* Emit code to adjust the stack pointer by SIZE bytes while probing it.
+
+@@ -9911,8 +9921,7 @@ ix86_adjust_stack_and_probe_stack_clash
+ /* We're allocating a large enough stack frame that we need to
+ emit probes. Either emit them inline or in a loop depending
+ on the size. */
+- HOST_WIDE_INT probe_interval
+- = 1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL);
++ HOST_WIDE_INT probe_interval = get_probe_interval ();
+ if (size <= 4 * probe_interval)
+ {
+ HOST_WIDE_INT i;
+@@ -9921,7 +9930,7 @@ ix86_adjust_stack_and_probe_stack_clash
+ /* Allocate PROBE_INTERVAL bytes. */
+ rtx insn
+ = pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx,
+- GEN_INT (-PROBE_INTERVAL), -1,
++ GEN_INT (-probe_interval), -1,
+ m->fs.cfa_reg == stack_pointer_rtx);
+ add_reg_note (insn, REG_STACK_CHECK, const0_rtx);
+
+@@ -10014,7 +10023,7 @@ ix86_adjust_stack_and_probe (const HOST_
+ that's the easy case. The run-time loop is made up of 11 insns in the
+ generic case while the compile-time loop is made up of 3+2*(n-1) insns
+ for n # of intervals. */
+- if (size <= 5 * PROBE_INTERVAL)
++ if (size <= 5 * get_probe_interval ())
+ {
+ HOST_WIDE_INT i, adjust;
+ bool first_probe = true;
+@@ -10023,15 +10032,15 @@ ix86_adjust_stack_and_probe (const HOST_
+ values of N from 1 until it exceeds SIZE. If only one probe is
+ needed, this will not generate any code. Then adjust and probe
+ to PROBE_INTERVAL + SIZE. */
+- for (i = PROBE_INTERVAL; i < size; i += PROBE_INTERVAL)
++ for (i = get_probe_interval (); i < size; i += get_probe_interval ())
+ {
+ if (first_probe)
+ {
+- adjust = 2 * PROBE_INTERVAL + dope;
++ adjust = 2 * get_probe_interval () + dope;
+ first_probe = false;
+ }
+ else
+- adjust = PROBE_INTERVAL;
++ adjust = get_probe_interval ();
+
+ emit_insn (gen_rtx_SET (VOIDmode, stack_pointer_rtx,
+ plus_constant (Pmode, stack_pointer_rtx,
+@@ -10040,9 +10049,9 @@ ix86_adjust_stack_and_probe (const HOST_
+ }
+
+ if (first_probe)
+- adjust = size + PROBE_INTERVAL + dope;
++ adjust = size + get_probe_interval () + dope;
+ else
+- adjust = size + PROBE_INTERVAL - i;
++ adjust = size + get_probe_interval () - i;
+
+ emit_insn (gen_rtx_SET (VOIDmode, stack_pointer_rtx,
+ plus_constant (Pmode, stack_pointer_rtx,
+@@ -10052,7 +10061,8 @@ ix86_adjust_stack_and_probe (const HOST_
+ /* Adjust back to account for the additional first interval. */
+ last = emit_insn (gen_rtx_SET (VOIDmode, stack_pointer_rtx,
+ plus_constant (Pmode, stack_pointer_rtx,
+- PROBE_INTERVAL + dope)));
++ (get_probe_interval ()
++ + dope))));
+ }
+
+ /* Otherwise, do the same as above, but in a loop. Note that we must be
+@@ -10070,7 +10080,7 @@ ix86_adjust_stack_and_probe (const HOST_
+
+ /* Step 1: round SIZE to the previous multiple of the interval. */
+
+- rounded_size = size & -PROBE_INTERVAL;
++ rounded_size = size & get_probe_interval ();
+
+
+ /* Step 2: compute initial and final value of the loop counter. */
+@@ -10078,7 +10088,7 @@ ix86_adjust_stack_and_probe (const HOST_
+ /* SP = SP_0 + PROBE_INTERVAL. */
+ emit_insn (gen_rtx_SET (VOIDmode, stack_pointer_rtx,
+ plus_constant (Pmode, stack_pointer_rtx,
+- - (PROBE_INTERVAL + dope))));
++ - (get_probe_interval () + dope))));
+
+ /* LAST_ADDR = SP_0 + PROBE_INTERVAL + ROUNDED_SIZE. */
+ emit_move_insn (sr.reg, GEN_INT (-rounded_size));
+@@ -10115,7 +10125,8 @@ ix86_adjust_stack_and_probe (const HOST_
+ /* Adjust back to account for the additional first interval. */
+ last = emit_insn (gen_rtx_SET (VOIDmode, stack_pointer_rtx,
+ plus_constant (Pmode, stack_pointer_rtx,
+- PROBE_INTERVAL + dope)));
++ (get_probe_interval ()
++ + dope))));
+
+ release_scratch_register_on_entry (&sr);
+ }
+@@ -10134,7 +10145,7 @@ ix86_adjust_stack_and_probe (const HOST_
+ XVECEXP (expr, 0, 1)
+ = gen_rtx_SET (VOIDmode, stack_pointer_rtx,
+ plus_constant (Pmode, stack_pointer_rtx,
+- PROBE_INTERVAL + dope + size));
++ get_probe_interval () + dope + size));
+ add_reg_note (last, REG_FRAME_RELATED_EXPR, expr);
+ RTX_FRAME_RELATED_P (last) = 1;
+
+@@ -10168,7 +10179,7 @@ output_adjust_stack_and_probe (rtx reg)
+ fputc ('\n', asm_out_file);
+
+ /* SP = SP + PROBE_INTERVAL. */
+- xops[1] = GEN_INT (PROBE_INTERVAL);
++ xops[1] = GEN_INT (get_probe_interval ());
+ output_asm_insn ("sub%z0\t{%1, %0|%0, %1}", xops);
+
+ /* Probe at SP. */
+@@ -10194,14 +10205,14 @@ ix86_emit_probe_stack_range (HOST_WIDE_I
+ that's the easy case. The run-time loop is made up of 7 insns in the
+ generic case while the compile-time loop is made up of n insns for n #
+ of intervals. */
+- if (size <= 7 * PROBE_INTERVAL)
++ if (size <= 7 * get_probe_interval ())
+ {
+ HOST_WIDE_INT i;
+
+ /* Probe at FIRST + N * PROBE_INTERVAL for values of N from 1 until
+ it exceeds SIZE. If only one probe is needed, this will not
+ generate any code. Then probe at FIRST + SIZE. */
+- for (i = PROBE_INTERVAL; i < size; i += PROBE_INTERVAL)
++ for (i = get_probe_interval (); i < size; i += get_probe_interval ())
+ emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx,
+ -(first + i)));
+
+@@ -10224,7 +10235,7 @@ ix86_emit_probe_stack_range (HOST_WIDE_I
+
+ /* Step 1: round SIZE to the previous multiple of the interval. */
+
+- rounded_size = size & -PROBE_INTERVAL;
++ rounded_size = size & -get_probe_interval ();
+
+
+ /* Step 2: compute initial and final value of the loop counter. */
+@@ -10291,7 +10302,7 @@ output_probe_stack_range (rtx reg, rtx e
+ fputc ('\n', asm_out_file);
+
+ /* TEST_ADDR = TEST_ADDR + PROBE_INTERVAL. */
+- xops[1] = GEN_INT (PROBE_INTERVAL);
++ xops[1] = GEN_INT (get_probe_interval ());
+ output_asm_insn ("sub%z0\t{%1, %0|%0, %1}", xops);
+
+ /* Probe at TEST_ADDR. */
+diff -Nrup a/gcc/testsuite/gcc.dg/pr82788.c b/gcc/testsuite/gcc.dg/pr82788.c
+--- a/gcc/testsuite/gcc.dg/pr82788.c 1969-12-31 17:00:00.000000000 -0700
++++ b/gcc/testsuite/gcc.dg/pr82788.c 2017-11-06 09:55:10.680706587 -0700
+@@ -0,0 +1,4 @@
++/* { dg-do run } */
++/* { dg-options "-O2 -fstack-clash-protection --param stack-clash-protection-probe-interval=10 --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++int main() { int a[1442]; return 0;}
diff --git a/SOURCES/gcc48-rh1469697-19.patch b/SOURCES/gcc48-rh1469697-19.patch
new file mode 100644
index 0000000..655097e
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-19.patch
@@ -0,0 +1,36 @@
+2017-10-31 Segher Boessenkool
+
+ PR target/82674
+ * config/rs6000/rs6000.md (allocate_stack): Force update interval
+ into a register if it does not fit into an immediate offset field.
+
+
+diff -Nrup a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
+--- a/gcc/config/rs6000/rs6000.md 2017-11-06 09:12:21.128237467 -0700
++++ b/gcc/config/rs6000/rs6000.md 2017-11-06 09:13:40.521601373 -0700
+@@ -11886,6 +11886,9 @@
+ {
+ rtx loop_lab, end_loop;
+ bool rotated = CONST_INT_P (rounded_size);
++ rtx update = GEN_INT (-probe_interval);
++ if (probe_interval > 32768)
++ update = force_reg (Pmode, update);
+
+ emit_stack_clash_protection_probe_loop_start (&loop_lab, &end_loop,
+ last_addr, rotated);
+@@ -11893,13 +11896,11 @@
+ if (Pmode == SImode)
+ emit_insn (gen_movsi_update_stack (stack_pointer_rtx,
+ stack_pointer_rtx,
+- GEN_INT (-probe_interval),
+- chain));
++ update, chain));
+ else
+ emit_insn (gen_movdi_di_update_stack (stack_pointer_rtx,
+ stack_pointer_rtx,
+- GEN_INT (-probe_interval),
+- chain));
++ update, chain));
+ emit_stack_clash_protection_probe_loop_end (loop_lab, end_loop,
+ last_addr, rotated);
+ }
diff --git a/SOURCES/gcc48-rh1469697-2.patch b/SOURCES/gcc48-rh1469697-2.patch
new file mode 100644
index 0000000..a4b1b9c
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-2.patch
@@ -0,0 +1,360 @@
+commit 6427208ee82548346a2f42a8ac83fdd2f823fde2
+Author: law
+Date: Wed Sep 20 04:56:54 2017 +0000
+
+ * common.opt (-fstack-clash-protection): New option.
+ * flag-types.h (enum stack_check_type): Note difference between
+ -fstack-check= and -fstack-clash-protection.
+ * params.def (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE): New PARAM.
+ (PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL): Likewise.
+ * toplev.c (process_options): Issue warnings/errors for cases
+ not handled with -fstack-clash-protection.
+ * doc/invoke.texi (-fstack-clash-protection): Document new option.
+ (-fstack-check): Note additional problem with -fstack-check=generic.
+ Note that -fstack-check is primarily for Ada and refer users
+ to -fstack-clash-protection for stack-clash-protection.
+ Document new params for stack clash protection.
+
+ * gcc.dg/stack-check-2.c: New test.
+ * lib/target-supports.exp
+ (check_effective_target_supports_stack_clash_protection): New function.
+ (check_effective_target_frame_pointer_for_non_leaf): Likewise.
+ (check_effective_target_caller_implicit_probes): Likewise.
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@252994 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/common.opt b/gcc/common.opt
+index 16846c13b62..0c335cb12cd 100644
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -1911,13 +1911,18 @@ Common Report Var(flag_variable_expansion_in_unroller) Optimization
+ Apply variable expansion when loops are unrolled
+
+ fstack-check=
+-Common Report RejectNegative Joined
+--fstack-check=[no|generic|specific] Insert stack checking code into the program
++Common Report RejectNegative Joined Optimization
++-fstack-check=[no|generic|specific] Insert stack checking code into the program.
+
+ fstack-check
+ Common Alias(fstack-check=, specific, no)
+ Insert stack checking code into the program. Same as -fstack-check=specific
+
++fstack-clash-protection
++Common Report Var(flag_stack_clash_protection) Optimization
++Insert code to probe each page of stack space as it is allocated to protect
++from stack-clash style attacks.
++
+ fstack-limit
+ Common Var(common_deferred_options) Defer
+
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index f7a15ca190e..313a6c5ff76 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -9406,6 +9406,21 @@ compilation for profile feedback and one for compilation without. The value
+ for compilation with profile feedback needs to be more conservative (higher) in
+ order to make tracer effective.
+
++@item stack-clash-protection-guard-size
++Specify the size of the operating system provided stack guard as
++2 raised to @var{num} bytes. The default value is 12 (4096 bytes).
++Acceptable values are between 12 and 30. Higher values may reduce the
++number of explicit probes, but a value larger than the operating system
++provided guard will leave code vulnerable to stack clash style attacks.
++
++@item stack-clash-protection-probe-interval
++Stack clash protection involves probing stack space as it is allocated. This
++param controls the maximum distance between probes into the stack as 2 raised
++to @var{num} bytes. Acceptable values are between 10 and 16 and defaults to
++12. Higher values may reduce the number of explicit probes, but a value
++larger than the operating system provided guard will leave code vulnerable to
++stack clash style attacks.
++
+ @item max-cse-path-length
+
+ The maximum number of basic blocks on path that CSE considers.
+@@ -20949,7 +20964,8 @@ target support in the compiler but comes with the following drawbacks:
+ @enumerate
+ @item
+ Modified allocation strategy for large objects: they are always
+-allocated dynamically if their size exceeds a fixed threshold.
++allocated dynamically if their size exceeds a fixed threshold. Note this
++may change the semantics of some code.
+
+ @item
+ Fixed limit on the size of the static frame of functions: when it is
+@@ -20964,6 +20980,27 @@ generic implementation, code performance is hampered.
+ Note that old-style stack checking is also the fallback method for
+ @code{specific} if no target support has been added in the compiler.
+
++@samp{-fstack-check=} is designed for Ada's needs to detect infinite recursion
++and stack overflows. @samp{specific} is an excellent choice when compiling
++Ada code. It is not generally sufficient to protect against stack-clash
++attacks. To protect against those you want @samp{-fstack-clash-protection}.
++
++@item -fstack-clash-protection
++@opindex fstack-clash-protection
++Generate code to prevent stack clash style attacks. When this option is
++enabled, the compiler will only allocate one page of stack space at a time
++and each page is accessed immediately after allocation. Thus, it prevents
++allocations from jumping over any stack guard page provided by the
++operating system.
++
++Most targets do not fully support stack clash protection. However, on
++those targets @option{-fstack-clash-protection} will protect dynamic stack
++allocations. @option{-fstack-clash-protection} may also provide limited
++protection for static stack allocations if the target supports
++@option{-fstack-check=specific}.
++
++
++
+ @item -fstack-limit-register=@var{reg}
+ @itemx -fstack-limit-symbol=@var{sym}
+ @itemx -fno-stack-limit
+diff --git a/gcc/flag-types.h b/gcc/flag-types.h
+index 4fc5d33348e..21e943d38fa 100644
+--- a/gcc/flag-types.h
++++ b/gcc/flag-types.h
+@@ -139,7 +139,14 @@ enum excess_precision
+ EXCESS_PRECISION_STANDARD
+ };
+
+-/* Type of stack check. */
++/* Type of stack check.
++
++ Stack checking is designed to detect infinite recursion and stack
++ overflows for Ada programs. Furthermore stack checking tries to ensure
++ in that scenario that enough stack space is left to run a signal handler.
++
++ -fstack-check= does not prevent stack-clash style attacks. For that
++ you want -fstack-clash-protection. */
+ enum stack_check_type
+ {
+ /* Do not check the stack. */
+diff --git a/gcc/params.def b/gcc/params.def
+index e51b847a7c4..e668624b0cb 100644
+--- a/gcc/params.def
++++ b/gcc/params.def
+@@ -208,6 +208,16 @@ DEFPARAM(PARAM_STACK_FRAME_GROWTH,
+ "Maximal stack frame growth due to inlining (in percent)",
+ 1000, 0, 0)
+
++DEFPARAM(PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE,
++ "stack-clash-protection-guard-size",
++ "Size of the stack guard expressed as a power of two.",
++ 12, 12, 30)
++
++DEFPARAM(PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL,
++ "stack-clash-protection-probe-interval",
++ "Interval in which to probe the stack expressed as a power of two.",
++ 12, 10, 16)
++
+ /* The GCSE optimization will be disabled if it would require
+ significantly more memory than this value. */
+ DEFPARAM(PARAM_MAX_GCSE_MEMORY,
+diff --git a/gcc/testsuite/gcc.dg/stack-check-2.c b/gcc/testsuite/gcc.dg/stack-check-2.c
+new file mode 100644
+index 00000000000..196c4bbfbdd
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/stack-check-2.c
+@@ -0,0 +1,66 @@
++/* The goal here is to ensure that we never consider a call to a noreturn
++ function as a potential tail call.
++
++ Right now GCC discovers potential tail calls by looking at the
++ predecessors of the exit block. A call to a non-return function
++ has no successors and thus can never match that first filter.
++
++ But that could change one day and we want to catch it. The problem
++ is the compiler could potentially optimize a tail call to a nonreturn
++ function, even if the caller has a frame. That breaks the assumption
++ that calls probe *sp when saving the return address that some targets
++ depend on to elide stack probes. */
++
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection -fdump-tree-tailc -fdump-tree-optimized" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++extern void foo (void) __attribute__ ((__noreturn__));
++
++
++void
++test_direct_1 (void)
++{
++ foo ();
++}
++
++void
++test_direct_2 (void)
++{
++ return foo ();
++}
++
++void (*indirect)(void)__attribute__ ((noreturn));
++
++
++void
++test_indirect_1 ()
++{
++ (*indirect)();
++}
++
++void
++test_indirect_2 (void)
++{
++ return (*indirect)();;
++}
++
++
++typedef void (*pvfn)() __attribute__ ((noreturn));
++
++void (*indirect_casted)(void);
++
++void
++test_indirect_casted_1 ()
++{
++ (*(pvfn)indirect_casted)();
++}
++
++void
++test_indirect_casted_2 (void)
++{
++ return (*(pvfn)indirect_casted)();
++}
++/* { dg-final { scan-tree-dump-not "tail call" "tailc" } } */
++/* { dg-final { scan-tree-dump-not "tail call" "optimized" } } */
++
+diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
+index ef371ad7efd..821cea9cb33 100644
+--- a/gcc/testsuite/lib/target-supports.exp
++++ b/gcc/testsuite/lib/target-supports.exp
+@@ -5392,3 +5392,95 @@ proc check_effective_target_fenv_exceptions {} {
+ }
+ } "-std=gnu99"]
+ }
++
++# Return 1 if the target supports the auto_inc_dec optimization pass.
++proc check_effective_target_autoincdec { } {
++ if { ![check_no_compiler_messages auto_incdec assembly { void f () { }
++ } "-O2 -fdump-rtl-auto_inc_dec" ] } {
++ return 0
++ }
++
++ set dumpfile [glob -nocomplain "auto_incdec[pid].c.\[0-9\]\[0-9\]\[0-9\]r.auto_inc_dec"]
++ if { [file exists $dumpfile ] } {
++ file delete $dumpfile
++ return 1
++ }
++ return 0
++}
++
++# Return 1 if the target has support for stack probing designed
++# to avoid stack-clash style attacks.
++#
++# This is used to restrict the stack-clash mitigation tests to
++# just those targets that have been explicitly supported.
++#
++# In addition to the prologue work on those targets, each target's
++# properties should be described in the functions below so that
++# tests do not become a mess of unreadable target conditions.
++#
++proc check_effective_target_supports_stack_clash_protection { } {
++
++ # Temporary until the target bits are fully ACK'd.
++# if { [istarget aarch*-*-*] || [istarget x86_64-*-*]
++# || [istarget i?86-*-*] || [istarget s390*-*-*]
++# || [istarget powerpc*-*-*] || [istarget rs6000*-*-*] } {
++# return 1
++# }
++ return 0
++}
++
++# Return 1 if the target creates a frame pointer for non-leaf functions
++# Note we ignore cases where we apply tail call optimization here.
++proc check_effective_target_frame_pointer_for_non_leaf { } {
++ if { [istarget aarch*-*-*] } {
++ return 1
++ }
++ return 0
++}
++
++# Return 1 if the target's calling sequence or its ABI
++# create implicit stack probes at or prior to function entry.
++proc check_effective_target_caller_implicit_probes { } {
++
++ # On x86/x86_64 the call instruction itself pushes the return
++ # address onto the stack. That is an implicit probe of *sp.
++ if { [istarget x86_64-*-*] || [istarget i?86-*-*] } {
++ return 1
++ }
++
++ # On PPC, the ABI mandates that the address of the outer
++ # frame be stored at *sp. Thus each allocation of stack
++ # space is itself an implicit probe of *sp.
++ if { [istarget powerpc*-*-*] || [istarget rs6000*-*-*] } {
++ return 1
++ }
++
++ # s390's ABI has a register save area allocated by the
++ # caller for use by the callee. The mere existence does
++ # not constitute a probe by the caller, but when the slots
++ # used by the callee those stores are implicit probes.
++ if { [istarget s390*-*-*] } {
++ return 1
++ }
++
++ # Not strictly true on aarch64, but we have agreed that we will
++ # consider any function that pushes SP more than 3kbytes into
++ # the guard page as broken. This essentially means that we can
++ # consider the aarch64 as having a caller implicit probe at
++ # *(sp + 1k).
++ if { [istarget aarch64*-*-*] } {
++ return 1;
++ }
++
++ return 0
++}
++
++# Targets that potentially realign the stack pointer often cause residual
++# stack allocations and make it difficult to elimination loops or residual
++# allocations for dynamic stack allocations
++proc check_effective_target_callee_realigns_stack { } {
++ if { [istarget x86_64-*-*] || [istarget i?86-*-*] } {
++ return 1
++ }
++ return 0
++}
+diff --git a/gcc/toplev.c b/gcc/toplev.c
+index 26f2ffb362c..1def163f8b9 100644
+--- a/gcc/toplev.c
++++ b/gcc/toplev.c
+@@ -1520,6 +1520,28 @@ process_options (void)
+ flag_associative_math = 0;
+ }
+
++#ifndef STACK_GROWS_DOWNWARD
++ /* -fstack-clash-protection is not currently supported on targets
++ where the stack grows up. */
++ if (flag_stack_clash_protection)
++ {
++ warning_at (UNKNOWN_LOCATION, 0,
++ "%<-fstack-clash-protection%> is not supported on targets "
++ "where the stack grows from lower to higher addresses");
++ flag_stack_clash_protection = 0;
++ }
++#endif
++
++ /* We can not support -fstack-check= and -fstack-clash-protection at
++ the same time. */
++ if (flag_stack_check != NO_STACK_CHECK && flag_stack_clash_protection)
++ {
++ warning_at (UNKNOWN_LOCATION, 0,
++ "%<-fstack-check=%> and %<-fstack-clash_protection%> are "
++ "mutually exclusive. Disabling %<-fstack-check=%>");
++ flag_stack_check = NO_STACK_CHECK;
++ }
++
+ /* With -fcx-limited-range, we do cheap and quick complex arithmetic. */
+ if (flag_cx_limited_range)
+ flag_complex_method = 0;
diff --git a/SOURCES/gcc48-rh1469697-20.patch b/SOURCES/gcc48-rh1469697-20.patch
new file mode 100644
index 0000000..ad82c9b
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-20.patch
@@ -0,0 +1,37 @@
+
+ * explow.c (anti_adjust_stack_and_probe_stack_clash): Avoid probing
+ the red zone for stack_clash_protection_final_dynamic_probe targets
+ when the total dynamic stack size is zero bytes.
+
+diff -Nrup a/gcc/explow.c b/gcc/explow.c
+--- a/gcc/explow.c 2017-11-14 23:33:15.403557607 -0700
++++ b/gcc/explow.c 2017-11-14 23:33:56.243239120 -0700
+@@ -1934,6 +1934,13 @@ anti_adjust_stack_and_probe_stack_clash
+ if (size != CONST0_RTX (Pmode)
+ && targetm.stack_clash_protection_final_dynamic_probe (residual))
+ {
++ /* SIZE could be zero at runtime and in that case *sp could hold
++ live data. Furthermore, we don't want to probe into the red
++ zone.
++
++ Go ahead and just guard a probe at *sp on SIZE != 0 at runtime
++ if SIZE is not a compile time constant. */
++
+ /* Ideally we would just probe at *sp. However, if SIZE is not
+ a compile-time constant, but is zero at runtime, then *sp
+ might hold live data. So probe at *sp if we know that
+@@ -1946,9 +1953,12 @@ anti_adjust_stack_and_probe_stack_clash
+ }
+ else
+ {
+- emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx,
+- -GET_MODE_SIZE (word_mode)));
++ rtx label = gen_label_rtx ();
++ emit_cmp_and_jump_insns (size, CONST0_RTX (GET_MODE (size)),
++ EQ, NULL_RTX, Pmode, 1, label);
++ emit_stack_probe (stack_pointer_rtx);
+ emit_insn (gen_blockage ());
++ emit_label (label);
+ }
+ }
+ }
diff --git a/SOURCES/gcc48-rh1469697-21.patch b/SOURCES/gcc48-rh1469697-21.patch
new file mode 100644
index 0000000..0c694cc
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-21.patch
@@ -0,0 +1,144 @@
+ PR middle-end/83654
+ * explow.c (anti_adjust_stack_and_probe_stack_clash): Test a
+ non-constant residual for zero at runtime and avoid probing in
+ that case. Reorganize code for trailing problem to mirror handling
+ of the residual.
+
+ PR middle-end/83654
+ * gcc.target/i386/stack-check-18.c: New test.
+ * gcc.target/i386/stack-check-19.c: New test.
+
+diff --git a/gcc/explow.c b/gcc/explow.c
+index b6c56602152..042e71904ec 100644
+--- a/gcc/explow.c
++++ b/gcc/explow.c
+@@ -1997,11 +1997,27 @@ anti_adjust_stack_and_probe_stack_clash (rtx size)
+
+ if (residual != CONST0_RTX (Pmode))
+ {
++ rtx label = NULL_RTX;
++ /* RESIDUAL could be zero at runtime and in that case *sp could
++ hold live data. Furthermore, we do not want to probe into the
++ red zone.
++
++ Go ahead and just guard the probe at *sp on RESIDUAL != 0 at
++ runtime if RESIDUAL is not a compile time constant. */
++ if (!CONST_INT_P (residual))
++ {
++ label = gen_label_rtx ();
++ emit_cmp_and_jump_insns (residual, CONST0_RTX (GET_MODE (residual)),
++ EQ, NULL_RTX, Pmode, 1, label);
++ }
++
+ rtx x = force_reg (Pmode, plus_constant (Pmode, residual,
+ -GET_MODE_SIZE (word_mode)));
+ anti_adjust_stack (residual);
+ emit_stack_probe (gen_rtx_PLUS (Pmode, stack_pointer_rtx, x));
+ emit_insn (gen_blockage ());
++ if (!CONST_INT_P (residual))
++ emit_label (label);
+ }
+
+ /* Some targets make optimistic assumptions in their prologues about
+@@ -2014,28 +2030,20 @@ anti_adjust_stack_and_probe_stack_clash (rtx size)
+ live data. Furthermore, we don't want to probe into the red
+ zone.
+
+- Go ahead and just guard a probe at *sp on SIZE != 0 at runtime
++ Go ahead and just guard the probe at *sp on SIZE != 0 at runtime
+ if SIZE is not a compile time constant. */
+-
+- /* Ideally we would just probe at *sp. However, if SIZE is not
+- a compile-time constant, but is zero at runtime, then *sp
+- might hold live data. So probe at *sp if we know that
+- an allocation was made, otherwise probe into the red zone
+- which is obviously undesirable. */
+- if (CONST_INT_P (size))
+- {
+- emit_stack_probe (stack_pointer_rtx);
+- emit_insn (gen_blockage ());
+- }
+- else
++ rtx label = NULL_RTX;
++ if (!CONST_INT_P (size))
+ {
+- rtx label = gen_label_rtx ();
++ label = gen_label_rtx ();
+ emit_cmp_and_jump_insns (size, CONST0_RTX (GET_MODE (size)),
+ EQ, NULL_RTX, Pmode, 1, label);
+- emit_stack_probe (stack_pointer_rtx);
+- emit_insn (gen_blockage ());
+- emit_label (label);
+ }
++
++ emit_stack_probe (stack_pointer_rtx);
++ emit_insn (gen_blockage ());
++ if (!CONST_INT_P (size))
++ emit_label (label);
+ }
+ }
+
+diff --git a/gcc/testsuite/gcc.target/i386/stack-check-18.c b/gcc/testsuite/gcc.target/i386/stack-check-18.c
+new file mode 100644
+index 00000000000..6dbff4402da
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/stack-check-18.c
+@@ -0,0 +1,23 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection -mtune=generic -fdump-rtl-expand" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++int f1 (char *);
++
++int
++f2 (void)
++{
++ const int size = 4096;
++ char buffer[size];
++ return f1 (buffer);
++}
++
++/* So we want to verify that at expand time that we probed the main
++ VLA allocation as well as the residuals. Then we want to verify
++ there was only one probe in the final assembly (implying the
++ residual probe was optimized away). */
++/* { dg-final { scan-rtl-dump-times "allocation and probing in loop" 1 "expand" } } */
++/* { dg-final { scan-rtl-dump-times "allocation and probing residuals" 1 "expand" } } */
++
++/* { dg-final { scan-assembler-times "or\[ql\]" 1 } } */
++
+diff --git a/gcc/testsuite/gcc.target/i386/stack-check-19.c b/gcc/testsuite/gcc.target/i386/stack-check-19.c
+new file mode 100644
+index 00000000000..b92c126d57f
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/stack-check-19.c
+@@ -0,0 +1,29 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection -mtune=generic -fdump-rtl-expand" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++int f1 (char *);
++
++int
++f2 (const int size)
++{
++ char buffer[size];
++ return f1 (buffer);
++}
++
++/* So we want to verify that at expand time that we probed the main
++ VLA allocation as well as the residuals. Then we want to verify
++ there are two probes in the final assembly code. */
++/* { dg-final { scan-rtl-dump-times "allocation and probing in loop" 1 "expand" } } */
++/* { dg-final { scan-rtl-dump-times "allocation and probing residuals" 1 "expand" } } */
++/* { dg-final { scan-assembler-times "or\[ql\]" 2 } } */
++
++/* We also want to verify (indirectly) that the residual probe is
++ guarded. We do that by checking the number of conditional
++ branches. There should be 3. One that bypasses the probe loop, one
++ in the probe loop and one that bypasses the residual probe.
++
++ These will all be equality tests. */
++/* { dg-final { scan-assembler-times "(\?:je|jne)" 3 } } */
++
++
diff --git a/SOURCES/gcc48-rh1469697-22.patch b/SOURCES/gcc48-rh1469697-22.patch
new file mode 100644
index 0000000..ee75edb
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-22.patch
@@ -0,0 +1,118 @@
+diff -Nrup a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+--- a/gcc/config/i386/i386.c 2018-01-03 16:10:46.278171086 -0700
++++ b/gcc/config/i386/i386.c 2018-01-03 16:12:32.022220166 -0700
+@@ -9862,14 +9862,13 @@ static void
+ ix86_adjust_stack_and_probe_stack_clash (const HOST_WIDE_INT size)
+ {
+ struct machine_function *m = cfun->machine;
++ struct ix86_frame frame;
++ ix86_compute_frame_layout (&frame);
+
+ /* If this function does not statically allocate stack space, then
+ no probes are needed. */
+ if (!size)
+ {
+- struct ix86_frame frame;
+- ix86_compute_frame_layout (&frame);
+-
+ /* However, the allocation of space via pushes for register
+ saves could be viewed as allocating space, but without the
+ need to probe. */
+@@ -9888,21 +9887,40 @@ ix86_adjust_stack_and_probe_stack_clash
+ pointer could be anywhere in the guard page. The safe thing
+ to do is emit a probe now.
+
++ The probe can be avoided if we have already emitted any callee
++ register saves into the stack or have a frame pointer (which will
++ have been saved as well). Those saves will function as implicit
++ probes.
++
+ ?!? This should be revamped to work like aarch64 and s390 where
+ we track the offset from the most recent probe. Normally that
+ offset would be zero. For a non-return function we would reset
+ it to PROBE_INTERVAL - (STACK_BOUNDARY / BITS_PER_UNIT). Then
+ we just probe when we cross PROBE_INTERVAL. */
+- if (TREE_THIS_VOLATILE (cfun->decl))
++ if (TREE_THIS_VOLATILE (cfun->decl)
++ && !(frame.nregs || frame.nsseregs || frame_pointer_needed))
++
+ {
+ /* We can safely use any register here since we're just going to push
+ its value and immediately pop it back. But we do try and avoid
+ argument passing registers so as not to introduce dependencies in
+ the pipeline. For 32 bit we use %esi and for 64 bit we use %rax. */
+ rtx dummy_reg = gen_rtx_REG (word_mode, TARGET_64BIT ? AX_REG : SI_REG);
+- rtx insn = emit_insn (gen_push (dummy_reg));
+- RTX_FRAME_RELATED_P (insn) = 1;
+- ix86_emit_restore_reg_using_pop (dummy_reg);
++ rtx insn_push = emit_insn (gen_push (dummy_reg));
++ rtx insn_pop = emit_insn (gen_pop (dummy_reg));
++ m->fs.sp_offset -= UNITS_PER_WORD;
++ if (m->fs.cfa_reg == stack_pointer_rtx)
++ {
++ m->fs.cfa_offset -= UNITS_PER_WORD;
++ rtx x = plus_constant (Pmode, stack_pointer_rtx, -UNITS_PER_WORD);
++ x = gen_rtx_SET (VOIDmode, stack_pointer_rtx, x);
++ add_reg_note (insn_push, REG_CFA_ADJUST_CFA, x);
++ RTX_FRAME_RELATED_P (insn_push) = 1;
++ x = plus_constant (Pmode, stack_pointer_rtx, UNITS_PER_WORD);
++ x = gen_rtx_SET (VOIDmode, stack_pointer_rtx, x);
++ add_reg_note (insn_pop, REG_CFA_ADJUST_CFA, x);
++ RTX_FRAME_RELATED_P (insn_pop) = 1;
++ }
+ emit_insn (gen_blockage ());
+ }
+
+
+diff -Nrup a/gcc-4.8.5-20150702/gcc/testsuite/gcc.target/i386/stack-check-12.c b/gcc-4.8.5-20150702/gcc/testsuite/gcc.target/i386/stack-check-12.c
+--- gcc-4.8.5-20150702/gcc/testsuite/gcc.target/i386/stack-check-12.c 2018-01-03 15:42:40.849530670 -0700
++++ gcc-4.8.5-20150702/gcc/testsuite/gcc.target/i386/stack-check-12.c 2018-01-03 15:36:12.528488596 -0700
+@@ -7,7 +7,6 @@ __attribute__ ((noreturn)) void exit (in
+ __attribute__ ((noreturn)) void
+ f (void)
+ {
+- asm volatile ("nop" ::: "edi");
+ exit (1);
+ }
+
+diff -Nrup a/gcc-4.8.5-20150702/gcc/testsuite/gcc.target/i386/stack-check-17.c b/gcc-4.8.5-20150702/gcc/testsuite/gcc.target/i386/stack-check-17.c
+--- gcc-4.8.5-20150702/gcc/testsuite/gcc.target/i386/stack-check-17.c 1969-12-31 17:00:00.000000000 -0700
++++ gcc-4.8.5-20150702/gcc/testsuite/gcc.target/i386/stack-check-17.c 2018-01-03 15:36:12.528488596 -0700
+@@ -0,0 +1,37 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection -mtune=generic -fomit-frame-pointer" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++
++int x0, x1;
++void f1 (void);
++void f2 (int, int);
++
++__attribute__ ((noreturn))
++void
++f3 (void)
++{
++ int y0 = x0;
++ int y1 = x1;
++ f1 ();
++ f2 (y0, y1);
++ while (1);
++}
++
++/* Verify no explicit probes. */
++/* { dg-final { scan-assembler-not "or\[ql\]" } } */
++
++/* We also want to verify we did not use a push/pop sequence
++ to probe *sp as the callee register saves are sufficient
++ to probe *sp.
++
++ y0/y1 are live across the call and thus must be allocated
++ into either a stack slot or callee saved register. The former
++ would be rather dumb. So assume it does not happen.
++
++ So search for two/four pushes for the callee register saves/argument
++ pushes and no pops (since the function has no reachable epilogue). */
++/* { dg-final { scan-assembler-times "push\[ql\]" 2 { target { ! ia32 } } } } */
++/* { dg-final { scan-assembler-times "push\[ql\]" 4 { target { ia32 } } } } */
++/* { dg-final { scan-assembler-not "pop" } } */
++
diff --git a/SOURCES/gcc48-rh1469697-23.patch b/SOURCES/gcc48-rh1469697-23.patch
new file mode 100644
index 0000000..3b69367
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-23.patch
@@ -0,0 +1,52 @@
+diff --git a/gcc/testsuite/gcc.target/i386/stack-check-17.c b/gcc/testsuite/gcc.target/i386/stack-check-17.c
+index d2ef83b..dcd2930 100644
+--- a/gcc/testsuite/gcc.target/i386/stack-check-17.c
++++ b/gcc/testsuite/gcc.target/i386/stack-check-17.c
+@@ -29,9 +29,11 @@ f3 (void)
+ into either a stack slot or callee saved register. The former
+ would be rather dumb. So assume it does not happen.
+
+- So search for two/four pushes for the callee register saves/argument
+- pushes and no pops (since the function has no reachable epilogue). */
+-/* { dg-final { scan-assembler-times "push\[ql\]" 2 { target { ! ia32 } } } } */
+-/* { dg-final { scan-assembler-times "push\[ql\]" 4 { target { ia32 } } } } */
++ So search for two pushes for the callee register saves pushes
++ and no pops (since the function has no reachable epilogue).
++
++ This is slightly different than upstream because the code we
++ generate for argument setup is slightly different. */
++/* { dg-final { scan-assembler-times "push\[ql\]" 2 } } */
+ /* { dg-final { scan-assembler-not "pop" } } */
+
+diff --git a/gcc/testsuite/gcc.target/i386/stack-check-18.c b/gcc/testsuite/gcc.target/i386/stack-check-18.c
+index 6dbff44..1638f77 100644
+--- a/gcc/testsuite/gcc.target/i386/stack-check-18.c
++++ b/gcc/testsuite/gcc.target/i386/stack-check-18.c
+@@ -1,6 +1,7 @@
+ /* { dg-do compile } */
+ /* { dg-options "-O2 -fstack-clash-protection -mtune=generic -fdump-rtl-expand" } */
+ /* { dg-require-effective-target supports_stack_clash_protection } */
++/* { dg-skip-if "" { *-*-* } { "-fstack-protector" } { "" } } */
+
+ int f1 (char *);
+
+diff --git a/gcc/testsuite/gcc.target/i386/stack-check-19.c b/gcc/testsuite/gcc.target/i386/stack-check-19.c
+index b92c126..c341801 100644
+--- a/gcc/testsuite/gcc.target/i386/stack-check-19.c
++++ b/gcc/testsuite/gcc.target/i386/stack-check-19.c
+@@ -1,6 +1,7 @@
+ /* { dg-do compile } */
+ /* { dg-options "-O2 -fstack-clash-protection -mtune=generic -fdump-rtl-expand" } */
+ /* { dg-require-effective-target supports_stack_clash_protection } */
++/* { dg-skip-if "" { *-*-* } { "-fstack-protector" } { "" } } */
+
+ int f1 (char *);
+
+@@ -24,6 +25,6 @@ f2 (const int size)
+ in the probe loop and one that bypasses the residual probe.
+
+ These will all be equality tests. */
+-/* { dg-final { scan-assembler-times "(\?:je|jne)" 3 } } */
++/* { dg-final { scan-assembler-times "(\?:jmp|je|jne)" 3 } } */
+
+
diff --git a/SOURCES/gcc48-rh1469697-3.patch b/SOURCES/gcc48-rh1469697-3.patch
new file mode 100644
index 0000000..6dbf24b
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-3.patch
@@ -0,0 +1,600 @@
+commit a3e2ba88eb09c1eed2f7ed6e17660b345464bb90
+Author: law
+Date: Wed Sep 20 05:05:12 2017 +0000
+
+ 2017-09-18 Jeff Law
+
+ * explow.c: Include "params.h" and "dumpfile.h".
+ (anti_adjust_stack_and_probe_stack_clash): New function.
+ (get_stack_check_protect): Likewise.
+ (compute_stack_clash_protection_loop_data): Likewise.
+ (emit_stack_clash_protection_loop_start): Likewise.
+ (emit_stack_clash_protection_loop_end): Likewise.
+ (allocate_dynamic_stack_space): Use get_stack_check_protect.
+ Use anti_adjust_stack_and_probe_stack_clash.
+ * explow.h (compute_stack_clash_protection_loop_data): Prototype.
+ (emit_stack_clash_protection_loop_start): Likewise.
+ (emit_stack_clash_protection_loop_end): Likewise.
+ * rtl.h (get_stack_check_protect): Prototype.
+ * target.def (stack_clash_protection_final_dynamic_probe): New hook.
+ * targhooks.c (default_stack_clash_protection_final_dynamic_probe): New.
+ * targhooks.h (default_stack_clash_protection_final_dynamic_probe):
+ Prototype.
+ * doc/tm.texi.in (TARGET_STACK_CLASH_PROTECTION_FINAL_DYNAMIC_PROBE):
+ Add @hook.
+ * doc/tm.texi: Rebuilt.
+ * config/alpha/alpha.c (alpha_expand_prologue): Likewise.
+ * config/i386/i386.c (ix86_expand_prologue): Likewise.
+ * config/ia64/ia64.c (ia64_expand_prologue): Likewise.
+ * config/mips/mips.c (mips_expand_prologue): Likewise.
+ * config/rs6000/rs6000.c (rs6000_emit_prologue): Likewise.
+ * config/sparc/sparc.c (sparc_expand_prologue): Likewise.
+ (sparc_flat_expand_prologue): Likewise.
+
+ * gcc.dg/stack-check-3.c: New test.
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@252995 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
+index 2874b8454a9..5402f5213d6 100644
+--- a/gcc/config/alpha/alpha.c
++++ b/gcc/config/alpha/alpha.c
+@@ -7625,7 +7625,7 @@ alpha_expand_prologue (void)
+
+ probed_size = frame_size;
+ if (flag_stack_check)
+- probed_size += STACK_CHECK_PROTECT;
++ probed_size += get_stack_check_protect ();
+
+ if (probed_size <= 32768)
+ {
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index e36726ba722..d996fd160e8 100644
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
+@@ -10544,12 +10544,12 @@ ix86_expand_prologue (void)
+ HOST_WIDE_INT size = allocate;
+
+ if (TARGET_64BIT && size >= (HOST_WIDE_INT) 0x80000000)
+- size = 0x80000000 - STACK_CHECK_PROTECT - 1;
++ size = 0x80000000 - get_stack_check_protect () - 1;
+
+ if (TARGET_STACK_PROBE)
+- ix86_emit_probe_stack_range (0, size + STACK_CHECK_PROTECT);
++ ix86_emit_probe_stack_range (0, size + get_stack_check_protect ());
+ else
+- ix86_emit_probe_stack_range (STACK_CHECK_PROTECT, size);
++ ix86_emit_probe_stack_range (get_stack_check_protect (), size);
+ }
+ }
+
+diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
+index 50bbad6661c..390983936e8 100644
+--- a/gcc/config/ia64/ia64.c
++++ b/gcc/config/ia64/ia64.c
+@@ -3435,7 +3435,7 @@ ia64_expand_prologue (void)
+ current_function_static_stack_size = current_frame_info.total_size;
+
+ if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK)
+- ia64_emit_probe_stack_range (STACK_CHECK_PROTECT,
++ ia64_emit_probe_stack_range (get_stack_check_protect (),
+ current_frame_info.total_size,
+ current_frame_info.n_input_regs
+ + current_frame_info.n_local_regs);
+diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
+index 41c5d6b6b1f..9b7eb678f19 100644
+--- a/gcc/config/mips/mips.c
++++ b/gcc/config/mips/mips.c
+@@ -10746,7 +10746,7 @@ mips_expand_prologue (void)
+ current_function_static_stack_size = size;
+
+ if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK && size)
+- mips_emit_probe_stack_range (STACK_CHECK_PROTECT, size);
++ mips_emit_probe_stack_range (get_stack_check_protect (), size);
+
+ /* Save the registers. Allocate up to MIPS_MAX_FIRST_STACK_STEP
+ bytes beforehand; this is enough to cover the register save area
+diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
+index 15583055895..a9052c6becf 100644
+--- a/gcc/config/rs6000/rs6000.c
++++ b/gcc/config/rs6000/rs6000.c
+@@ -23214,7 +23214,8 @@ rs6000_emit_prologue (void)
+ current_function_static_stack_size = info->total_size;
+
+ if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK && info->total_size)
+- rs6000_emit_probe_stack_range (STACK_CHECK_PROTECT, info->total_size);
++ rs6000_emit_probe_stack_range (get_stack_check_protect (),
++ info->total_size);
+
+ if (TARGET_FIX_AND_CONTINUE)
+ {
+diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
+index e5d326cdf23..e5e93c80261 100644
+--- a/gcc/config/sparc/sparc.c
++++ b/gcc/config/sparc/sparc.c
+@@ -5431,7 +5431,7 @@ sparc_expand_prologue (void)
+ current_function_static_stack_size = size;
+
+ if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK && size)
+- sparc_emit_probe_stack_range (STACK_CHECK_PROTECT, size);
++ sparc_emit_probe_stack_range (get_stack_check_protect (), size);
+
+ if (size == 0)
+ ; /* do nothing. */
+@@ -5533,7 +5533,7 @@ sparc_flat_expand_prologue (void)
+ current_function_static_stack_size = size;
+
+ if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK && size)
+- sparc_emit_probe_stack_range (STACK_CHECK_PROTECT, size);
++ sparc_emit_probe_stack_range (get_stack_check_protect (), size);
+
+ if (sparc_save_local_in_regs_p)
+ emit_save_or_restore_local_in_regs (stack_pointer_rtx, SPARC_STACK_BIAS,
+diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
+index 6b18a2724bc..eeef757bf5b 100644
+--- a/gcc/doc/tm.texi
++++ b/gcc/doc/tm.texi
+@@ -3571,6 +3571,10 @@ GCC computed the default from the values of the above macros and you will
+ normally not need to override that default.
+ @end defmac
+
++@deftypefn {Target Hook} bool TARGET_STACK_CLASH_PROTECTION_FINAL_DYNAMIC_PROBE (rtx @var{residual})
++Some targets make optimistic assumptions about the state of stack probing when they emit their prologues. On such targets a probe into the end of any dynamically allocated space is likely required for safety against stack clash style attacks. Define this variable to return nonzero if such a probe is required or zero otherwise. You need not define this macro if it would always have the value zero.
++@end deftypefn
++
+ @need 2000
+ @node Frame Registers
+ @subsection Registers That Address the Stack Frame
+diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
+index 7d0b3c73b2f..6707ca87236 100644
+--- a/gcc/doc/tm.texi.in
++++ b/gcc/doc/tm.texi.in
+@@ -3539,6 +3539,8 @@ GCC computed the default from the values of the above macros and you will
+ normally not need to override that default.
+ @end defmac
+
++@hook TARGET_STACK_CLASH_PROTECTION_FINAL_DYNAMIC_PROBE
++
+ @need 2000
+ @node Frame Registers
+ @subsection Registers That Address the Stack Frame
+diff --git a/gcc/explow.c b/gcc/explow.c
+index 7da8bc75f19..2526e8513b7 100644
+--- a/gcc/explow.c
++++ b/gcc/explow.c
+@@ -40,8 +40,11 @@ along with GCC; see the file COPYING3. If not see
+ #include "target.h"
+ #include "common/common-target.h"
+ #include "output.h"
++#include "params.h"
++#include "dumpfile.h"
+
+ static rtx break_out_memory_refs (rtx);
++static void anti_adjust_stack_and_probe_stack_clash (rtx);
+
+
+ /* Truncate and perhaps sign-extend C as appropriate for MODE. */
+@@ -1140,6 +1143,29 @@ update_nonlocal_goto_save_area (void)
+ emit_stack_save (SAVE_NONLOCAL, &r_save);
+ }
+
++/* Return the number of bytes to "protect" on the stack for -fstack-check.
++
++ "protect" in the context of -fstack-check means how many bytes we
++ should always ensure are available on the stack. More importantly
++ this is how many bytes are skipped when probing the stack.
++
++ On some targets we want to reuse the -fstack-check prologue support
++ to give a degree of protection against stack clashing style attacks.
++
++ In that scenario we do not want to skip bytes before probing as that
++ would render the stack clash protections useless.
++
++ So we never use STACK_CHECK_PROTECT directly. Instead we indirect though
++ this helper which allows us to provide different values for
++ -fstack-check and -fstack-clash-protection. */
++HOST_WIDE_INT
++get_stack_check_protect (void)
++{
++ if (flag_stack_clash_protection)
++ return 0;
++ return STACK_CHECK_PROTECT;
++}
++
+ /* Return an rtx representing the address of an area of memory dynamically
+ pushed on the stack.
+
+@@ -1393,7 +1419,7 @@ allocate_dynamic_stack_space (rtx size, unsigned size_align,
+ probe_stack_range (STACK_OLD_CHECK_PROTECT + STACK_CHECK_MAX_FRAME_SIZE,
+ size);
+ else if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK)
+- probe_stack_range (STACK_CHECK_PROTECT, size);
++ probe_stack_range (get_stack_check_protect (), size);
+
+ /* Don't let anti_adjust_stack emit notes. */
+ suppress_reg_args_size = true;
+@@ -1451,6 +1477,8 @@ allocate_dynamic_stack_space (rtx size, unsigned size_align,
+
+ if (flag_stack_check && STACK_CHECK_MOVING_SP)
+ anti_adjust_stack_and_probe (size, false);
++ else if (flag_stack_clash_protection)
++ anti_adjust_stack_and_probe_stack_clash (size);
+ else
+ anti_adjust_stack (size);
+
+@@ -1712,6 +1740,219 @@ probe_stack_range (HOST_WIDE_INT first, rtx size)
+ }
+ }
+
++/* Compute parameters for stack clash probing a dynamic stack
++ allocation of SIZE bytes.
++
++ We compute ROUNDED_SIZE, LAST_ADDR, RESIDUAL and PROBE_INTERVAL.
++
++ Additionally we conditionally dump the type of probing that will
++ be needed given the values computed. */
++
++void
++compute_stack_clash_protection_loop_data (rtx *rounded_size, rtx *last_addr,
++ rtx *residual,
++ HOST_WIDE_INT *probe_interval,
++ rtx size)
++{
++ /* Round SIZE down to STACK_CLASH_PROTECTION_PROBE_INTERVAL */
++ *probe_interval
++ = 1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL);
++ *rounded_size = simplify_gen_binary (AND, Pmode, size,
++ GEN_INT (-*probe_interval));
++
++ /* Compute the value of the stack pointer for the last iteration.
++ It's just SP + ROUNDED_SIZE. */
++ rtx rounded_size_op = force_operand (*rounded_size, NULL_RTX);
++ *last_addr = force_operand (gen_rtx_fmt_ee (STACK_GROW_OP, Pmode,
++ stack_pointer_rtx,
++ rounded_size_op),
++ NULL_RTX);
++
++ /* Compute any residuals not allocated by the loop above. Residuals
++ are just the ROUNDED_SIZE - SIZE. */
++ *residual = simplify_gen_binary (MINUS, Pmode, size, *rounded_size);
++
++ /* Dump key information to make writing tests easy. */
++ if (dump_file)
++ {
++ if (*rounded_size == CONST0_RTX (Pmode))
++ fprintf (dump_file,
++ "Stack clash skipped dynamic allocation and probing loop.\n");
++ else if (GET_CODE (*rounded_size) == CONST_INT
++ && INTVAL (*rounded_size) <= 4 * *probe_interval)
++ fprintf (dump_file,
++ "Stack clash dynamic allocation and probing inline.\n");
++ else if (GET_CODE (*rounded_size) == CONST_INT)
++ fprintf (dump_file,
++ "Stack clash dynamic allocation and probing in "
++ "rotated loop.\n");
++ else
++ fprintf (dump_file,
++ "Stack clash dynamic allocation and probing in loop.\n");
++
++ if (*residual != CONST0_RTX (Pmode))
++ fprintf (dump_file,
++ "Stack clash dynamic allocation and probing residuals.\n");
++ else
++ fprintf (dump_file,
++ "Stack clash skipped dynamic allocation and "
++ "probing residuals.\n");
++ }
++}
++
++/* Emit the start of an allocate/probe loop for stack
++ clash protection.
++
++ LOOP_LAB and END_LAB are returned for use when we emit the
++ end of the loop.
++
++ LAST addr is the value for SP which stops the loop. */
++void
++emit_stack_clash_protection_probe_loop_start (rtx *loop_lab,
++ rtx *end_lab,
++ rtx last_addr,
++ bool rotated)
++{
++ /* Essentially we want to emit any setup code, the top of loop
++ label and the comparison at the top of the loop. */
++ *loop_lab = gen_label_rtx ();
++ *end_lab = gen_label_rtx ();
++
++ emit_label (*loop_lab);
++ if (!rotated)
++ emit_cmp_and_jump_insns (stack_pointer_rtx, last_addr, EQ, NULL_RTX,
++ Pmode, 1, *end_lab);
++}
++
++/* Emit the end of a stack clash probing loop.
++
++ This consists of just the jump back to LOOP_LAB and
++ emitting END_LOOP after the loop. */
++
++void
++emit_stack_clash_protection_probe_loop_end (rtx loop_lab, rtx end_loop,
++ rtx last_addr, bool rotated)
++{
++ if (rotated)
++ emit_cmp_and_jump_insns (stack_pointer_rtx, last_addr, NE, NULL_RTX,
++ Pmode, 1, loop_lab);
++ else
++ emit_jump (loop_lab);
++
++ emit_label (end_loop);
++
++}
++
++/* Adjust the stack pointer by minus SIZE (an rtx for a number of bytes)
++ while probing it. This pushes when SIZE is positive. SIZE need not
++ be constant.
++
++ This is subtly different than anti_adjust_stack_and_probe to try and
++ prevent stack-clash attacks
++
++ 1. It must assume no knowledge of the probing state, any allocation
++ must probe.
++
++ Consider the case of a 1 byte alloca in a loop. If the sum of the
++ allocations is large, then this could be used to jump the guard if
++ probes were not emitted.
++
++ 2. It never skips probes, whereas anti_adjust_stack_and_probe will
++ skip probes on the first couple PROBE_INTERVALs on the assumption
++ they're done elsewhere.
++
++ 3. It only allocates and probes SIZE bytes, it does not need to
++ allocate/probe beyond that because this probing style does not
++ guarantee signal handling capability if the guard is hit. */
++
++static void
++anti_adjust_stack_and_probe_stack_clash (rtx size)
++{
++ /* First ensure SIZE is Pmode. */
++ if (GET_MODE (size) != VOIDmode && GET_MODE (size) != Pmode)
++ size = convert_to_mode (Pmode, size, 1);
++
++ /* We can get here with a constant size on some targets. */
++ rtx rounded_size, last_addr, residual;
++ HOST_WIDE_INT probe_interval;
++ compute_stack_clash_protection_loop_data (&rounded_size, &last_addr,
++ &residual, &probe_interval, size);
++
++ if (rounded_size != CONST0_RTX (Pmode))
++ {
++ if (INTVAL (rounded_size) <= 4 * probe_interval)
++ {
++ for (HOST_WIDE_INT i = 0;
++ i < INTVAL (rounded_size);
++ i += probe_interval)
++ {
++ anti_adjust_stack (GEN_INT (probe_interval));
++
++ /* The prologue does not probe residuals. Thus the offset
++ here to probe just beyond what the prologue had already
++ allocated. */
++ emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx,
++ (probe_interval
++ - GET_MODE_SIZE (word_mode))));
++ emit_insn (gen_blockage ());
++ }
++ }
++ else
++ {
++ rtx loop_lab, end_loop;
++ bool rotate_loop = GET_CODE (rounded_size) == CONST_INT;
++ emit_stack_clash_protection_probe_loop_start (&loop_lab, &end_loop,
++ last_addr, rotate_loop);
++
++ anti_adjust_stack (GEN_INT (probe_interval));
++
++ /* The prologue does not probe residuals. Thus the offset here
++ to probe just beyond what the prologue had already allocated. */
++ emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx,
++ (probe_interval
++ - GET_MODE_SIZE (word_mode))));
++
++ emit_stack_clash_protection_probe_loop_end (loop_lab, end_loop,
++ last_addr, rotate_loop);
++ emit_insn (gen_blockage ());
++ }
++ }
++
++ if (residual != CONST0_RTX (Pmode))
++ {
++ rtx x = force_reg (Pmode, plus_constant (Pmode, residual,
++ -GET_MODE_SIZE (word_mode)));
++ anti_adjust_stack (residual);
++ emit_stack_probe (gen_rtx_PLUS (Pmode, stack_pointer_rtx, x));
++ emit_insn (gen_blockage ());
++ }
++
++ /* Some targets make optimistic assumptions in their prologues about
++ how the caller may have probed the stack. Make sure we honor
++ those assumptions when needed. */
++ if (size != CONST0_RTX (Pmode)
++ && targetm.stack_clash_protection_final_dynamic_probe (residual))
++ {
++ /* Ideally we would just probe at *sp. However, if SIZE is not
++ a compile-time constant, but is zero at runtime, then *sp
++ might hold live data. So probe at *sp if we know that
++ an allocation was made, otherwise probe into the red zone
++ which is obviously undesirable. */
++ if (GET_CODE (size) == CONST_INT)
++ {
++ emit_stack_probe (stack_pointer_rtx);
++ emit_insn (gen_blockage ());
++ }
++ else
++ {
++ emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx,
++ -GET_MODE_SIZE (word_mode)));
++ emit_insn (gen_blockage ());
++ }
++ }
++}
++
++
+ /* Adjust the stack pointer by minus SIZE (an rtx for a number of bytes)
+ while probing it. This pushes when SIZE is positive. SIZE need not
+ be constant. If ADJUST_BACK is true, adjust back the stack pointer
+diff --git a/gcc/rtl.h b/gcc/rtl.h
+index 91f3387c701..ab8ec27418d 100644
+--- a/gcc/rtl.h
++++ b/gcc/rtl.h
+@@ -1756,6 +1756,17 @@ extern int currently_expanding_to_rtl;
+ /* In explow.c */
+ extern HOST_WIDE_INT trunc_int_for_mode (HOST_WIDE_INT, enum machine_mode);
+ extern rtx plus_constant (enum machine_mode, rtx, HOST_WIDE_INT);
++extern HOST_WIDE_INT get_stack_check_protect (void);
++
++/* Support for building allocation/probing loops for stack-clash
++ protection of dyamically allocated stack space. */
++extern void compute_stack_clash_protection_loop_data (rtx *, rtx *, rtx *,
++ HOST_WIDE_INT *, rtx);
++extern void emit_stack_clash_protection_probe_loop_start (rtx *, rtx *,
++ rtx, bool);
++extern void emit_stack_clash_protection_probe_loop_end (rtx, rtx,
++ rtx, bool);
++
+
+ /* In rtl.c */
+ extern rtx rtx_alloc_stat (RTX_CODE MEM_STAT_DECL);
+diff --git a/gcc/target.def b/gcc/target.def
+index 4d6081c3121..eb2bd46f7a1 100644
+--- a/gcc/target.def
++++ b/gcc/target.def
+@@ -2580,6 +2580,13 @@ DEFHOOK
+ void, (void),
+ hook_void_void)
+
++DEFHOOK
++(stack_clash_protection_final_dynamic_probe,
++ "Some targets make optimistic assumptions about the state of stack probing when they emit their prologues. On such targets a probe into the end of any dynamically allocated space is likely required for safety against stack clash style attacks. Define this variable to return nonzero if such a probe is required or zero otherwise. You need not define this macro if it would always have the value zero.",
++ bool, (rtx residual),
++ default_stack_clash_protection_final_dynamic_probe)
++
++
+ /* Functions specific to the C family of frontends. */
+ #undef HOOK_PREFIX
+ #define HOOK_PREFIX "TARGET_C_"
+diff --git a/gcc/targhooks.c b/gcc/targhooks.c
+index f6aa9907225..be23875538d 100644
+--- a/gcc/targhooks.c
++++ b/gcc/targhooks.c
+@@ -1557,4 +1557,10 @@ default_canonicalize_comparison (int *, rtx *, rtx *, bool)
+ {
+ }
+
++bool
++default_stack_clash_protection_final_dynamic_probe (rtx residual ATTRIBUTE_UNUSED)
++{
++ return 0;
++}
++
+ #include "gt-targhooks.h"
+diff --git a/gcc/targhooks.h b/gcc/targhooks.h
+index b64274d3ff9..4acf33fae08 100644
+--- a/gcc/targhooks.h
++++ b/gcc/targhooks.h
+@@ -195,3 +195,4 @@ extern const char *default_pch_valid_p (const void *, size_t);
+ extern void default_asm_output_ident_directive (const char*);
+
+ extern bool default_member_type_forces_blk (const_tree, enum machine_mode);
++extern bool default_stack_clash_protection_final_dynamic_probe (rtx);
+diff --git a/gcc/testsuite/gcc.dg/stack-check-3.c b/gcc/testsuite/gcc.dg/stack-check-3.c
+new file mode 100644
+index 00000000000..58fb65649ee
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/stack-check-3.c
+@@ -0,0 +1,86 @@
++/* The goal here is to ensure that dynamic allocations via vlas or
++ alloca calls receive probing.
++
++ Scanning the RTL or assembly code seems like insanity here as does
++ checking for particular allocation sizes and probe offsets. For
++ now we just verify that there's an allocation + probe loop and
++ residual allocation + probe for f?. */
++
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-expand -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=4096 --param stack-clash-protection-guard-size=4096" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++__attribute__((noinline, noclone)) void
++foo (char *p)
++{
++ asm volatile ("" : : "r" (p) : "memory");
++}
++
++/* Simple VLA, no other locals. */
++__attribute__((noinline, noclone)) void
++f0 (int x)
++{
++ char vla[x];
++ foo (vla);
++}
++
++/* Simple VLA, small local frame. */
++__attribute__((noinline, noclone)) void
++f1 (int x)
++{
++ char locals[128];
++ char vla[x];
++ foo (vla);
++}
++
++/* Small constant alloca, no other locals. */
++__attribute__((noinline, noclone)) void
++f2 (int x)
++{
++ char *vla = __builtin_alloca (128);
++ foo (vla);
++}
++
++/* Big constant alloca, small local frame. */
++__attribute__((noinline, noclone)) void
++f3 (int x)
++{
++ char locals[128];
++ char *vla = __builtin_alloca (16384);
++ foo (vla);
++}
++
++/* Big constant alloca, small local frame. */
++__attribute__((noinline, noclone)) void
++f3a (int x)
++{
++ char locals[128];
++ char *vla = __builtin_alloca (32768);
++ foo (vla);
++}
++
++/* Nonconstant alloca, no other locals. */
++__attribute__((noinline, noclone)) void
++f4 (int x)
++{
++ char *vla = __builtin_alloca (x);
++ foo (vla);
++}
++
++/* Nonconstant alloca, small local frame. */
++__attribute__((noinline, noclone)) void
++f5 (int x)
++{
++ char locals[128];
++ char *vla = __builtin_alloca (x);
++ foo (vla);
++}
++
++/* { dg-final { scan-rtl-dump-times "allocation and probing residuals" 7 "expand" } } */
++
++
++/* { dg-final { scan-rtl-dump-times "allocation and probing in loop" 7 "expand" { target callee_realigns_stack } } } */
++/* { dg-final { scan-rtl-dump-times "allocation and probing in loop" 4 "expand" { target { ! callee_realigns_stack } } } } */
++/* { dg-final { scan-rtl-dump-times "allocation and probing in rotated loop" 1 "expand" { target { ! callee_realigns_stack } } } } */
++/* { dg-final { scan-rtl-dump-times "allocation and probing inline" 1 "expand" { target { ! callee_realigns_stack } } } } */
++/* { dg-final { scan-rtl-dump-times "skipped dynamic allocation and probing loop" 1 "expand" { target { ! callee_realigns_stack } } } } */
diff --git a/SOURCES/gcc48-rh1469697-4.patch b/SOURCES/gcc48-rh1469697-4.patch
new file mode 100644
index 0000000..003d79f
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-4.patch
@@ -0,0 +1,143 @@
+commit 8a1b46d59d6c3e1e5eb606cd44689c8557612257
+Author: law
+Date: Wed Sep 20 05:21:09 2017 +0000
+
+ * config/alpha/alpha.c (alpha_expand_prologue): Also check
+ flag_stack_clash_protection.
+ * config/ia64/ia64.c (ia64_compute_frame_size): Likewise.
+ (ia64_expand_prologue): Likewise.
+ * config/mips/mips.c (mips_expand_prologue): Likewise.
+ * config/sparc/sparc.c (sparc_expand_prologue): Likewise.
+ (sparc_flat_expand_prologue): Likewise.
+ * config/spu/spu.c (spu_expand_prologue): Likewise.
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@252996 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
+index 5402f5213d6..c46c843e462 100644
+--- a/gcc/config/alpha/alpha.c
++++ b/gcc/config/alpha/alpha.c
+@@ -7624,7 +7624,7 @@ alpha_expand_prologue (void)
+ Note that we are only allowed to adjust sp once in the prologue. */
+
+ probed_size = frame_size;
+- if (flag_stack_check)
++ if (flag_stack_check || flag_stack_clash_protection)
+ probed_size += get_stack_check_protect ();
+
+ if (probed_size <= 32768)
+@@ -7639,7 +7639,7 @@ alpha_expand_prologue (void)
+ /* We only have to do this probe if we aren't saving registers or
+ if we are probing beyond the frame because of -fstack-check. */
+ if ((sa_size == 0 && probed_size > probed - 4096)
+- || flag_stack_check)
++ || flag_stack_check || flag_stack_clash_protection)
+ emit_insn (gen_probe_stack (GEN_INT (-probed_size)));
+ }
+
+@@ -7669,7 +7669,8 @@ alpha_expand_prologue (void)
+ late in the compilation, generate the loop as a single insn. */
+ emit_insn (gen_prologue_stack_probe_loop (count, ptr));
+
+- if ((leftover > 4096 && sa_size == 0) || flag_stack_check)
++ if ((leftover > 4096 && sa_size == 0)
++ || flag_stack_check || flag_stack_clash_protection)
+ {
+ rtx last = gen_rtx_MEM (DImode,
+ plus_constant (Pmode, ptr, -leftover));
+@@ -7677,7 +7678,7 @@ alpha_expand_prologue (void)
+ emit_move_insn (last, const0_rtx);
+ }
+
+- if (flag_stack_check)
++ if (flag_stack_check || flag_stack_clash_protection)
+ {
+ /* If -fstack-check is specified we have to load the entire
+ constant into a register and subtract from the sp in one go,
+diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
+index 390983936e8..5bf7046cf15 100644
+--- a/gcc/config/ia64/ia64.c
++++ b/gcc/config/ia64/ia64.c
+@@ -2638,7 +2638,8 @@ ia64_compute_frame_size (HOST_WIDE_INT size)
+ mark_reg_gr_used_mask (cfun->machine->ia64_eh_epilogue_bsp, NULL);
+
+ /* Static stack checking uses r2 and r3. */
+- if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK)
++ if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK
++ || flag_stack_clash_protection)
+ current_frame_info.gr_used_mask |= 0xc;
+
+ /* Find the size of the register stack frame. We have only 80 local
+@@ -3434,7 +3435,8 @@ ia64_expand_prologue (void)
+ if (flag_stack_usage_info)
+ current_function_static_stack_size = current_frame_info.total_size;
+
+- if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK)
++ if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK
++ || flag_stack_clash_protection)
+ ia64_emit_probe_stack_range (get_stack_check_protect (),
+ current_frame_info.total_size,
+ current_frame_info.n_input_regs
+diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
+index 9b7eb678f19..da17f94b4f9 100644
+--- a/gcc/config/mips/mips.c
++++ b/gcc/config/mips/mips.c
+@@ -10745,7 +10745,9 @@ mips_expand_prologue (void)
+ if (flag_stack_usage_info)
+ current_function_static_stack_size = size;
+
+- if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK && size)
++ if ((flag_stack_check == STATIC_BUILTIN_STACK_CHECK
++ || flag_stack_clash_protection)
++ && size)
+ mips_emit_probe_stack_range (get_stack_check_protect (), size);
+
+ /* Save the registers. Allocate up to MIPS_MAX_FIRST_STACK_STEP
+diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
+index e5e93c80261..617aa617208 100644
+--- a/gcc/config/sparc/sparc.c
++++ b/gcc/config/sparc/sparc.c
+@@ -5430,7 +5430,9 @@ sparc_expand_prologue (void)
+ if (flag_stack_usage_info)
+ current_function_static_stack_size = size;
+
+- if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK && size)
++ if ((flag_stack_check == STATIC_BUILTIN_STACK_CHECK
++ || flag_stack_clash_protection)
++ && size)
+ sparc_emit_probe_stack_range (get_stack_check_protect (), size);
+
+ if (size == 0)
+@@ -5532,7 +5534,9 @@ sparc_flat_expand_prologue (void)
+ if (flag_stack_usage_info)
+ current_function_static_stack_size = size;
+
+- if (flag_stack_check == STATIC_BUILTIN_STACK_CHECK && size)
++ if ((flag_stack_check == STATIC_BUILTIN_STACK_CHECK
++ || flag_stack_clash_protection)
++ && size)
+ sparc_emit_probe_stack_range (get_stack_check_protect (), size);
+
+ if (sparc_save_local_in_regs_p)
+diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c
+index 328bd5bd2ae..5541a3cd243 100644
+--- a/gcc/config/spu/spu.c
++++ b/gcc/config/spu/spu.c
+@@ -1761,7 +1761,7 @@ spu_expand_prologue (void)
+
+ if (total_size > 0)
+ {
+- if (flag_stack_check)
++ if (flag_stack_check || flag_stack_clash_protection)
+ {
+ /* We compare against total_size-1 because
+ ($sp >= total_size) <=> ($sp > total_size-1) */
+@@ -5366,7 +5366,7 @@ spu_allocate_stack (rtx op0, rtx op1)
+ emit_insn (gen_spu_convert (sp, stack_pointer_rtx));
+ emit_insn (gen_subv4si3 (sp, sp, splatted));
+
+- if (flag_stack_check)
++ if (flag_stack_check || flag_stack_clash_protection)
+ {
+ rtx avail = gen_reg_rtx(SImode);
+ rtx result = gen_reg_rtx(SImode);
diff --git a/SOURCES/gcc48-rh1469697-5.patch b/SOURCES/gcc48-rh1469697-5.patch
new file mode 100644
index 0000000..e56e7b1
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-5.patch
@@ -0,0 +1,94 @@
+commit ea2b372d666ec1105abf4ef5418d92d612283e88
+Author: law
+Date: Wed Sep 20 05:23:51 2017 +0000
+
+ * function.c (dump_stack_clash_frame_info): New function.
+ * function.h (dump_stack_clash_frame_info): Prototype.
+ (enum stack_clash_probes): New enum.
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@252997 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/function.c b/gcc/function.c
+index 76baf307984..9b395aebcb3 100644
+--- a/gcc/function.c
++++ b/gcc/function.c
+@@ -5263,6 +5263,58 @@ get_arg_pointer_save_area (void)
+ return ret;
+ }
+
++
++/* If debugging dumps are requested, dump information about how the
++ target handled -fstack-check=clash for the prologue.
++
++ PROBES describes what if any probes were emitted.
++
++ RESIDUALS indicates if the prologue had any residual allocation
++ (i.e. total allocation was not a multiple of PROBE_INTERVAL). */
++
++void
++dump_stack_clash_frame_info (enum stack_clash_probes probes, bool residuals)
++{
++ if (!dump_file)
++ return;
++
++ switch (probes)
++ {
++ case NO_PROBE_NO_FRAME:
++ fprintf (dump_file,
++ "Stack clash no probe no stack adjustment in prologue.\n");
++ break;
++ case NO_PROBE_SMALL_FRAME:
++ fprintf (dump_file,
++ "Stack clash no probe small stack adjustment in prologue.\n");
++ break;
++ case PROBE_INLINE:
++ fprintf (dump_file, "Stack clash inline probes in prologue.\n");
++ break;
++ case PROBE_LOOP:
++ fprintf (dump_file, "Stack clash probe loop in prologue.\n");
++ break;
++ }
++
++ if (residuals)
++ fprintf (dump_file, "Stack clash residual allocation in prologue.\n");
++ else
++ fprintf (dump_file, "Stack clash no residual allocation in prologue.\n");
++
++ if (frame_pointer_needed)
++ fprintf (dump_file, "Stack clash frame pointer needed.\n");
++ else
++ fprintf (dump_file, "Stack clash no frame pointer needed.\n");
++
++ if (TREE_THIS_VOLATILE (cfun->decl))
++ fprintf (dump_file,
++ "Stack clash noreturn prologue, assuming no implicit"
++ " probes in caller.\n");
++ else
++ fprintf (dump_file,
++ "Stack clash not noreturn prologue.\n");
++}
++
+ /* Add a list of INSNS to the hash HASHP, possibly allocating HASHP
+ for the first time. */
+
+diff --git a/gcc/function.h b/gcc/function.h
+index 89d71e592dd..ffea1e564ba 100644
+--- a/gcc/function.h
++++ b/gcc/function.h
+@@ -712,6 +712,16 @@ extern void instantiate_decl_rtl (rtx x);
+ and create duplicate blocks. */
+ extern void reorder_blocks (void);
+
++enum stack_clash_probes {
++ NO_PROBE_NO_FRAME,
++ NO_PROBE_SMALL_FRAME,
++ PROBE_INLINE,
++ PROBE_LOOP
++};
++
++extern void dump_stack_clash_frame_info (enum stack_clash_probes, bool);
++
++
+ /* Set BLOCK_NUMBER for all the blocks in FN. */
+ extern void number_blocks (tree);
+
diff --git a/SOURCES/gcc48-rh1469697-6.patch b/SOURCES/gcc48-rh1469697-6.patch
new file mode 100644
index 0000000..b08bb30
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-6.patch
@@ -0,0 +1,2705 @@
+commit dd9992d1b96b5811873c98a208c029bebb0c3577
+Author: law
+Date: Wed Sep 20 05:35:07 2017 +0000
+
+ * config/i386/i386.c (ix86_adjust_stack_and_probe_stack_clash): New.
+ (ix86_expand_prologue): Dump stack clash info as needed.
+ Call ix86_adjust_stack_and_probe_stack_clash as needed.
+
+ * gcc.dg/stack-check-4.c: New test.
+ * gcc.dg/stack-check-5.c: New test.
+ * gcc.dg/stack-check-6.c: New test.
+ * gcc.dg/stack-check-6a.c: New test.
+ * gcc.dg/stack-check-7.c: New test.
+ * gcc.dg/stack-check-8.c: New test.
+ * gcc.dg/stack-check-9.c: New test.
+ * gcc.dg/stack-check-10.c: New test.
+ * lib/target-supports.exp
+ (check_effective_target_supports_stack_clash_protection): Enable for
+ x86 and x86_64 targets.
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@252998 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index d996fd160e8..a555b0774c0 100644
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
+@@ -9839,6 +9839,147 @@ release_scratch_register_on_entry (struct scratch_reg *sr)
+
+ #define PROBE_INTERVAL (1 << STACK_CHECK_PROBE_INTERVAL_EXP)
+
++/* Emit code to adjust the stack pointer by SIZE bytes while probing it.
++
++ This differs from the next routine in that it tries hard to prevent
++ attacks that jump the stack guard. Thus it is never allowed to allocate
++ more than PROBE_INTERVAL bytes of stack space without a suitable
++ probe. */
++
++static void
++ix86_adjust_stack_and_probe_stack_clash (const HOST_WIDE_INT size)
++{
++ struct machine_function *m = cfun->machine;
++
++ /* If this function does not statically allocate stack space, then
++ no probes are needed. */
++ if (!size)
++ {
++ dump_stack_clash_frame_info (NO_PROBE_NO_FRAME, false);
++ return;
++ }
++
++ /* If we are a noreturn function, then we have to consider the
++ possibility that we're called via a jump rather than a call.
++
++ Thus we don't have the implicit probe generated by saving the
++ return address into the stack at the call. Thus, the stack
++ pointer could be anywhere in the guard page. The safe thing
++ to do is emit a probe now.
++
++ ?!? This should be revamped to work like aarch64 and s390 where
++ we track the offset from the most recent probe. Normally that
++ offset would be zero. For a non-return function we would reset
++ it to PROBE_INTERVAL - (STACK_BOUNDARY / BITS_PER_UNIT). Then
++ we just probe when we cross PROBE_INTERVAL. */
++ if (TREE_THIS_VOLATILE (cfun->decl))
++ {
++ emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx,
++ -GET_MODE_SIZE (word_mode)));
++ emit_insn (gen_blockage ());
++ }
++
++ /* If we allocate less than the size of the guard statically,
++ then no probing is necessary, but we do need to allocate
++ the stack. */
++ if (size < (1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE)))
++ {
++ pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx,
++ GEN_INT (-size), -1,
++ m->fs.cfa_reg == stack_pointer_rtx);
++ dump_stack_clash_frame_info (NO_PROBE_SMALL_FRAME, true);
++ return;
++ }
++
++ /* We're allocating a large enough stack frame that we need to
++ emit probes. Either emit them inline or in a loop depending
++ on the size. */
++ HOST_WIDE_INT probe_interval
++ = 1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL);
++ if (size <= 4 * probe_interval)
++ {
++ HOST_WIDE_INT i;
++ for (i = probe_interval; i <= size; i += probe_interval)
++ {
++ /* Allocate PROBE_INTERVAL bytes. */
++ pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx,
++ GEN_INT (-probe_interval), -1,
++ m->fs.cfa_reg == stack_pointer_rtx);
++
++ /* And probe at *sp. */
++ emit_stack_probe (stack_pointer_rtx);
++ emit_insn (gen_blockage ());
++ }
++
++ /* We need to allocate space for the residual, but we do not need
++ to probe the residual. */
++ HOST_WIDE_INT residual = (i - probe_interval - size);
++ if (residual)
++ pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx,
++ GEN_INT (residual), -1,
++ m->fs.cfa_reg == stack_pointer_rtx);
++ dump_stack_clash_frame_info (PROBE_INLINE, residual != 0);
++ }
++ else
++ {
++ struct scratch_reg sr;
++ get_scratch_register_on_entry (&sr);
++
++ /* Step 1: round SIZE down to a multiple of the interval. */
++ HOST_WIDE_INT rounded_size = size & -probe_interval;
++
++ /* Step 2: compute final value of the loop counter. Use lea if
++ possible. */
++ rtx addr = plus_constant (Pmode, stack_pointer_rtx, -rounded_size);
++ rtx insn;
++ if (address_operand (addr, Pmode))
++ insn = emit_insn (gen_rtx_SET (VOIDmode, sr.reg, addr));
++ else
++ {
++ emit_move_insn (sr.reg, GEN_INT (-rounded_size));
++ insn = emit_insn (gen_rtx_SET (VOIDmode, sr.reg,
++ gen_rtx_PLUS (Pmode, sr.reg,
++ stack_pointer_rtx)));
++ }
++ if (m->fs.cfa_reg == stack_pointer_rtx)
++ {
++ add_reg_note (insn, REG_CFA_DEF_CFA,
++ plus_constant (Pmode, sr.reg,
++ m->fs.cfa_offset + rounded_size));
++ RTX_FRAME_RELATED_P (insn) = 1;
++ }
++
++ /* Step 3: the loop. */
++ rtx size_rtx = GEN_INT (rounded_size);
++ insn = emit_insn (ix86_gen_adjust_stack_and_probe (sr.reg, sr.reg,
++ size_rtx));
++ if (m->fs.cfa_reg == stack_pointer_rtx)
++ {
++ m->fs.cfa_offset += rounded_size;
++ add_reg_note (insn, REG_CFA_DEF_CFA,
++ plus_constant (Pmode, stack_pointer_rtx,
++ m->fs.cfa_offset));
++ RTX_FRAME_RELATED_P (insn) = 1;
++ }
++ m->fs.sp_offset += rounded_size;
++ emit_insn (gen_blockage ());
++
++ /* Step 4: adjust SP if we cannot assert at compile-time that SIZE
++ is equal to ROUNDED_SIZE. */
++
++ if (size != rounded_size)
++ pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx,
++ GEN_INT (rounded_size - size), -1,
++ m->fs.cfa_reg == stack_pointer_rtx);
++ dump_stack_clash_frame_info (PROBE_LOOP, size != rounded_size);
++
++ release_scratch_register_on_entry (&sr);
++ }
++
++ /* Make sure nothing is scheduled before we are done. */
++ emit_insn (gen_blockage ());
++}
++
+ /* Emit code to adjust the stack pointer by SIZE bytes while probing it. */
+
+ static void
+@@ -10529,12 +10670,19 @@ ix86_expand_prologue (void)
+
+ /* The stack has already been decremented by the instruction calling us
+ so probe if the size is non-negative to preserve the protection area. */
+- if (allocate >= 0 && flag_stack_check == STATIC_BUILTIN_STACK_CHECK)
++ if (allocate >= 0
++ && (flag_stack_check == STATIC_BUILTIN_STACK_CHECK
++ || flag_stack_clash_protection))
+ {
+ /* We expect the registers to be saved when probes are used. */
+ gcc_assert (int_registers_saved);
+
+- if (STACK_CHECK_MOVING_SP)
++ if (flag_stack_clash_protection)
++ {
++ ix86_adjust_stack_and_probe_stack_clash (allocate);
++ allocate = 0;
++ }
++ else if (STACK_CHECK_MOVING_SP)
+ {
+ ix86_adjust_stack_and_probe (allocate);
+ allocate = 0;
+diff --git a/gcc/testsuite/gcc.dg/stack-check-10.c b/gcc/testsuite/gcc.dg/stack-check-10.c
+new file mode 100644
+index 00000000000..a86956ad692
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/stack-check-10.c
+@@ -0,0 +1,41 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++int f (int *);
++
++int
++g (int a)
++{
++ return f (&a);
++}
++
++int f1 (void);
++int f2 (int);
++
++int
++f3 (void)
++{
++ return f2 (f1 ());
++}
++
++
++/* If we have caller implicit probes, then we should not need probes in either callee.
++ Else callees may need probes, particularly if non-leaf functions require a
++ frame/frame pointer. */
++/* { dg-final { scan-rtl-dump-times "Stack clash no probe" 2 "pro_and_epilogue" { target caller_implicit_probes } } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash inline probe" 1 "pro_and_epilogue" { target { ! caller_implicit_probes } } } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash no probe" 1 "pro_and_epilogue" { target { ! caller_implicit_probes } } } } */
++
++/* Neither of these functions are a nonreturn function. */
++/* { dg-final { scan-rtl-dump-times "Stack clash not noreturn" 2 "pro_and_epilogue" } } */
++
++/* If the callee realigns the stack or has a mandatory frame, then both functions
++ have a residual allocation. Else just g() has a residual allocation. */
++/* { dg-final { scan-rtl-dump-times "Stack clash residual allocation in prologue" 2 "pro_and_epilogue" } } */
++
++
++/* If the target has frame pointers for non-leafs, then both functions will
++ need a frame pointer. Otherwise neither should. */
++/* { dg-final { scan-rtl-dump-times "Stack clash no frame pointer needed" 2 "pro_and_epilogue" { target { ! frame_pointer_for_non_leaf } } } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash frame pointer needed" 2 "pro_and_epilogue" { target { frame_pointer_for_non_leaf } } } } */
+diff --git a/gcc/testsuite/gcc.dg/stack-check-3.c b/gcc/testsuite/gcc.dg/stack-check-3.c
+index 58fb65649ee..f0bf7c71a5b 100644
+--- a/gcc/testsuite/gcc.dg/stack-check-3.c
++++ b/gcc/testsuite/gcc.dg/stack-check-3.c
+@@ -7,7 +7,7 @@
+ residual allocation + probe for f?. */
+
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-expand -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=4096 --param stack-clash-protection-guard-size=4096" } */
++/* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-expand -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=12" } */
+ /* { dg-require-effective-target supports_stack_clash_protection } */
+
+ __attribute__((noinline, noclone)) void
+diff --git a/gcc/testsuite/gcc.dg/stack-check-4.c b/gcc/testsuite/gcc.dg/stack-check-4.c
+new file mode 100644
+index 00000000000..b0c5c61972f
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/stack-check-4.c
+@@ -0,0 +1,42 @@
++/* On targets where the call instruction is an implicit probe of *sp, we
++ elide stack probes as long as the size of the local stack is less than
++ PROBE_INTERVAL.
++
++ But if the caller were to transform a tail call into a direct jump
++ we do not have that implicit probe. This normally isn't a problem as
++ the caller must not have a local frame for that optimization to apply.
++
++ However, a sufficiently smart compiler could realize that the caller's
++ local stack need not be torn down and thus could transform a call into
++ a jump if the target is a noreturn function, even if the caller has
++ a local frame.
++
++ To guard against that, targets that depend on *sp being probed by the
++ call itself must emit a probe if the target function is a noreturn
++ function, even if they just allocate a small amount of stack space.
++
++ Rather than try to parse RTL or assembly code, we instead require the
++ prologue code to emit information into the dump file that we can
++ scan for. We scan for both the positive and negative cases. */
++
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue -fno-optimize-sibling-calls" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++extern void arf (char *);
++
++__attribute__ ((noreturn)) void foo1 ()
++{
++ char x[10];
++ while (1)
++ arf (x);
++}
++
++void foo2 ()
++{
++ char x[10];
++ arf (x);
++}
++/* { dg-final { scan-rtl-dump-times "Stack clash noreturn" 1 "pro_and_epilogue" } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash not noreturn" 1 "pro_and_epilogue" } } */
++
+diff --git a/gcc/testsuite/gcc.dg/stack-check-5.c b/gcc/testsuite/gcc.dg/stack-check-5.c
+new file mode 100644
+index 00000000000..2171d9b6c23
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/stack-check-5.c
+@@ -0,0 +1,74 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++
++extern void foo (char *);
++extern void bar (void);
++
++/* This function allocates no local stack and is a leaf. It should have no
++ probes on any target and should not require a frame pointer. */
++int
++f0 (int x, int y)
++{
++ asm volatile ("" : : : "memory");
++ return x + y;
++}
++
++/* This function allocates no local stack, but is not a leaf. Ideally it
++ should not need probing and no frame pointer. */
++int
++f1 (int x, int y)
++{
++ asm volatile ("" : : : "memory");
++ bar ();
++}
++
++/* This is a leaf with a small frame. On targets with implicit probes in
++ the caller, this should not need probing. On targets with no implicit
++ probes in the caller, it may require probes. Ideally it should need no
++ frame pointer. */
++void
++f2 (void)
++{
++ char buf[512];
++ asm volatile ("" : : "g" (&buf) : "memory");
++}
++
++/* This is a non-leaf with a small frame. On targets with implicit probes in
++ the caller, this should not need probing. On targets with no implicit
++ probes in the caller, it may require probes. It should need no frame
++ pointer. */
++void
++f3 (void)
++{
++ char buf[512];
++ foo (buf);
++}
++
++/* If we have caller implicit probes, then we should not need probes.
++ Else callees may need probes, particularly if non-leaf functions require a
++ frame/frame pointer. */
++/* { dg-final { scan-rtl-dump-times "Stack clash no probe" 4 "pro_and_epilogue" { target caller_implicit_probes } } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash no probe" 2 "pro_and_epilogue" { target { ! caller_implicit_probes } } } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash inline probes " 2 "pro_and_epilogue" { target { ! caller_implicit_probes } } } } */
++
++/* None of these functions are marked with the noreturn attribute. */
++/* { dg-final { scan-rtl-dump-times "Stack clash not noreturn" 4 "pro_and_epilogue" } } */
++
++/* Two functions are leafs, two are not. Verify the target identified them
++ appropriately. */
++/* { dg-final { scan-rtl-dump-times "Stack clash no frame pointer needed" 4 "pro_and_epilogue" { target { ! frame_pointer_for_non_leaf } } } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash no frame pointer needed" 2 "pro_and_epilogue" { target { frame_pointer_for_non_leaf } } } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash frame pointer needed" 2 "pro_and_epilogue" { target { frame_pointer_for_non_leaf } } } } */
++
++
++/* We have selected the size of the array in f2/f3 to be large enough
++ to not live in the red zone on targets that support it.
++
++ That allows simplification of this test considerably.
++ f1() should not require any allocations, thus no residuals.
++ All the rest of the functions require some kind of allocation,
++ either for the saved fp/rp or the array. */
++/* { dg-final { scan-rtl-dump-times "Stack clash no residual allocation in prologue" 1 "pro_and_epilogue" } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash residual allocation in prologue" 3 "pro_and_epilogue" } } */
+diff --git a/gcc/testsuite/gcc.dg/stack-check-6.c b/gcc/testsuite/gcc.dg/stack-check-6.c
+new file mode 100644
+index 00000000000..ad2021c9037
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/stack-check-6.c
+@@ -0,0 +1,55 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++
++extern void foo (char *);
++extern void bar (void);
++
++
++/* This is a leaf with a frame that is large enough to require probing with
++ a residual allocation, but small enough to probe inline. */
++void
++f4 (void)
++{
++ char buf[4096 + 512];
++ asm volatile ("" : : "g" (&buf) : "memory");
++}
++
++
++/* This is a non-leaf with a frame large enough to require probing and
++ a residual allocation, but small enough to probe inline. */
++void
++f5 (void)
++{
++ char buf[4096 + 512];
++ foo (buf);
++}
++
++/* This is a leaf with a frame that is large enough to require probing with
++ a loop plus a residual allocation. */
++void
++f6 (void)
++{
++ char buf[4096 * 10 + 512];
++ asm volatile ("" : : "g" (&buf) : "memory");
++}
++
++
++/* This is a non-leaf with a frame large enough to require probing with
++ a loop plus a residual allocation. */
++void
++f7 (void)
++{
++ char buf[4096 * 10 + 512];
++ foo (buf);
++}
++
++/* { dg-final { scan-rtl-dump-times "Stack clash inline probes" 2 "pro_and_epilogue" } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash probe loop" 2 "pro_and_epilogue" } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash residual allocation in prologue" 4 "pro_and_epilogue" } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash not noreturn" 4 "pro_and_epilogue" } } */
++
++/* { dg-final { scan-rtl-dump-times "Stack clash no frame pointer needed" 4 "pro_and_epilogue" { target { ! frame_pointer_for_non_leaf } } } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash no frame pointer needed" 2 "pro_and_epilogue" { target { frame_pointer_for_non_leaf } } } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash frame pointer needed" 2 "pro_and_epilogue" { target { frame_pointer_for_non_leaf } } } } */
+diff --git a/gcc/testsuite/gcc.dg/stack-check-6a.c b/gcc/testsuite/gcc.dg/stack-check-6a.c
+new file mode 100644
+index 00000000000..6f8e7128921
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/stack-check-6a.c
+@@ -0,0 +1,17 @@
++/* The goal here is to verify that increasing the size of the guard allows
++ elimination of all probing on the relevant targets. */
++
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=16" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++#include "stack-check-6.c"
++
++/* { dg-final { scan-rtl-dump-times "Stack clash inline probes" 0 "pro_and_epilogue" } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash probe loop" 0 "pro_and_epilogue" } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash residual allocation in prologue" 4 "pro_and_epilogue" } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash not noreturn" 4 "pro_and_epilogue" } } */
++
++/* { dg-final { scan-rtl-dump-times "Stack clash no frame pointer needed" 4 "pro_and_epilogue" { target { ! frame_pointer_for_non_leaf } } } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash no frame pointer needed" 2 "pro_and_epilogue" { target { frame_pointer_for_non_leaf } } } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash frame pointer needed" 2 "pro_and_epilogue" { target { frame_pointer_for_non_leaf } } } } */
+diff --git a/gcc/testsuite/gcc.dg/stack-check-7.c b/gcc/testsuite/gcc.dg/stack-check-7.c
+new file mode 100644
+index 00000000000..b963a2881dc
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/stack-check-7.c
+@@ -0,0 +1,36 @@
++/* { dg-do run } */
++/* { dg-options "-O2 -fstack-clash-protection -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++/* For further testing, this can be run under valgrind where it's crashed
++ on aarch64 and ppc64le with -fstack-check=specific. */
++
++
++__attribute__((noinline, noclone)) void
++foo (char *p)
++{
++ asm volatile ("" : : "r" (p) : "memory");
++}
++
++__attribute__((noinline, noclone)) void
++bar (void)
++{
++ char buf[131072];
++ foo (buf);
++}
++
++__attribute__((noinline, noclone)) void
++baz (void)
++{
++ char buf[12000];
++ foo (buf);
++}
++
++int
++main ()
++{
++ bar ();
++ baz ();
++ return 0;
++}
++
+diff --git a/gcc/testsuite/gcc.dg/stack-check-8.c b/gcc/testsuite/gcc.dg/stack-check-8.c
+new file mode 100644
+index 00000000000..0ccec8b532a
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/stack-check-8.c
+@@ -0,0 +1,139 @@
++/* { dg-do run } */
++/* { dg-options "-O2 -w -fstack-clash-protection -Wno-psabi -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++
++typedef float V __attribute__((vector_size (32)));
++
++__attribute__((noinline, noclone)) void
++foo (char *p)
++{
++ asm volatile ("" : : "r" (p) : "memory");
++}
++
++__attribute__((noinline, noclone)) int
++f0 (int x, int y)
++{
++ asm volatile ("" : : : "memory");
++ return x + y;
++}
++
++__attribute__((noinline, noclone)) void
++f1 (void)
++{
++ char buf[64];
++ foo (buf);
++}
++
++__attribute__((noinline, noclone)) void
++f2 (void)
++{
++ char buf[12000];
++ foo (buf);
++}
++
++__attribute__((noinline, noclone)) void
++f3 (void)
++{
++ char buf[131072];
++ foo (buf);
++}
++
++__attribute__((noinline, noclone)) void
++f4 (int x)
++{
++ char vla[x];
++ foo (vla);
++}
++
++__attribute__((noinline, noclone)) void
++f5 (int x)
++{
++ char buf[12000];
++ foo (buf);
++ {
++ char vla[x];
++ foo (vla);
++ }
++ {
++ char vla[x];
++ foo (vla);
++ }
++}
++
++V v;
++
++__attribute__((noinline, noclone)) int
++f6 (int x, int y, V a, V b, V c)
++{
++ asm volatile ("" : : : "memory");
++ v = a + b + c;
++ return x + y;
++}
++
++__attribute__((noinline, noclone)) void
++f7 (V a, V b, V c)
++{
++ char buf[64];
++ foo (buf);
++ v = a + b + c;
++}
++
++__attribute__((noinline, noclone)) void
++f8 (V a, V b, V c)
++{
++ char buf[12000];
++ foo (buf);
++ v = a + b + c;
++}
++
++__attribute__((noinline, noclone)) void
++f9 (V a, V b, V c)
++{
++ char buf[131072];
++ foo (buf);
++ v = a + b + c;
++}
++
++__attribute__((noinline, noclone)) void
++f10 (int x, V a, V b, V c)
++{
++ char vla[x];
++ foo (vla);
++ v = a + b + c;
++}
++
++__attribute__((noinline, noclone)) void
++f11 (int x, V a, V b, V c)
++{
++ char buf[12000];
++ foo (buf);
++ v = a + b + c;
++ {
++ char vla[x];
++ foo (vla);
++ }
++ {
++ char vla[x];
++ foo (vla);
++ }
++}
++
++int
++main ()
++{
++ f0 (2, 3);
++ f1 ();
++ f2 ();
++ f3 ();
++ f4 (12000);
++ f5 (12000);
++ f6 (2, 3, v, v, v);
++ f7 (v, v, v);
++ f8 (v, v, v);
++ f9 (v, v, v);
++ f10 (12000, v, v, v);
++ f11 (12000, v, v, v);
++ return 0;
++}
++
+diff --git a/gcc/testsuite/gcc.dg/stack-check-9.c b/gcc/testsuite/gcc.dg/stack-check-9.c
+new file mode 100644
+index 00000000000..b84075b9b43
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/stack-check-9.c
+@@ -0,0 +1,2022 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection -fdump-rtl-pro_and_epilogue -fno-optimize-sibling-calls --param stack-clash-protection-probe-interval=12 --param stack-clash-protection-guard-size=12" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++double f1 (void);
++double f2 (double, double);
++
++double
++f3 (void)
++{
++ double d000 = f1 ();
++ double d001 = f1 ();
++ double d002 = f1 ();
++ double d003 = f1 ();
++ double d004 = f1 ();
++ double d005 = f1 ();
++ double d006 = f1 ();
++ double d007 = f1 ();
++ double d008 = f1 ();
++ double d009 = f1 ();
++ double d010 = f1 ();
++ double d011 = f1 ();
++ double d012 = f1 ();
++ double d013 = f1 ();
++ double d014 = f1 ();
++ double d015 = f1 ();
++ double d016 = f1 ();
++ double d017 = f1 ();
++ double d018 = f1 ();
++ double d019 = f1 ();
++ double d020 = f1 ();
++ double d021 = f1 ();
++ double d022 = f1 ();
++ double d023 = f1 ();
++ double d024 = f1 ();
++ double d025 = f1 ();
++ double d026 = f1 ();
++ double d027 = f1 ();
++ double d028 = f1 ();
++ double d029 = f1 ();
++ double d030 = f1 ();
++ double d031 = f1 ();
++ double d032 = f1 ();
++ double d033 = f1 ();
++ double d034 = f1 ();
++ double d035 = f1 ();
++ double d036 = f1 ();
++ double d037 = f1 ();
++ double d038 = f1 ();
++ double d039 = f1 ();
++ double d040 = f1 ();
++ double d041 = f1 ();
++ double d042 = f1 ();
++ double d043 = f1 ();
++ double d044 = f1 ();
++ double d045 = f1 ();
++ double d046 = f1 ();
++ double d047 = f1 ();
++ double d048 = f1 ();
++ double d049 = f1 ();
++ double d050 = f1 ();
++ double d051 = f1 ();
++ double d052 = f1 ();
++ double d053 = f1 ();
++ double d054 = f1 ();
++ double d055 = f1 ();
++ double d056 = f1 ();
++ double d057 = f1 ();
++ double d058 = f1 ();
++ double d059 = f1 ();
++ double d060 = f1 ();
++ double d061 = f1 ();
++ double d062 = f1 ();
++ double d063 = f1 ();
++ double d064 = f1 ();
++ double d065 = f1 ();
++ double d066 = f1 ();
++ double d067 = f1 ();
++ double d068 = f1 ();
++ double d069 = f1 ();
++ double d070 = f1 ();
++ double d071 = f1 ();
++ double d072 = f1 ();
++ double d073 = f1 ();
++ double d074 = f1 ();
++ double d075 = f1 ();
++ double d076 = f1 ();
++ double d077 = f1 ();
++ double d078 = f1 ();
++ double d079 = f1 ();
++ double d080 = f1 ();
++ double d081 = f1 ();
++ double d082 = f1 ();
++ double d083 = f1 ();
++ double d084 = f1 ();
++ double d085 = f1 ();
++ double d086 = f1 ();
++ double d087 = f1 ();
++ double d088 = f1 ();
++ double d089 = f1 ();
++ double d090 = f1 ();
++ double d091 = f1 ();
++ double d092 = f1 ();
++ double d093 = f1 ();
++ double d094 = f1 ();
++ double d095 = f1 ();
++ double d096 = f1 ();
++ double d097 = f1 ();
++ double d098 = f1 ();
++ double d099 = f1 ();
++ double d100 = f1 ();
++ double d101 = f1 ();
++ double d102 = f1 ();
++ double d103 = f1 ();
++ double d104 = f1 ();
++ double d105 = f1 ();
++ double d106 = f1 ();
++ double d107 = f1 ();
++ double d108 = f1 ();
++ double d109 = f1 ();
++ double d110 = f1 ();
++ double d111 = f1 ();
++ double d112 = f1 ();
++ double d113 = f1 ();
++ double d114 = f1 ();
++ double d115 = f1 ();
++ double d116 = f1 ();
++ double d117 = f1 ();
++ double d118 = f1 ();
++ double d119 = f1 ();
++ double d120 = f1 ();
++ double d121 = f1 ();
++ double d122 = f1 ();
++ double d123 = f1 ();
++ double d124 = f1 ();
++ double d125 = f1 ();
++ double d126 = f1 ();
++ double d127 = f1 ();
++ double d128 = f1 ();
++ double d129 = f1 ();
++ double d130 = f1 ();
++ double d131 = f1 ();
++ double d132 = f1 ();
++ double d133 = f1 ();
++ double d134 = f1 ();
++ double d135 = f1 ();
++ double d136 = f1 ();
++ double d137 = f1 ();
++ double d138 = f1 ();
++ double d139 = f1 ();
++ double d140 = f1 ();
++ double d141 = f1 ();
++ double d142 = f1 ();
++ double d143 = f1 ();
++ double d144 = f1 ();
++ double d145 = f1 ();
++ double d146 = f1 ();
++ double d147 = f1 ();
++ double d148 = f1 ();
++ double d149 = f1 ();
++ double d150 = f1 ();
++ double d151 = f1 ();
++ double d152 = f1 ();
++ double d153 = f1 ();
++ double d154 = f1 ();
++ double d155 = f1 ();
++ double d156 = f1 ();
++ double d157 = f1 ();
++ double d158 = f1 ();
++ double d159 = f1 ();
++ double d160 = f1 ();
++ double d161 = f1 ();
++ double d162 = f1 ();
++ double d163 = f1 ();
++ double d164 = f1 ();
++ double d165 = f1 ();
++ double d166 = f1 ();
++ double d167 = f1 ();
++ double d168 = f1 ();
++ double d169 = f1 ();
++ double d170 = f1 ();
++ double d171 = f1 ();
++ double d172 = f1 ();
++ double d173 = f1 ();
++ double d174 = f1 ();
++ double d175 = f1 ();
++ double d176 = f1 ();
++ double d177 = f1 ();
++ double d178 = f1 ();
++ double d179 = f1 ();
++ double d180 = f1 ();
++ double d181 = f1 ();
++ double d182 = f1 ();
++ double d183 = f1 ();
++ double d184 = f1 ();
++ double d185 = f1 ();
++ double d186 = f1 ();
++ double d187 = f1 ();
++ double d188 = f1 ();
++ double d189 = f1 ();
++ double d190 = f1 ();
++ double d191 = f1 ();
++ double d192 = f1 ();
++ double d193 = f1 ();
++ double d194 = f1 ();
++ double d195 = f1 ();
++ double d196 = f1 ();
++ double d197 = f1 ();
++ double d198 = f1 ();
++ double d199 = f1 ();
++ double d200 = f1 ();
++ double d201 = f1 ();
++ double d202 = f1 ();
++ double d203 = f1 ();
++ double d204 = f1 ();
++ double d205 = f1 ();
++ double d206 = f1 ();
++ double d207 = f1 ();
++ double d208 = f1 ();
++ double d209 = f1 ();
++ double d210 = f1 ();
++ double d211 = f1 ();
++ double d212 = f1 ();
++ double d213 = f1 ();
++ double d214 = f1 ();
++ double d215 = f1 ();
++ double d216 = f1 ();
++ double d217 = f1 ();
++ double d218 = f1 ();
++ double d219 = f1 ();
++ double d220 = f1 ();
++ double d221 = f1 ();
++ double d222 = f1 ();
++ double d223 = f1 ();
++ double d224 = f1 ();
++ double d225 = f1 ();
++ double d226 = f1 ();
++ double d227 = f1 ();
++ double d228 = f1 ();
++ double d229 = f1 ();
++ double d230 = f1 ();
++ double d231 = f1 ();
++ double d232 = f1 ();
++ double d233 = f1 ();
++ double d234 = f1 ();
++ double d235 = f1 ();
++ double d236 = f1 ();
++ double d237 = f1 ();
++ double d238 = f1 ();
++ double d239 = f1 ();
++ double d240 = f1 ();
++ double d241 = f1 ();
++ double d242 = f1 ();
++ double d243 = f1 ();
++ double d244 = f1 ();
++ double d245 = f1 ();
++ double d246 = f1 ();
++ double d247 = f1 ();
++ double d248 = f1 ();
++ double d249 = f1 ();
++ double d250 = f1 ();
++ double d251 = f1 ();
++ double d252 = f1 ();
++ double d253 = f1 ();
++ double d254 = f1 ();
++ double d255 = f1 ();
++ double d256 = f1 ();
++ double d257 = f1 ();
++ double d258 = f1 ();
++ double d259 = f1 ();
++ double d260 = f1 ();
++ double d261 = f1 ();
++ double d262 = f1 ();
++ double d263 = f1 ();
++ double d264 = f1 ();
++ double d265 = f1 ();
++ double d266 = f1 ();
++ double d267 = f1 ();
++ double d268 = f1 ();
++ double d269 = f1 ();
++ double d270 = f1 ();
++ double d271 = f1 ();
++ double d272 = f1 ();
++ double d273 = f1 ();
++ double d274 = f1 ();
++ double d275 = f1 ();
++ double d276 = f1 ();
++ double d277 = f1 ();
++ double d278 = f1 ();
++ double d279 = f1 ();
++ double d280 = f1 ();
++ double d281 = f1 ();
++ double d282 = f1 ();
++ double d283 = f1 ();
++ double d284 = f1 ();
++ double d285 = f1 ();
++ double d286 = f1 ();
++ double d287 = f1 ();
++ double d288 = f1 ();
++ double d289 = f1 ();
++ double d290 = f1 ();
++ double d291 = f1 ();
++ double d292 = f1 ();
++ double d293 = f1 ();
++ double d294 = f1 ();
++ double d295 = f1 ();
++ double d296 = f1 ();
++ double d297 = f1 ();
++ double d298 = f1 ();
++ double d299 = f1 ();
++ double d300 = f1 ();
++ double d301 = f1 ();
++ double d302 = f1 ();
++ double d303 = f1 ();
++ double d304 = f1 ();
++ double d305 = f1 ();
++ double d306 = f1 ();
++ double d307 = f1 ();
++ double d308 = f1 ();
++ double d309 = f1 ();
++ double d310 = f1 ();
++ double d311 = f1 ();
++ double d312 = f1 ();
++ double d313 = f1 ();
++ double d314 = f1 ();
++ double d315 = f1 ();
++ double d316 = f1 ();
++ double d317 = f1 ();
++ double d318 = f1 ();
++ double d319 = f1 ();
++ double d320 = f1 ();
++ double d321 = f1 ();
++ double d322 = f1 ();
++ double d323 = f1 ();
++ double d324 = f1 ();
++ double d325 = f1 ();
++ double d326 = f1 ();
++ double d327 = f1 ();
++ double d328 = f1 ();
++ double d329 = f1 ();
++ double d330 = f1 ();
++ double d331 = f1 ();
++ double d332 = f1 ();
++ double d333 = f1 ();
++ double d334 = f1 ();
++ double d335 = f1 ();
++ double d336 = f1 ();
++ double d337 = f1 ();
++ double d338 = f1 ();
++ double d339 = f1 ();
++ double d340 = f1 ();
++ double d341 = f1 ();
++ double d342 = f1 ();
++ double d343 = f1 ();
++ double d344 = f1 ();
++ double d345 = f1 ();
++ double d346 = f1 ();
++ double d347 = f1 ();
++ double d348 = f1 ();
++ double d349 = f1 ();
++ double d350 = f1 ();
++ double d351 = f1 ();
++ double d352 = f1 ();
++ double d353 = f1 ();
++ double d354 = f1 ();
++ double d355 = f1 ();
++ double d356 = f1 ();
++ double d357 = f1 ();
++ double d358 = f1 ();
++ double d359 = f1 ();
++ double d360 = f1 ();
++ double d361 = f1 ();
++ double d362 = f1 ();
++ double d363 = f1 ();
++ double d364 = f1 ();
++ double d365 = f1 ();
++ double d366 = f1 ();
++ double d367 = f1 ();
++ double d368 = f1 ();
++ double d369 = f1 ();
++ double d370 = f1 ();
++ double d371 = f1 ();
++ double d372 = f1 ();
++ double d373 = f1 ();
++ double d374 = f1 ();
++ double d375 = f1 ();
++ double d376 = f1 ();
++ double d377 = f1 ();
++ double d378 = f1 ();
++ double d379 = f1 ();
++ double d380 = f1 ();
++ double d381 = f1 ();
++ double d382 = f1 ();
++ double d383 = f1 ();
++ double d384 = f1 ();
++ double d385 = f1 ();
++ double d386 = f1 ();
++ double d387 = f1 ();
++ double d388 = f1 ();
++ double d389 = f1 ();
++ double d390 = f1 ();
++ double d391 = f1 ();
++ double d392 = f1 ();
++ double d393 = f1 ();
++ double d394 = f1 ();
++ double d395 = f1 ();
++ double d396 = f1 ();
++ double d397 = f1 ();
++ double d398 = f1 ();
++ double d399 = f1 ();
++ double d400 = f1 ();
++ double d401 = f1 ();
++ double d402 = f1 ();
++ double d403 = f1 ();
++ double d404 = f1 ();
++ double d405 = f1 ();
++ double d406 = f1 ();
++ double d407 = f1 ();
++ double d408 = f1 ();
++ double d409 = f1 ();
++ double d410 = f1 ();
++ double d411 = f1 ();
++ double d412 = f1 ();
++ double d413 = f1 ();
++ double d414 = f1 ();
++ double d415 = f1 ();
++ double d416 = f1 ();
++ double d417 = f1 ();
++ double d418 = f1 ();
++ double d419 = f1 ();
++ double d420 = f1 ();
++ double d421 = f1 ();
++ double d422 = f1 ();
++ double d423 = f1 ();
++ double d424 = f1 ();
++ double d425 = f1 ();
++ double d426 = f1 ();
++ double d427 = f1 ();
++ double d428 = f1 ();
++ double d429 = f1 ();
++ double d430 = f1 ();
++ double d431 = f1 ();
++ double d432 = f1 ();
++ double d433 = f1 ();
++ double d434 = f1 ();
++ double d435 = f1 ();
++ double d436 = f1 ();
++ double d437 = f1 ();
++ double d438 = f1 ();
++ double d439 = f1 ();
++ double d440 = f1 ();
++ double d441 = f1 ();
++ double d442 = f1 ();
++ double d443 = f1 ();
++ double d444 = f1 ();
++ double d445 = f1 ();
++ double d446 = f1 ();
++ double d447 = f1 ();
++ double d448 = f1 ();
++ double d449 = f1 ();
++ double d450 = f1 ();
++ double d451 = f1 ();
++ double d452 = f1 ();
++ double d453 = f1 ();
++ double d454 = f1 ();
++ double d455 = f1 ();
++ double d456 = f1 ();
++ double d457 = f1 ();
++ double d458 = f1 ();
++ double d459 = f1 ();
++ double d460 = f1 ();
++ double d461 = f1 ();
++ double d462 = f1 ();
++ double d463 = f1 ();
++ double d464 = f1 ();
++ double d465 = f1 ();
++ double d466 = f1 ();
++ double d467 = f1 ();
++ double d468 = f1 ();
++ double d469 = f1 ();
++ double d470 = f1 ();
++ double d471 = f1 ();
++ double d472 = f1 ();
++ double d473 = f1 ();
++ double d474 = f1 ();
++ double d475 = f1 ();
++ double d476 = f1 ();
++ double d477 = f1 ();
++ double d478 = f1 ();
++ double d479 = f1 ();
++ double d480 = f1 ();
++ double d481 = f1 ();
++ double d482 = f1 ();
++ double d483 = f1 ();
++ double d484 = f1 ();
++ double d485 = f1 ();
++ double d486 = f1 ();
++ double d487 = f1 ();
++ double d488 = f1 ();
++ double d489 = f1 ();
++ double d490 = f1 ();
++ double d491 = f1 ();
++ double d492 = f1 ();
++ double d493 = f1 ();
++ double d494 = f1 ();
++ double d495 = f1 ();
++ double d496 = f1 ();
++ double d497 = f1 ();
++ double d498 = f1 ();
++ double d499 = f1 ();
++ double d500 = f1 ();
++ double d501 = f1 ();
++ double d502 = f1 ();
++ double d503 = f1 ();
++ double d504 = f1 ();
++ double d505 = f1 ();
++ double d506 = f1 ();
++ double d507 = f1 ();
++ double d508 = f1 ();
++ double d509 = f1 ();
++ double d510 = f1 ();
++ double d511 = f1 ();
++ double d512 = f1 ();
++ double d513 = f1 ();
++ double d514 = f1 ();
++ double d515 = f1 ();
++ double d516 = f1 ();
++ double d517 = f1 ();
++ double d518 = f1 ();
++ double d519 = f1 ();
++ double d520 = f1 ();
++ double d521 = f1 ();
++ double d522 = f1 ();
++ double d523 = f1 ();
++ double d524 = f1 ();
++ double d525 = f1 ();
++ double d526 = f1 ();
++ double d527 = f1 ();
++ double d528 = f1 ();
++ double d529 = f1 ();
++ double d530 = f1 ();
++ double d531 = f1 ();
++ double d532 = f1 ();
++ double d533 = f1 ();
++ double d534 = f1 ();
++ double d535 = f1 ();
++ double d536 = f1 ();
++ double d537 = f1 ();
++ double d538 = f1 ();
++ double d539 = f1 ();
++ double d540 = f1 ();
++ double d541 = f1 ();
++ double d542 = f1 ();
++ double d543 = f1 ();
++ double d544 = f1 ();
++ double d545 = f1 ();
++ double d546 = f1 ();
++ double d547 = f1 ();
++ double d548 = f1 ();
++ double d549 = f1 ();
++ double d550 = f1 ();
++ double d551 = f1 ();
++ double d552 = f1 ();
++ double d553 = f1 ();
++ double d554 = f1 ();
++ double d555 = f1 ();
++ double d556 = f1 ();
++ double d557 = f1 ();
++ double d558 = f1 ();
++ double d559 = f1 ();
++ double d560 = f1 ();
++ double d561 = f1 ();
++ double d562 = f1 ();
++ double d563 = f1 ();
++ double d564 = f1 ();
++ double d565 = f1 ();
++ double d566 = f1 ();
++ double d567 = f1 ();
++ double d568 = f1 ();
++ double d569 = f1 ();
++ double d570 = f1 ();
++ double d571 = f1 ();
++ double d572 = f1 ();
++ double d573 = f1 ();
++ double d574 = f1 ();
++ double d575 = f1 ();
++ double d576 = f1 ();
++ double d577 = f1 ();
++ double d578 = f1 ();
++ double d579 = f1 ();
++ double d580 = f1 ();
++ double d581 = f1 ();
++ double d582 = f1 ();
++ double d583 = f1 ();
++ double d584 = f1 ();
++ double d585 = f1 ();
++ double d586 = f1 ();
++ double d587 = f1 ();
++ double d588 = f1 ();
++ double d589 = f1 ();
++ double d590 = f1 ();
++ double d591 = f1 ();
++ double d592 = f1 ();
++ double d593 = f1 ();
++ double d594 = f1 ();
++ double d595 = f1 ();
++ double d596 = f1 ();
++ double d597 = f1 ();
++ double d598 = f1 ();
++ double d599 = f1 ();
++ double d600 = f1 ();
++ double d601 = f1 ();
++ double d602 = f1 ();
++ double d603 = f1 ();
++ double d604 = f1 ();
++ double d605 = f1 ();
++ double d606 = f1 ();
++ double d607 = f1 ();
++ double d608 = f1 ();
++ double d609 = f1 ();
++ double d610 = f1 ();
++ double d611 = f1 ();
++ double d612 = f1 ();
++ double d613 = f1 ();
++ double d614 = f1 ();
++ double d615 = f1 ();
++ double d616 = f1 ();
++ double d617 = f1 ();
++ double d618 = f1 ();
++ double d619 = f1 ();
++ double d620 = f1 ();
++ double d621 = f1 ();
++ double d622 = f1 ();
++ double d623 = f1 ();
++ double d624 = f1 ();
++ double d625 = f1 ();
++ double d626 = f1 ();
++ double d627 = f1 ();
++ double d628 = f1 ();
++ double d629 = f1 ();
++ double d630 = f1 ();
++ double d631 = f1 ();
++ double d632 = f1 ();
++ double d633 = f1 ();
++ double d634 = f1 ();
++ double d635 = f1 ();
++ double d636 = f1 ();
++ double d637 = f1 ();
++ double d638 = f1 ();
++ double d639 = f1 ();
++ double d640 = f1 ();
++ double d641 = f1 ();
++ double d642 = f1 ();
++ double d643 = f1 ();
++ double d644 = f1 ();
++ double d645 = f1 ();
++ double d646 = f1 ();
++ double d647 = f1 ();
++ double d648 = f1 ();
++ double d649 = f1 ();
++ double d650 = f1 ();
++ double d651 = f1 ();
++ double d652 = f1 ();
++ double d653 = f1 ();
++ double d654 = f1 ();
++ double d655 = f1 ();
++ double d656 = f1 ();
++ double d657 = f1 ();
++ double d658 = f1 ();
++ double d659 = f1 ();
++ double d660 = f1 ();
++ double d661 = f1 ();
++ double d662 = f1 ();
++ double d663 = f1 ();
++ double d664 = f1 ();
++ double d665 = f1 ();
++ double d666 = f1 ();
++ double d667 = f1 ();
++ double d668 = f1 ();
++ double d669 = f1 ();
++ double d670 = f1 ();
++ double d671 = f1 ();
++ double d672 = f1 ();
++ double d673 = f1 ();
++ double d674 = f1 ();
++ double d675 = f1 ();
++ double d676 = f1 ();
++ double d677 = f1 ();
++ double d678 = f1 ();
++ double d679 = f1 ();
++ double d680 = f1 ();
++ double d681 = f1 ();
++ double d682 = f1 ();
++ double d683 = f1 ();
++ double d684 = f1 ();
++ double d685 = f1 ();
++ double d686 = f1 ();
++ double d687 = f1 ();
++ double d688 = f1 ();
++ double d689 = f1 ();
++ double d690 = f1 ();
++ double d691 = f1 ();
++ double d692 = f1 ();
++ double d693 = f1 ();
++ double d694 = f1 ();
++ double d695 = f1 ();
++ double d696 = f1 ();
++ double d697 = f1 ();
++ double d698 = f1 ();
++ double d699 = f1 ();
++ double d700 = f1 ();
++ double d701 = f1 ();
++ double d702 = f1 ();
++ double d703 = f1 ();
++ double d704 = f1 ();
++ double d705 = f1 ();
++ double d706 = f1 ();
++ double d707 = f1 ();
++ double d708 = f1 ();
++ double d709 = f1 ();
++ double d710 = f1 ();
++ double d711 = f1 ();
++ double d712 = f1 ();
++ double d713 = f1 ();
++ double d714 = f1 ();
++ double d715 = f1 ();
++ double d716 = f1 ();
++ double d717 = f1 ();
++ double d718 = f1 ();
++ double d719 = f1 ();
++ double d720 = f1 ();
++ double d721 = f1 ();
++ double d722 = f1 ();
++ double d723 = f1 ();
++ double d724 = f1 ();
++ double d725 = f1 ();
++ double d726 = f1 ();
++ double d727 = f1 ();
++ double d728 = f1 ();
++ double d729 = f1 ();
++ double d730 = f1 ();
++ double d731 = f1 ();
++ double d732 = f1 ();
++ double d733 = f1 ();
++ double d734 = f1 ();
++ double d735 = f1 ();
++ double d736 = f1 ();
++ double d737 = f1 ();
++ double d738 = f1 ();
++ double d739 = f1 ();
++ double d740 = f1 ();
++ double d741 = f1 ();
++ double d742 = f1 ();
++ double d743 = f1 ();
++ double d744 = f1 ();
++ double d745 = f1 ();
++ double d746 = f1 ();
++ double d747 = f1 ();
++ double d748 = f1 ();
++ double d749 = f1 ();
++ double d750 = f1 ();
++ double d751 = f1 ();
++ double d752 = f1 ();
++ double d753 = f1 ();
++ double d754 = f1 ();
++ double d755 = f1 ();
++ double d756 = f1 ();
++ double d757 = f1 ();
++ double d758 = f1 ();
++ double d759 = f1 ();
++ double d760 = f1 ();
++ double d761 = f1 ();
++ double d762 = f1 ();
++ double d763 = f1 ();
++ double d764 = f1 ();
++ double d765 = f1 ();
++ double d766 = f1 ();
++ double d767 = f1 ();
++ double d768 = f1 ();
++ double d769 = f1 ();
++ double d770 = f1 ();
++ double d771 = f1 ();
++ double d772 = f1 ();
++ double d773 = f1 ();
++ double d774 = f1 ();
++ double d775 = f1 ();
++ double d776 = f1 ();
++ double d777 = f1 ();
++ double d778 = f1 ();
++ double d779 = f1 ();
++ double d780 = f1 ();
++ double d781 = f1 ();
++ double d782 = f1 ();
++ double d783 = f1 ();
++ double d784 = f1 ();
++ double d785 = f1 ();
++ double d786 = f1 ();
++ double d787 = f1 ();
++ double d788 = f1 ();
++ double d789 = f1 ();
++ double d790 = f1 ();
++ double d791 = f1 ();
++ double d792 = f1 ();
++ double d793 = f1 ();
++ double d794 = f1 ();
++ double d795 = f1 ();
++ double d796 = f1 ();
++ double d797 = f1 ();
++ double d798 = f1 ();
++ double d799 = f1 ();
++ double d800 = f1 ();
++ double d801 = f1 ();
++ double d802 = f1 ();
++ double d803 = f1 ();
++ double d804 = f1 ();
++ double d805 = f1 ();
++ double d806 = f1 ();
++ double d807 = f1 ();
++ double d808 = f1 ();
++ double d809 = f1 ();
++ double d810 = f1 ();
++ double d811 = f1 ();
++ double d812 = f1 ();
++ double d813 = f1 ();
++ double d814 = f1 ();
++ double d815 = f1 ();
++ double d816 = f1 ();
++ double d817 = f1 ();
++ double d818 = f1 ();
++ double d819 = f1 ();
++ double d820 = f1 ();
++ double d821 = f1 ();
++ double d822 = f1 ();
++ double d823 = f1 ();
++ double d824 = f1 ();
++ double d825 = f1 ();
++ double d826 = f1 ();
++ double d827 = f1 ();
++ double d828 = f1 ();
++ double d829 = f1 ();
++ double d830 = f1 ();
++ double d831 = f1 ();
++ double d832 = f1 ();
++ double d833 = f1 ();
++ double d834 = f1 ();
++ double d835 = f1 ();
++ double d836 = f1 ();
++ double d837 = f1 ();
++ double d838 = f1 ();
++ double d839 = f1 ();
++ double d840 = f1 ();
++ double d841 = f1 ();
++ double d842 = f1 ();
++ double d843 = f1 ();
++ double d844 = f1 ();
++ double d845 = f1 ();
++ double d846 = f1 ();
++ double d847 = f1 ();
++ double d848 = f1 ();
++ double d849 = f1 ();
++ double d850 = f1 ();
++ double d851 = f1 ();
++ double d852 = f1 ();
++ double d853 = f1 ();
++ double d854 = f1 ();
++ double d855 = f1 ();
++ double d856 = f1 ();
++ double d857 = f1 ();
++ double d858 = f1 ();
++ double d859 = f1 ();
++ double d860 = f1 ();
++ double d861 = f1 ();
++ double d862 = f1 ();
++ double d863 = f1 ();
++ double d864 = f1 ();
++ double d865 = f1 ();
++ double d866 = f1 ();
++ double d867 = f1 ();
++ double d868 = f1 ();
++ double d869 = f1 ();
++ double d870 = f1 ();
++ double d871 = f1 ();
++ double d872 = f1 ();
++ double d873 = f1 ();
++ double d874 = f1 ();
++ double d875 = f1 ();
++ double d876 = f1 ();
++ double d877 = f1 ();
++ double d878 = f1 ();
++ double d879 = f1 ();
++ double d880 = f1 ();
++ double d881 = f1 ();
++ double d882 = f1 ();
++ double d883 = f1 ();
++ double d884 = f1 ();
++ double d885 = f1 ();
++ double d886 = f1 ();
++ double d887 = f1 ();
++ double d888 = f1 ();
++ double d889 = f1 ();
++ double d890 = f1 ();
++ double d891 = f1 ();
++ double d892 = f1 ();
++ double d893 = f1 ();
++ double d894 = f1 ();
++ double d895 = f1 ();
++ double d896 = f1 ();
++ double d897 = f1 ();
++ double d898 = f1 ();
++ double d899 = f1 ();
++ double d900 = f1 ();
++ double d901 = f1 ();
++ double d902 = f1 ();
++ double d903 = f1 ();
++ double d904 = f1 ();
++ double d905 = f1 ();
++ double d906 = f1 ();
++ double d907 = f1 ();
++ double d908 = f1 ();
++ double d909 = f1 ();
++ double d910 = f1 ();
++ double d911 = f1 ();
++ double d912 = f1 ();
++ double d913 = f1 ();
++ double d914 = f1 ();
++ double d915 = f1 ();
++ double d916 = f1 ();
++ double d917 = f1 ();
++ double d918 = f1 ();
++ double d919 = f1 ();
++ double d920 = f1 ();
++ double d921 = f1 ();
++ double d922 = f1 ();
++ double d923 = f1 ();
++ double d924 = f1 ();
++ double d925 = f1 ();
++ double d926 = f1 ();
++ double d927 = f1 ();
++ double d928 = f1 ();
++ double d929 = f1 ();
++ double d930 = f1 ();
++ double d931 = f1 ();
++ double d932 = f1 ();
++ double d933 = f1 ();
++ double d934 = f1 ();
++ double d935 = f1 ();
++ double d936 = f1 ();
++ double d937 = f1 ();
++ double d938 = f1 ();
++ double d939 = f1 ();
++ double d940 = f1 ();
++ double d941 = f1 ();
++ double d942 = f1 ();
++ double d943 = f1 ();
++ double d944 = f1 ();
++ double d945 = f1 ();
++ double d946 = f1 ();
++ double d947 = f1 ();
++ double d948 = f1 ();
++ double d949 = f1 ();
++ double d950 = f1 ();
++ double d951 = f1 ();
++ double d952 = f1 ();
++ double d953 = f1 ();
++ double d954 = f1 ();
++ double d955 = f1 ();
++ double d956 = f1 ();
++ double d957 = f1 ();
++ double d958 = f1 ();
++ double d959 = f1 ();
++ double d960 = f1 ();
++ double d961 = f1 ();
++ double d962 = f1 ();
++ double d963 = f1 ();
++ double d964 = f1 ();
++ double d965 = f1 ();
++ double d966 = f1 ();
++ double d967 = f1 ();
++ double d968 = f1 ();
++ double d969 = f1 ();
++ double d970 = f1 ();
++ double d971 = f1 ();
++ double d972 = f1 ();
++ double d973 = f1 ();
++ double d974 = f1 ();
++ double d975 = f1 ();
++ double d976 = f1 ();
++ double d977 = f1 ();
++ double d978 = f1 ();
++ double d979 = f1 ();
++ double d980 = f1 ();
++ double d981 = f1 ();
++ double d982 = f1 ();
++ double d983 = f1 ();
++ double d984 = f1 ();
++ double d985 = f1 ();
++ double d986 = f1 ();
++ double d987 = f1 ();
++ double d988 = f1 ();
++ double d989 = f1 ();
++ double d990 = f1 ();
++ double d991 = f1 ();
++ double d992 = f1 ();
++ double d993 = f1 ();
++ double d994 = f1 ();
++ double d995 = f1 ();
++ double d996 = f1 ();
++ double d997 = f1 ();
++ double d998 = f1 ();
++ double d999 = f1 ();
++
++ double x = 0;
++ x = f2 (x, d000);
++ x = f2 (x, d001);
++ x = f2 (x, d002);
++ x = f2 (x, d003);
++ x = f2 (x, d004);
++ x = f2 (x, d005);
++ x = f2 (x, d006);
++ x = f2 (x, d007);
++ x = f2 (x, d008);
++ x = f2 (x, d009);
++ x = f2 (x, d010);
++ x = f2 (x, d011);
++ x = f2 (x, d012);
++ x = f2 (x, d013);
++ x = f2 (x, d014);
++ x = f2 (x, d015);
++ x = f2 (x, d016);
++ x = f2 (x, d017);
++ x = f2 (x, d018);
++ x = f2 (x, d019);
++ x = f2 (x, d020);
++ x = f2 (x, d021);
++ x = f2 (x, d022);
++ x = f2 (x, d023);
++ x = f2 (x, d024);
++ x = f2 (x, d025);
++ x = f2 (x, d026);
++ x = f2 (x, d027);
++ x = f2 (x, d028);
++ x = f2 (x, d029);
++ x = f2 (x, d030);
++ x = f2 (x, d031);
++ x = f2 (x, d032);
++ x = f2 (x, d033);
++ x = f2 (x, d034);
++ x = f2 (x, d035);
++ x = f2 (x, d036);
++ x = f2 (x, d037);
++ x = f2 (x, d038);
++ x = f2 (x, d039);
++ x = f2 (x, d040);
++ x = f2 (x, d041);
++ x = f2 (x, d042);
++ x = f2 (x, d043);
++ x = f2 (x, d044);
++ x = f2 (x, d045);
++ x = f2 (x, d046);
++ x = f2 (x, d047);
++ x = f2 (x, d048);
++ x = f2 (x, d049);
++ x = f2 (x, d050);
++ x = f2 (x, d051);
++ x = f2 (x, d052);
++ x = f2 (x, d053);
++ x = f2 (x, d054);
++ x = f2 (x, d055);
++ x = f2 (x, d056);
++ x = f2 (x, d057);
++ x = f2 (x, d058);
++ x = f2 (x, d059);
++ x = f2 (x, d060);
++ x = f2 (x, d061);
++ x = f2 (x, d062);
++ x = f2 (x, d063);
++ x = f2 (x, d064);
++ x = f2 (x, d065);
++ x = f2 (x, d066);
++ x = f2 (x, d067);
++ x = f2 (x, d068);
++ x = f2 (x, d069);
++ x = f2 (x, d070);
++ x = f2 (x, d071);
++ x = f2 (x, d072);
++ x = f2 (x, d073);
++ x = f2 (x, d074);
++ x = f2 (x, d075);
++ x = f2 (x, d076);
++ x = f2 (x, d077);
++ x = f2 (x, d078);
++ x = f2 (x, d079);
++ x = f2 (x, d080);
++ x = f2 (x, d081);
++ x = f2 (x, d082);
++ x = f2 (x, d083);
++ x = f2 (x, d084);
++ x = f2 (x, d085);
++ x = f2 (x, d086);
++ x = f2 (x, d087);
++ x = f2 (x, d088);
++ x = f2 (x, d089);
++ x = f2 (x, d090);
++ x = f2 (x, d091);
++ x = f2 (x, d092);
++ x = f2 (x, d093);
++ x = f2 (x, d094);
++ x = f2 (x, d095);
++ x = f2 (x, d096);
++ x = f2 (x, d097);
++ x = f2 (x, d098);
++ x = f2 (x, d099);
++ x = f2 (x, d100);
++ x = f2 (x, d101);
++ x = f2 (x, d102);
++ x = f2 (x, d103);
++ x = f2 (x, d104);
++ x = f2 (x, d105);
++ x = f2 (x, d106);
++ x = f2 (x, d107);
++ x = f2 (x, d108);
++ x = f2 (x, d109);
++ x = f2 (x, d110);
++ x = f2 (x, d111);
++ x = f2 (x, d112);
++ x = f2 (x, d113);
++ x = f2 (x, d114);
++ x = f2 (x, d115);
++ x = f2 (x, d116);
++ x = f2 (x, d117);
++ x = f2 (x, d118);
++ x = f2 (x, d119);
++ x = f2 (x, d120);
++ x = f2 (x, d121);
++ x = f2 (x, d122);
++ x = f2 (x, d123);
++ x = f2 (x, d124);
++ x = f2 (x, d125);
++ x = f2 (x, d126);
++ x = f2 (x, d127);
++ x = f2 (x, d128);
++ x = f2 (x, d129);
++ x = f2 (x, d130);
++ x = f2 (x, d131);
++ x = f2 (x, d132);
++ x = f2 (x, d133);
++ x = f2 (x, d134);
++ x = f2 (x, d135);
++ x = f2 (x, d136);
++ x = f2 (x, d137);
++ x = f2 (x, d138);
++ x = f2 (x, d139);
++ x = f2 (x, d140);
++ x = f2 (x, d141);
++ x = f2 (x, d142);
++ x = f2 (x, d143);
++ x = f2 (x, d144);
++ x = f2 (x, d145);
++ x = f2 (x, d146);
++ x = f2 (x, d147);
++ x = f2 (x, d148);
++ x = f2 (x, d149);
++ x = f2 (x, d150);
++ x = f2 (x, d151);
++ x = f2 (x, d152);
++ x = f2 (x, d153);
++ x = f2 (x, d154);
++ x = f2 (x, d155);
++ x = f2 (x, d156);
++ x = f2 (x, d157);
++ x = f2 (x, d158);
++ x = f2 (x, d159);
++ x = f2 (x, d160);
++ x = f2 (x, d161);
++ x = f2 (x, d162);
++ x = f2 (x, d163);
++ x = f2 (x, d164);
++ x = f2 (x, d165);
++ x = f2 (x, d166);
++ x = f2 (x, d167);
++ x = f2 (x, d168);
++ x = f2 (x, d169);
++ x = f2 (x, d170);
++ x = f2 (x, d171);
++ x = f2 (x, d172);
++ x = f2 (x, d173);
++ x = f2 (x, d174);
++ x = f2 (x, d175);
++ x = f2 (x, d176);
++ x = f2 (x, d177);
++ x = f2 (x, d178);
++ x = f2 (x, d179);
++ x = f2 (x, d180);
++ x = f2 (x, d181);
++ x = f2 (x, d182);
++ x = f2 (x, d183);
++ x = f2 (x, d184);
++ x = f2 (x, d185);
++ x = f2 (x, d186);
++ x = f2 (x, d187);
++ x = f2 (x, d188);
++ x = f2 (x, d189);
++ x = f2 (x, d190);
++ x = f2 (x, d191);
++ x = f2 (x, d192);
++ x = f2 (x, d193);
++ x = f2 (x, d194);
++ x = f2 (x, d195);
++ x = f2 (x, d196);
++ x = f2 (x, d197);
++ x = f2 (x, d198);
++ x = f2 (x, d199);
++ x = f2 (x, d200);
++ x = f2 (x, d201);
++ x = f2 (x, d202);
++ x = f2 (x, d203);
++ x = f2 (x, d204);
++ x = f2 (x, d205);
++ x = f2 (x, d206);
++ x = f2 (x, d207);
++ x = f2 (x, d208);
++ x = f2 (x, d209);
++ x = f2 (x, d210);
++ x = f2 (x, d211);
++ x = f2 (x, d212);
++ x = f2 (x, d213);
++ x = f2 (x, d214);
++ x = f2 (x, d215);
++ x = f2 (x, d216);
++ x = f2 (x, d217);
++ x = f2 (x, d218);
++ x = f2 (x, d219);
++ x = f2 (x, d220);
++ x = f2 (x, d221);
++ x = f2 (x, d222);
++ x = f2 (x, d223);
++ x = f2 (x, d224);
++ x = f2 (x, d225);
++ x = f2 (x, d226);
++ x = f2 (x, d227);
++ x = f2 (x, d228);
++ x = f2 (x, d229);
++ x = f2 (x, d230);
++ x = f2 (x, d231);
++ x = f2 (x, d232);
++ x = f2 (x, d233);
++ x = f2 (x, d234);
++ x = f2 (x, d235);
++ x = f2 (x, d236);
++ x = f2 (x, d237);
++ x = f2 (x, d238);
++ x = f2 (x, d239);
++ x = f2 (x, d240);
++ x = f2 (x, d241);
++ x = f2 (x, d242);
++ x = f2 (x, d243);
++ x = f2 (x, d244);
++ x = f2 (x, d245);
++ x = f2 (x, d246);
++ x = f2 (x, d247);
++ x = f2 (x, d248);
++ x = f2 (x, d249);
++ x = f2 (x, d250);
++ x = f2 (x, d251);
++ x = f2 (x, d252);
++ x = f2 (x, d253);
++ x = f2 (x, d254);
++ x = f2 (x, d255);
++ x = f2 (x, d256);
++ x = f2 (x, d257);
++ x = f2 (x, d258);
++ x = f2 (x, d259);
++ x = f2 (x, d260);
++ x = f2 (x, d261);
++ x = f2 (x, d262);
++ x = f2 (x, d263);
++ x = f2 (x, d264);
++ x = f2 (x, d265);
++ x = f2 (x, d266);
++ x = f2 (x, d267);
++ x = f2 (x, d268);
++ x = f2 (x, d269);
++ x = f2 (x, d270);
++ x = f2 (x, d271);
++ x = f2 (x, d272);
++ x = f2 (x, d273);
++ x = f2 (x, d274);
++ x = f2 (x, d275);
++ x = f2 (x, d276);
++ x = f2 (x, d277);
++ x = f2 (x, d278);
++ x = f2 (x, d279);
++ x = f2 (x, d280);
++ x = f2 (x, d281);
++ x = f2 (x, d282);
++ x = f2 (x, d283);
++ x = f2 (x, d284);
++ x = f2 (x, d285);
++ x = f2 (x, d286);
++ x = f2 (x, d287);
++ x = f2 (x, d288);
++ x = f2 (x, d289);
++ x = f2 (x, d290);
++ x = f2 (x, d291);
++ x = f2 (x, d292);
++ x = f2 (x, d293);
++ x = f2 (x, d294);
++ x = f2 (x, d295);
++ x = f2 (x, d296);
++ x = f2 (x, d297);
++ x = f2 (x, d298);
++ x = f2 (x, d299);
++ x = f2 (x, d300);
++ x = f2 (x, d301);
++ x = f2 (x, d302);
++ x = f2 (x, d303);
++ x = f2 (x, d304);
++ x = f2 (x, d305);
++ x = f2 (x, d306);
++ x = f2 (x, d307);
++ x = f2 (x, d308);
++ x = f2 (x, d309);
++ x = f2 (x, d310);
++ x = f2 (x, d311);
++ x = f2 (x, d312);
++ x = f2 (x, d313);
++ x = f2 (x, d314);
++ x = f2 (x, d315);
++ x = f2 (x, d316);
++ x = f2 (x, d317);
++ x = f2 (x, d318);
++ x = f2 (x, d319);
++ x = f2 (x, d320);
++ x = f2 (x, d321);
++ x = f2 (x, d322);
++ x = f2 (x, d323);
++ x = f2 (x, d324);
++ x = f2 (x, d325);
++ x = f2 (x, d326);
++ x = f2 (x, d327);
++ x = f2 (x, d328);
++ x = f2 (x, d329);
++ x = f2 (x, d330);
++ x = f2 (x, d331);
++ x = f2 (x, d332);
++ x = f2 (x, d333);
++ x = f2 (x, d334);
++ x = f2 (x, d335);
++ x = f2 (x, d336);
++ x = f2 (x, d337);
++ x = f2 (x, d338);
++ x = f2 (x, d339);
++ x = f2 (x, d340);
++ x = f2 (x, d341);
++ x = f2 (x, d342);
++ x = f2 (x, d343);
++ x = f2 (x, d344);
++ x = f2 (x, d345);
++ x = f2 (x, d346);
++ x = f2 (x, d347);
++ x = f2 (x, d348);
++ x = f2 (x, d349);
++ x = f2 (x, d350);
++ x = f2 (x, d351);
++ x = f2 (x, d352);
++ x = f2 (x, d353);
++ x = f2 (x, d354);
++ x = f2 (x, d355);
++ x = f2 (x, d356);
++ x = f2 (x, d357);
++ x = f2 (x, d358);
++ x = f2 (x, d359);
++ x = f2 (x, d360);
++ x = f2 (x, d361);
++ x = f2 (x, d362);
++ x = f2 (x, d363);
++ x = f2 (x, d364);
++ x = f2 (x, d365);
++ x = f2 (x, d366);
++ x = f2 (x, d367);
++ x = f2 (x, d368);
++ x = f2 (x, d369);
++ x = f2 (x, d370);
++ x = f2 (x, d371);
++ x = f2 (x, d372);
++ x = f2 (x, d373);
++ x = f2 (x, d374);
++ x = f2 (x, d375);
++ x = f2 (x, d376);
++ x = f2 (x, d377);
++ x = f2 (x, d378);
++ x = f2 (x, d379);
++ x = f2 (x, d380);
++ x = f2 (x, d381);
++ x = f2 (x, d382);
++ x = f2 (x, d383);
++ x = f2 (x, d384);
++ x = f2 (x, d385);
++ x = f2 (x, d386);
++ x = f2 (x, d387);
++ x = f2 (x, d388);
++ x = f2 (x, d389);
++ x = f2 (x, d390);
++ x = f2 (x, d391);
++ x = f2 (x, d392);
++ x = f2 (x, d393);
++ x = f2 (x, d394);
++ x = f2 (x, d395);
++ x = f2 (x, d396);
++ x = f2 (x, d397);
++ x = f2 (x, d398);
++ x = f2 (x, d399);
++ x = f2 (x, d400);
++ x = f2 (x, d401);
++ x = f2 (x, d402);
++ x = f2 (x, d403);
++ x = f2 (x, d404);
++ x = f2 (x, d405);
++ x = f2 (x, d406);
++ x = f2 (x, d407);
++ x = f2 (x, d408);
++ x = f2 (x, d409);
++ x = f2 (x, d410);
++ x = f2 (x, d411);
++ x = f2 (x, d412);
++ x = f2 (x, d413);
++ x = f2 (x, d414);
++ x = f2 (x, d415);
++ x = f2 (x, d416);
++ x = f2 (x, d417);
++ x = f2 (x, d418);
++ x = f2 (x, d419);
++ x = f2 (x, d420);
++ x = f2 (x, d421);
++ x = f2 (x, d422);
++ x = f2 (x, d423);
++ x = f2 (x, d424);
++ x = f2 (x, d425);
++ x = f2 (x, d426);
++ x = f2 (x, d427);
++ x = f2 (x, d428);
++ x = f2 (x, d429);
++ x = f2 (x, d430);
++ x = f2 (x, d431);
++ x = f2 (x, d432);
++ x = f2 (x, d433);
++ x = f2 (x, d434);
++ x = f2 (x, d435);
++ x = f2 (x, d436);
++ x = f2 (x, d437);
++ x = f2 (x, d438);
++ x = f2 (x, d439);
++ x = f2 (x, d440);
++ x = f2 (x, d441);
++ x = f2 (x, d442);
++ x = f2 (x, d443);
++ x = f2 (x, d444);
++ x = f2 (x, d445);
++ x = f2 (x, d446);
++ x = f2 (x, d447);
++ x = f2 (x, d448);
++ x = f2 (x, d449);
++ x = f2 (x, d450);
++ x = f2 (x, d451);
++ x = f2 (x, d452);
++ x = f2 (x, d453);
++ x = f2 (x, d454);
++ x = f2 (x, d455);
++ x = f2 (x, d456);
++ x = f2 (x, d457);
++ x = f2 (x, d458);
++ x = f2 (x, d459);
++ x = f2 (x, d460);
++ x = f2 (x, d461);
++ x = f2 (x, d462);
++ x = f2 (x, d463);
++ x = f2 (x, d464);
++ x = f2 (x, d465);
++ x = f2 (x, d466);
++ x = f2 (x, d467);
++ x = f2 (x, d468);
++ x = f2 (x, d469);
++ x = f2 (x, d470);
++ x = f2 (x, d471);
++ x = f2 (x, d472);
++ x = f2 (x, d473);
++ x = f2 (x, d474);
++ x = f2 (x, d475);
++ x = f2 (x, d476);
++ x = f2 (x, d477);
++ x = f2 (x, d478);
++ x = f2 (x, d479);
++ x = f2 (x, d480);
++ x = f2 (x, d481);
++ x = f2 (x, d482);
++ x = f2 (x, d483);
++ x = f2 (x, d484);
++ x = f2 (x, d485);
++ x = f2 (x, d486);
++ x = f2 (x, d487);
++ x = f2 (x, d488);
++ x = f2 (x, d489);
++ x = f2 (x, d490);
++ x = f2 (x, d491);
++ x = f2 (x, d492);
++ x = f2 (x, d493);
++ x = f2 (x, d494);
++ x = f2 (x, d495);
++ x = f2 (x, d496);
++ x = f2 (x, d497);
++ x = f2 (x, d498);
++ x = f2 (x, d499);
++ x = f2 (x, d500);
++ x = f2 (x, d501);
++ x = f2 (x, d502);
++ x = f2 (x, d503);
++ x = f2 (x, d504);
++ x = f2 (x, d505);
++ x = f2 (x, d506);
++ x = f2 (x, d507);
++ x = f2 (x, d508);
++ x = f2 (x, d509);
++ x = f2 (x, d510);
++ x = f2 (x, d511);
++ x = f2 (x, d512);
++ x = f2 (x, d513);
++ x = f2 (x, d514);
++ x = f2 (x, d515);
++ x = f2 (x, d516);
++ x = f2 (x, d517);
++ x = f2 (x, d518);
++ x = f2 (x, d519);
++ x = f2 (x, d520);
++ x = f2 (x, d521);
++ x = f2 (x, d522);
++ x = f2 (x, d523);
++ x = f2 (x, d524);
++ x = f2 (x, d525);
++ x = f2 (x, d526);
++ x = f2 (x, d527);
++ x = f2 (x, d528);
++ x = f2 (x, d529);
++ x = f2 (x, d530);
++ x = f2 (x, d531);
++ x = f2 (x, d532);
++ x = f2 (x, d533);
++ x = f2 (x, d534);
++ x = f2 (x, d535);
++ x = f2 (x, d536);
++ x = f2 (x, d537);
++ x = f2 (x, d538);
++ x = f2 (x, d539);
++ x = f2 (x, d540);
++ x = f2 (x, d541);
++ x = f2 (x, d542);
++ x = f2 (x, d543);
++ x = f2 (x, d544);
++ x = f2 (x, d545);
++ x = f2 (x, d546);
++ x = f2 (x, d547);
++ x = f2 (x, d548);
++ x = f2 (x, d549);
++ x = f2 (x, d550);
++ x = f2 (x, d551);
++ x = f2 (x, d552);
++ x = f2 (x, d553);
++ x = f2 (x, d554);
++ x = f2 (x, d555);
++ x = f2 (x, d556);
++ x = f2 (x, d557);
++ x = f2 (x, d558);
++ x = f2 (x, d559);
++ x = f2 (x, d560);
++ x = f2 (x, d561);
++ x = f2 (x, d562);
++ x = f2 (x, d563);
++ x = f2 (x, d564);
++ x = f2 (x, d565);
++ x = f2 (x, d566);
++ x = f2 (x, d567);
++ x = f2 (x, d568);
++ x = f2 (x, d569);
++ x = f2 (x, d570);
++ x = f2 (x, d571);
++ x = f2 (x, d572);
++ x = f2 (x, d573);
++ x = f2 (x, d574);
++ x = f2 (x, d575);
++ x = f2 (x, d576);
++ x = f2 (x, d577);
++ x = f2 (x, d578);
++ x = f2 (x, d579);
++ x = f2 (x, d580);
++ x = f2 (x, d581);
++ x = f2 (x, d582);
++ x = f2 (x, d583);
++ x = f2 (x, d584);
++ x = f2 (x, d585);
++ x = f2 (x, d586);
++ x = f2 (x, d587);
++ x = f2 (x, d588);
++ x = f2 (x, d589);
++ x = f2 (x, d590);
++ x = f2 (x, d591);
++ x = f2 (x, d592);
++ x = f2 (x, d593);
++ x = f2 (x, d594);
++ x = f2 (x, d595);
++ x = f2 (x, d596);
++ x = f2 (x, d597);
++ x = f2 (x, d598);
++ x = f2 (x, d599);
++ x = f2 (x, d600);
++ x = f2 (x, d601);
++ x = f2 (x, d602);
++ x = f2 (x, d603);
++ x = f2 (x, d604);
++ x = f2 (x, d605);
++ x = f2 (x, d606);
++ x = f2 (x, d607);
++ x = f2 (x, d608);
++ x = f2 (x, d609);
++ x = f2 (x, d610);
++ x = f2 (x, d611);
++ x = f2 (x, d612);
++ x = f2 (x, d613);
++ x = f2 (x, d614);
++ x = f2 (x, d615);
++ x = f2 (x, d616);
++ x = f2 (x, d617);
++ x = f2 (x, d618);
++ x = f2 (x, d619);
++ x = f2 (x, d620);
++ x = f2 (x, d621);
++ x = f2 (x, d622);
++ x = f2 (x, d623);
++ x = f2 (x, d624);
++ x = f2 (x, d625);
++ x = f2 (x, d626);
++ x = f2 (x, d627);
++ x = f2 (x, d628);
++ x = f2 (x, d629);
++ x = f2 (x, d630);
++ x = f2 (x, d631);
++ x = f2 (x, d632);
++ x = f2 (x, d633);
++ x = f2 (x, d634);
++ x = f2 (x, d635);
++ x = f2 (x, d636);
++ x = f2 (x, d637);
++ x = f2 (x, d638);
++ x = f2 (x, d639);
++ x = f2 (x, d640);
++ x = f2 (x, d641);
++ x = f2 (x, d642);
++ x = f2 (x, d643);
++ x = f2 (x, d644);
++ x = f2 (x, d645);
++ x = f2 (x, d646);
++ x = f2 (x, d647);
++ x = f2 (x, d648);
++ x = f2 (x, d649);
++ x = f2 (x, d650);
++ x = f2 (x, d651);
++ x = f2 (x, d652);
++ x = f2 (x, d653);
++ x = f2 (x, d654);
++ x = f2 (x, d655);
++ x = f2 (x, d656);
++ x = f2 (x, d657);
++ x = f2 (x, d658);
++ x = f2 (x, d659);
++ x = f2 (x, d660);
++ x = f2 (x, d661);
++ x = f2 (x, d662);
++ x = f2 (x, d663);
++ x = f2 (x, d664);
++ x = f2 (x, d665);
++ x = f2 (x, d666);
++ x = f2 (x, d667);
++ x = f2 (x, d668);
++ x = f2 (x, d669);
++ x = f2 (x, d670);
++ x = f2 (x, d671);
++ x = f2 (x, d672);
++ x = f2 (x, d673);
++ x = f2 (x, d674);
++ x = f2 (x, d675);
++ x = f2 (x, d676);
++ x = f2 (x, d677);
++ x = f2 (x, d678);
++ x = f2 (x, d679);
++ x = f2 (x, d680);
++ x = f2 (x, d681);
++ x = f2 (x, d682);
++ x = f2 (x, d683);
++ x = f2 (x, d684);
++ x = f2 (x, d685);
++ x = f2 (x, d686);
++ x = f2 (x, d687);
++ x = f2 (x, d688);
++ x = f2 (x, d689);
++ x = f2 (x, d690);
++ x = f2 (x, d691);
++ x = f2 (x, d692);
++ x = f2 (x, d693);
++ x = f2 (x, d694);
++ x = f2 (x, d695);
++ x = f2 (x, d696);
++ x = f2 (x, d697);
++ x = f2 (x, d698);
++ x = f2 (x, d699);
++ x = f2 (x, d700);
++ x = f2 (x, d701);
++ x = f2 (x, d702);
++ x = f2 (x, d703);
++ x = f2 (x, d704);
++ x = f2 (x, d705);
++ x = f2 (x, d706);
++ x = f2 (x, d707);
++ x = f2 (x, d708);
++ x = f2 (x, d709);
++ x = f2 (x, d710);
++ x = f2 (x, d711);
++ x = f2 (x, d712);
++ x = f2 (x, d713);
++ x = f2 (x, d714);
++ x = f2 (x, d715);
++ x = f2 (x, d716);
++ x = f2 (x, d717);
++ x = f2 (x, d718);
++ x = f2 (x, d719);
++ x = f2 (x, d720);
++ x = f2 (x, d721);
++ x = f2 (x, d722);
++ x = f2 (x, d723);
++ x = f2 (x, d724);
++ x = f2 (x, d725);
++ x = f2 (x, d726);
++ x = f2 (x, d727);
++ x = f2 (x, d728);
++ x = f2 (x, d729);
++ x = f2 (x, d730);
++ x = f2 (x, d731);
++ x = f2 (x, d732);
++ x = f2 (x, d733);
++ x = f2 (x, d734);
++ x = f2 (x, d735);
++ x = f2 (x, d736);
++ x = f2 (x, d737);
++ x = f2 (x, d738);
++ x = f2 (x, d739);
++ x = f2 (x, d740);
++ x = f2 (x, d741);
++ x = f2 (x, d742);
++ x = f2 (x, d743);
++ x = f2 (x, d744);
++ x = f2 (x, d745);
++ x = f2 (x, d746);
++ x = f2 (x, d747);
++ x = f2 (x, d748);
++ x = f2 (x, d749);
++ x = f2 (x, d750);
++ x = f2 (x, d751);
++ x = f2 (x, d752);
++ x = f2 (x, d753);
++ x = f2 (x, d754);
++ x = f2 (x, d755);
++ x = f2 (x, d756);
++ x = f2 (x, d757);
++ x = f2 (x, d758);
++ x = f2 (x, d759);
++ x = f2 (x, d760);
++ x = f2 (x, d761);
++ x = f2 (x, d762);
++ x = f2 (x, d763);
++ x = f2 (x, d764);
++ x = f2 (x, d765);
++ x = f2 (x, d766);
++ x = f2 (x, d767);
++ x = f2 (x, d768);
++ x = f2 (x, d769);
++ x = f2 (x, d770);
++ x = f2 (x, d771);
++ x = f2 (x, d772);
++ x = f2 (x, d773);
++ x = f2 (x, d774);
++ x = f2 (x, d775);
++ x = f2 (x, d776);
++ x = f2 (x, d777);
++ x = f2 (x, d778);
++ x = f2 (x, d779);
++ x = f2 (x, d780);
++ x = f2 (x, d781);
++ x = f2 (x, d782);
++ x = f2 (x, d783);
++ x = f2 (x, d784);
++ x = f2 (x, d785);
++ x = f2 (x, d786);
++ x = f2 (x, d787);
++ x = f2 (x, d788);
++ x = f2 (x, d789);
++ x = f2 (x, d790);
++ x = f2 (x, d791);
++ x = f2 (x, d792);
++ x = f2 (x, d793);
++ x = f2 (x, d794);
++ x = f2 (x, d795);
++ x = f2 (x, d796);
++ x = f2 (x, d797);
++ x = f2 (x, d798);
++ x = f2 (x, d799);
++ x = f2 (x, d800);
++ x = f2 (x, d801);
++ x = f2 (x, d802);
++ x = f2 (x, d803);
++ x = f2 (x, d804);
++ x = f2 (x, d805);
++ x = f2 (x, d806);
++ x = f2 (x, d807);
++ x = f2 (x, d808);
++ x = f2 (x, d809);
++ x = f2 (x, d810);
++ x = f2 (x, d811);
++ x = f2 (x, d812);
++ x = f2 (x, d813);
++ x = f2 (x, d814);
++ x = f2 (x, d815);
++ x = f2 (x, d816);
++ x = f2 (x, d817);
++ x = f2 (x, d818);
++ x = f2 (x, d819);
++ x = f2 (x, d820);
++ x = f2 (x, d821);
++ x = f2 (x, d822);
++ x = f2 (x, d823);
++ x = f2 (x, d824);
++ x = f2 (x, d825);
++ x = f2 (x, d826);
++ x = f2 (x, d827);
++ x = f2 (x, d828);
++ x = f2 (x, d829);
++ x = f2 (x, d830);
++ x = f2 (x, d831);
++ x = f2 (x, d832);
++ x = f2 (x, d833);
++ x = f2 (x, d834);
++ x = f2 (x, d835);
++ x = f2 (x, d836);
++ x = f2 (x, d837);
++ x = f2 (x, d838);
++ x = f2 (x, d839);
++ x = f2 (x, d840);
++ x = f2 (x, d841);
++ x = f2 (x, d842);
++ x = f2 (x, d843);
++ x = f2 (x, d844);
++ x = f2 (x, d845);
++ x = f2 (x, d846);
++ x = f2 (x, d847);
++ x = f2 (x, d848);
++ x = f2 (x, d849);
++ x = f2 (x, d850);
++ x = f2 (x, d851);
++ x = f2 (x, d852);
++ x = f2 (x, d853);
++ x = f2 (x, d854);
++ x = f2 (x, d855);
++ x = f2 (x, d856);
++ x = f2 (x, d857);
++ x = f2 (x, d858);
++ x = f2 (x, d859);
++ x = f2 (x, d860);
++ x = f2 (x, d861);
++ x = f2 (x, d862);
++ x = f2 (x, d863);
++ x = f2 (x, d864);
++ x = f2 (x, d865);
++ x = f2 (x, d866);
++ x = f2 (x, d867);
++ x = f2 (x, d868);
++ x = f2 (x, d869);
++ x = f2 (x, d870);
++ x = f2 (x, d871);
++ x = f2 (x, d872);
++ x = f2 (x, d873);
++ x = f2 (x, d874);
++ x = f2 (x, d875);
++ x = f2 (x, d876);
++ x = f2 (x, d877);
++ x = f2 (x, d878);
++ x = f2 (x, d879);
++ x = f2 (x, d880);
++ x = f2 (x, d881);
++ x = f2 (x, d882);
++ x = f2 (x, d883);
++ x = f2 (x, d884);
++ x = f2 (x, d885);
++ x = f2 (x, d886);
++ x = f2 (x, d887);
++ x = f2 (x, d888);
++ x = f2 (x, d889);
++ x = f2 (x, d890);
++ x = f2 (x, d891);
++ x = f2 (x, d892);
++ x = f2 (x, d893);
++ x = f2 (x, d894);
++ x = f2 (x, d895);
++ x = f2 (x, d896);
++ x = f2 (x, d897);
++ x = f2 (x, d898);
++ x = f2 (x, d899);
++ x = f2 (x, d900);
++ x = f2 (x, d901);
++ x = f2 (x, d902);
++ x = f2 (x, d903);
++ x = f2 (x, d904);
++ x = f2 (x, d905);
++ x = f2 (x, d906);
++ x = f2 (x, d907);
++ x = f2 (x, d908);
++ x = f2 (x, d909);
++ x = f2 (x, d910);
++ x = f2 (x, d911);
++ x = f2 (x, d912);
++ x = f2 (x, d913);
++ x = f2 (x, d914);
++ x = f2 (x, d915);
++ x = f2 (x, d916);
++ x = f2 (x, d917);
++ x = f2 (x, d918);
++ x = f2 (x, d919);
++ x = f2 (x, d920);
++ x = f2 (x, d921);
++ x = f2 (x, d922);
++ x = f2 (x, d923);
++ x = f2 (x, d924);
++ x = f2 (x, d925);
++ x = f2 (x, d926);
++ x = f2 (x, d927);
++ x = f2 (x, d928);
++ x = f2 (x, d929);
++ x = f2 (x, d930);
++ x = f2 (x, d931);
++ x = f2 (x, d932);
++ x = f2 (x, d933);
++ x = f2 (x, d934);
++ x = f2 (x, d935);
++ x = f2 (x, d936);
++ x = f2 (x, d937);
++ x = f2 (x, d938);
++ x = f2 (x, d939);
++ x = f2 (x, d940);
++ x = f2 (x, d941);
++ x = f2 (x, d942);
++ x = f2 (x, d943);
++ x = f2 (x, d944);
++ x = f2 (x, d945);
++ x = f2 (x, d946);
++ x = f2 (x, d947);
++ x = f2 (x, d948);
++ x = f2 (x, d949);
++ x = f2 (x, d950);
++ x = f2 (x, d951);
++ x = f2 (x, d952);
++ x = f2 (x, d953);
++ x = f2 (x, d954);
++ x = f2 (x, d955);
++ x = f2 (x, d956);
++ x = f2 (x, d957);
++ x = f2 (x, d958);
++ x = f2 (x, d959);
++ x = f2 (x, d960);
++ x = f2 (x, d961);
++ x = f2 (x, d962);
++ x = f2 (x, d963);
++ x = f2 (x, d964);
++ x = f2 (x, d965);
++ x = f2 (x, d966);
++ x = f2 (x, d967);
++ x = f2 (x, d968);
++ x = f2 (x, d969);
++ x = f2 (x, d970);
++ x = f2 (x, d971);
++ x = f2 (x, d972);
++ x = f2 (x, d973);
++ x = f2 (x, d974);
++ x = f2 (x, d975);
++ x = f2 (x, d976);
++ x = f2 (x, d977);
++ x = f2 (x, d978);
++ x = f2 (x, d979);
++ x = f2 (x, d980);
++ x = f2 (x, d981);
++ x = f2 (x, d982);
++ x = f2 (x, d983);
++ x = f2 (x, d984);
++ x = f2 (x, d985);
++ x = f2 (x, d986);
++ x = f2 (x, d987);
++ x = f2 (x, d988);
++ x = f2 (x, d989);
++ x = f2 (x, d990);
++ x = f2 (x, d991);
++ x = f2 (x, d992);
++ x = f2 (x, d993);
++ x = f2 (x, d994);
++ x = f2 (x, d995);
++ x = f2 (x, d996);
++ x = f2 (x, d997);
++ x = f2 (x, d998);
++ x = f2 (x, d999);
++ return x;
++}
++
++/* { dg-final { scan-rtl-dump-times "Stack clash inline probes" 1 "pro_and_epilogue" } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash residual allocation in prologue" 1 "pro_and_epilogue" } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash not noreturn" 1 "pro_and_epilogue" } } */
++
++/* f3 is not a leaf
++/* { dg-final { scan-rtl-dump-times "Stack clash no frame pointer needed" 1 "pro_and_epilogue" { target { ! frame_pointer_for_non_leaf } } } } */
++/* { dg-final { scan-rtl-dump-times "Stack clash frame pointer needed" 1 "pro_and_epilogue" { target { frame_pointer_for_non_leaf } } } } */
+diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
+index 821cea9cb33..2c669a9822f 100644
+--- a/gcc/testsuite/lib/target-supports.exp
++++ b/gcc/testsuite/lib/target-supports.exp
+@@ -5421,11 +5421,15 @@ proc check_effective_target_autoincdec { } {
+ proc check_effective_target_supports_stack_clash_protection { } {
+
+ # Temporary until the target bits are fully ACK'd.
+-# if { [istarget aarch*-*-*] || [istarget x86_64-*-*]
+-# || [istarget i?86-*-*] || [istarget s390*-*-*]
++# if { [istarget aarch*-*-*]
++# || [istarget s390*-*-*]
+ # || [istarget powerpc*-*-*] || [istarget rs6000*-*-*] } {
+ # return 1
+ # }
++
++ if { [istarget x86_64-*-*] || [istarget i?86-*-*] } {
++ return 1
++ }
+ return 0
+ }
+
diff --git a/SOURCES/gcc48-rh1469697-7.patch b/SOURCES/gcc48-rh1469697-7.patch
new file mode 100644
index 0000000..0a86f92
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-7.patch
@@ -0,0 +1,115 @@
+commit 2bb044f9734259945e2b5048d92bc8d0af707d27
+Author: law
+Date: Wed Sep 20 05:43:28 2017 +0000
+
+ * combine-stack-adj.c (combine_stack_adjustments_for_block): Do
+ nothing for stack adjustments with REG_STACK_CHECK.
+ * sched-deps.c (parse_add_or_inc): Reject insns with
+ REG_STACK_CHECK from dependency breaking.
+ * config/i386/i386.c (pro_epilogue_adjust_stack): Return insn.
+ (ix86_adjust_satck_and_probe_stack_clash): Add REG_STACK_NOTEs.
+ * reg-notes.def (STACK_CHECK): New note.
+
+ * gcc.target/i386/stack-check-11.c: New test.
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@252999 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/combine-stack-adj.c b/gcc/combine-stack-adj.c
+index 0a4d8a51d1d..ee66c28ca35 100644
+--- a/gcc/combine-stack-adj.c
++++ b/gcc/combine-stack-adj.c
+@@ -441,6 +441,8 @@ combine_stack_adjustments_for_block (basic_block bb)
+ continue;
+
+ set = single_set_for_csa (insn);
++ if (set && find_reg_note (insn, REG_STACK_CHECK, NULL_RTX))
++ set = NULL_RTX;
+ if (set)
+ {
+ rtx dest = SET_DEST (set);
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index a07104d304d..a9072f58f50 100644
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
+@@ -9502,7 +9502,7 @@ ix86_add_queued_cfa_restore_notes (rtx insn)
+ zero if %r11 register is live and cannot be freely used and positive
+ otherwise. */
+
+-static void
++static rtx
+ pro_epilogue_adjust_stack (rtx dest, rtx src, rtx offset,
+ int style, bool set_cfa)
+ {
+@@ -9589,6 +9589,7 @@ pro_epilogue_adjust_stack (rtx dest, rtx src, rtx offset,
+ m->fs.sp_offset = ooffset - INTVAL (offset);
+ m->fs.sp_valid = valid;
+ }
++ return insn;
+ }
+
+ /* Find an available register to be used as dynamic realign argument
+@@ -9902,9 +9903,11 @@ ix86_adjust_stack_and_probe_stack_clash (const HOST_WIDE_INT size)
+ for (i = probe_interval; i <= size; i += probe_interval)
+ {
+ /* Allocate PROBE_INTERVAL bytes. */
+- pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx,
+- GEN_INT (-probe_interval), -1,
+- m->fs.cfa_reg == stack_pointer_rtx);
++ rtx insn
++ = pro_epilogue_adjust_stack (stack_pointer_rtx, stack_pointer_rtx,
++ GEN_INT (-PROBE_INTERVAL), -1,
++ m->fs.cfa_reg == stack_pointer_rtx);
++ add_reg_note (insn, REG_STACK_CHECK, const0_rtx);
+
+ /* And probe at *sp. */
+ emit_stack_probe (stack_pointer_rtx);
+diff --git a/gcc/reg-notes.def b/gcc/reg-notes.def
+index db61c092aab..1d7a4356a85 100644
+--- a/gcc/reg-notes.def
++++ b/gcc/reg-notes.def
+@@ -216,3 +216,7 @@ REG_NOTE (ARGS_SIZE)
+ that the return value of a call can be used to reinitialize a
+ pseudo reg. */
+ REG_NOTE (RETURNED)
++
++/* Indicates the instruction is a stack check probe that should not
++ be combined with other stack adjustments. */
++REG_NOTE (STACK_CHECK)
+diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c
+index 4ac2542a3af..75780150e34 100644
+--- a/gcc/sched-deps.c
++++ b/gcc/sched-deps.c
+@@ -4607,6 +4607,11 @@ parse_add_or_inc (struct mem_inc_info *mii, rtx insn, bool before_mem)
+ if (RTX_FRAME_RELATED_P (insn) || !pat)
+ return false;
+
++ /* Do not allow breaking data dependencies for insns that are marked
++ with REG_STACK_CHECK. */
++ if (find_reg_note (insn, REG_STACK_CHECK, NULL))
++ return false;
++
+ /* Result must be single reg. */
+ if (!REG_P (SET_DEST (pat)))
+ return false;
+diff --git a/gcc/testsuite/gcc.target/i386/stack-check-11.c b/gcc/testsuite/gcc.target/i386/stack-check-11.c
+new file mode 100644
+index 00000000000..183103f01e5
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/stack-check-11.c
+@@ -0,0 +1,16 @@
++/* { dg-do compile } */
++/* { dg-options "-O2 -fstack-clash-protection" } */
++/* { dg-require-effective-target supports_stack_clash_protection } */
++
++extern void arf (unsigned long int *, unsigned long int *);
++void
++frob ()
++{
++ unsigned long int num[859];
++ unsigned long int den[859];
++ arf (den, num);
++}
++
++/* { dg-final { scan-assembler-times "subq" 4 } } */
++/* { dg-final { scan-assembler-times "orq" 3 } } */
++
diff --git a/SOURCES/gcc48-rh1469697-8.patch b/SOURCES/gcc48-rh1469697-8.patch
new file mode 100644
index 0000000..1c3cdd6
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-8.patch
@@ -0,0 +1,88 @@
+commit 93ed472702aad6d9b8998592775a0ab4120b6242
+Author: law
+Date: Wed Sep 20 21:59:50 2017 +0000
+
+ * explow.c (compute_stack_clash_protection_loop_data): Use
+ CONST_INT_P instead of explicit test. Verify object is a
+ CONST_INT_P before looking at INTVAL.
+ (anti_adjust_stack_and_probe_stack_clash): Use CONST_INT_P
+ instead of explicit test.
+
+ * gcc.target/i386/stack-check-11.c: Update test and regexp
+ so that it works for both i?86 and x86_64.
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@253034 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/explow.c b/gcc/explow.c
+index 2526e8513b7..d118e0d7782 100644
+--- a/gcc/explow.c
++++ b/gcc/explow.c
+@@ -1778,11 +1778,11 @@ compute_stack_clash_protection_loop_data (rtx *rounded_size, rtx *last_addr,
+ if (*rounded_size == CONST0_RTX (Pmode))
+ fprintf (dump_file,
+ "Stack clash skipped dynamic allocation and probing loop.\n");
+- else if (GET_CODE (*rounded_size) == CONST_INT
++ else if (CONST_INT_P (*rounded_size)
+ && INTVAL (*rounded_size) <= 4 * *probe_interval)
+ fprintf (dump_file,
+ "Stack clash dynamic allocation and probing inline.\n");
+- else if (GET_CODE (*rounded_size) == CONST_INT)
++ else if (CONST_INT_P (*rounded_size))
+ fprintf (dump_file,
+ "Stack clash dynamic allocation and probing in "
+ "rotated loop.\n");
+@@ -1880,7 +1880,8 @@ anti_adjust_stack_and_probe_stack_clash (rtx size)
+
+ if (rounded_size != CONST0_RTX (Pmode))
+ {
+- if (INTVAL (rounded_size) <= 4 * probe_interval)
++ if (CONST_INT_P (rounded_size)
++ && INTVAL (rounded_size) <= 4 * probe_interval)
+ {
+ for (HOST_WIDE_INT i = 0;
+ i < INTVAL (rounded_size);
+@@ -1900,7 +1901,7 @@ anti_adjust_stack_and_probe_stack_clash (rtx size)
+ else
+ {
+ rtx loop_lab, end_loop;
+- bool rotate_loop = GET_CODE (rounded_size) == CONST_INT;
++ bool rotate_loop = CONST_INT_P (rounded_size);
+ emit_stack_clash_protection_probe_loop_start (&loop_lab, &end_loop,
+ last_addr, rotate_loop);
+
+@@ -1938,7 +1939,7 @@ anti_adjust_stack_and_probe_stack_clash (rtx size)
+ might hold live data. So probe at *sp if we know that
+ an allocation was made, otherwise probe into the red zone
+ which is obviously undesirable. */
+- if (GET_CODE (size) == CONST_INT)
++ if (CONST_INT_P (size))
+ {
+ emit_stack_probe (stack_pointer_rtx);
+ emit_insn (gen_blockage ());
+diff --git a/gcc/testsuite/gcc.target/i386/stack-check-11.c b/gcc/testsuite/gcc.target/i386/stack-check-11.c
+index 183103f01e5..fe5b2c2b844 100644
+--- a/gcc/testsuite/gcc.target/i386/stack-check-11.c
++++ b/gcc/testsuite/gcc.target/i386/stack-check-11.c
+@@ -2,15 +2,17 @@
+ /* { dg-options "-O2 -fstack-clash-protection" } */
+ /* { dg-require-effective-target supports_stack_clash_protection } */
+
+-extern void arf (unsigned long int *, unsigned long int *);
++#include
++
++extern void arf (uint64_t *, uint64_t *);
+ void
+ frob ()
+ {
+- unsigned long int num[859];
+- unsigned long int den[859];
++ uint64_t num[859];
++ uint64_t den[859];
+ arf (den, num);
+ }
+
+-/* { dg-final { scan-assembler-times "subq" 4 } } */
+-/* { dg-final { scan-assembler-times "orq" 3 } } */
++/* { dg-final { scan-assembler-times "sub\[ql\]" 4 } } */
++/* { dg-final { scan-assembler-times "or\[ql\]" 3 } } */
+
diff --git a/SOURCES/gcc48-rh1469697-9.patch b/SOURCES/gcc48-rh1469697-9.patch
new file mode 100644
index 0000000..fb2903b
--- /dev/null
+++ b/SOURCES/gcc48-rh1469697-9.patch
@@ -0,0 +1,389 @@
+commit b49f8fb8a97e9af8e6ba2b65d18195099cd1bb79
+Author: law
+Date: Thu Sep 21 04:30:16 2017 +0000
+
+ * config/s390/s390.c (MIN_UNROLL_PROBES): Define.
+ (allocate_stack_space): New function, partially extracted from
+ s390_emit_prologue.
+ (s390_emit_prologue): Track offset to most recent stack probe.
+ Code to allocate space moved into allocate_stack_space.
+ Dump actions when no stack is allocated.
+ (s390_prologue_plus_offset): New function.
+ (s390_emit_stack_probe): Likewise.
+
+ * gcc.dg/stack-check-5.c: Add argument for s390.
+ * lib/target-supports.exp:
+ (check_effective_target_supports_stack_clash_protection): Enable for
+ s390/s390x targets.
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@253049 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
+index 3c04781f947..45998bc7516 100644
+--- a/gcc/config/s390/s390.c
++++ b/gcc/config/s390/s390.c
+@@ -10350,6 +10350,184 @@ s390_emit_stack_tie (void)
+ emit_insn (gen_stack_tie (mem));
+ }
+
++/* Calculate TARGET = REG + OFFSET as s390_emit_prologue would do it.
++ - push too big immediates to the literal pool and annotate the refs
++ - emit frame related notes for stack pointer changes. */
++
++static rtx
++s390_prologue_plus_offset (rtx target, rtx reg, rtx offset, bool frame_related_p)
++{
++ rtx insn;
++ rtx orig_offset = offset;
++
++ gcc_assert (REG_P (target));
++ gcc_assert (REG_P (reg));
++ gcc_assert (CONST_INT_P (offset));
++
++ if (offset == const0_rtx) /* lr/lgr */
++ {
++ insn = emit_move_insn (target, reg);
++ }
++ else if (DISP_IN_RANGE (INTVAL (offset))) /* la */
++ {
++ insn = emit_move_insn (target, gen_rtx_PLUS (Pmode, reg,
++ offset));
++ }
++ else
++ {
++ if (!satisfies_constraint_K (offset) /* ahi/aghi */
++ && (!TARGET_EXTIMM
++ || (!satisfies_constraint_Op (offset) /* alfi/algfi */
++ && !satisfies_constraint_On (offset)))) /* slfi/slgfi */
++ offset = force_const_mem (Pmode, offset);
++
++ if (target != reg)
++ {
++ insn = emit_move_insn (target, reg);
++ RTX_FRAME_RELATED_P (insn) = frame_related_p ? 1 : 0;
++ }
++
++ insn = emit_insn (gen_add2_insn (target, offset));
++
++ if (!CONST_INT_P (offset))
++ {
++ annotate_constant_pool_refs (&PATTERN (insn));
++
++ if (frame_related_p)
++ add_reg_note (insn, REG_FRAME_RELATED_EXPR,
++ gen_rtx_SET (VOIDmode, target,
++ gen_rtx_PLUS (Pmode, target,
++ orig_offset)));
++ }
++ }
++
++ RTX_FRAME_RELATED_P (insn) = frame_related_p ? 1 : 0;
++
++ /* If this is a stack adjustment and we are generating a stack clash
++ prologue, then add a REG_STACK_CHECK note to signal that this insn
++ should be left alone. */
++ if (flag_stack_clash_protection && target == stack_pointer_rtx)
++ add_reg_note (insn, REG_STACK_CHECK, const0_rtx);
++
++ return insn;
++}
++
++/* Emit a compare instruction with a volatile memory access as stack
++ probe. It does not waste store tags and does not clobber any
++ registers apart from the condition code. */
++static void
++s390_emit_stack_probe (rtx addr)
++{
++ rtx tmp = gen_rtx_MEM (Pmode, addr);
++ MEM_VOLATILE_P (tmp) = 1;
++ s390_emit_compare (EQ, gen_rtx_REG (Pmode, 0), tmp);
++ emit_insn (gen_blockage ());
++}
++
++/* Use a runtime loop if we have to emit more probes than this. */
++#define MIN_UNROLL_PROBES 3
++
++/* Allocate SIZE bytes of stack space, using TEMP_REG as a temporary
++ if necessary. LAST_PROBE_OFFSET contains the offset of the closest
++ probe relative to the stack pointer.
++
++ Note that SIZE is negative.
++
++ The return value is true if TEMP_REG has been clobbered. */
++static bool
++allocate_stack_space (rtx size, HOST_WIDE_INT last_probe_offset,
++ rtx temp_reg)
++{
++ bool temp_reg_clobbered_p = false;
++ HOST_WIDE_INT probe_interval
++ = 1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL);
++ HOST_WIDE_INT guard_size
++ = 1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE);
++
++ if (flag_stack_clash_protection)
++ {
++ if (last_probe_offset + -INTVAL (size) < guard_size)
++ dump_stack_clash_frame_info (NO_PROBE_SMALL_FRAME, true);
++ else
++ {
++ rtx offset = GEN_INT (probe_interval - UNITS_PER_LONG);
++ HOST_WIDE_INT rounded_size = -INTVAL (size) & -probe_interval;
++ HOST_WIDE_INT num_probes = rounded_size / probe_interval;
++ HOST_WIDE_INT residual = -INTVAL (size) - rounded_size;
++
++ if (num_probes < MIN_UNROLL_PROBES)
++ {
++ /* Emit unrolled probe statements. */
++
++ for (unsigned int i = 0; i < num_probes; i++)
++ {
++ s390_prologue_plus_offset (stack_pointer_rtx,
++ stack_pointer_rtx,
++ GEN_INT (-probe_interval), true);
++ s390_emit_stack_probe (gen_rtx_PLUS (Pmode,
++ stack_pointer_rtx,
++ offset));
++ }
++ dump_stack_clash_frame_info (PROBE_INLINE, residual != 0);
++ }
++ else
++ {
++ /* Emit a loop probing the pages. */
++
++ rtx loop_start_label = gen_label_rtx ();
++
++ /* From now on temp_reg will be the CFA register. */
++ s390_prologue_plus_offset (temp_reg, stack_pointer_rtx,
++ GEN_INT (-rounded_size), true);
++ emit_label (loop_start_label);
++
++ s390_prologue_plus_offset (stack_pointer_rtx,
++ stack_pointer_rtx,
++ GEN_INT (-probe_interval), false);
++ s390_emit_stack_probe (gen_rtx_PLUS (Pmode,
++ stack_pointer_rtx,
++ offset));
++ emit_cmp_and_jump_insns (stack_pointer_rtx, temp_reg,
++ GT, NULL_RTX,
++ Pmode, 1, loop_start_label);
++
++ /* Without this make_edges ICEes. */
++ JUMP_LABEL (get_last_insn ()) = loop_start_label;
++ LABEL_NUSES (loop_start_label) = 1;
++
++ /* That's going to be a NOP since stack pointer and
++ temp_reg are supposed to be the same here. We just
++ emit it to set the CFA reg back to r15. */
++ s390_prologue_plus_offset (stack_pointer_rtx, temp_reg,
++ const0_rtx, true);
++ temp_reg_clobbered_p = true;
++ dump_stack_clash_frame_info (PROBE_LOOP, residual != 0);
++ }
++
++ /* Handle any residual allocation request. */
++ s390_prologue_plus_offset (stack_pointer_rtx,
++ stack_pointer_rtx,
++ GEN_INT (-residual), true);
++ last_probe_offset += residual;
++ if (last_probe_offset >= probe_interval)
++ s390_emit_stack_probe (gen_rtx_PLUS (Pmode,
++ stack_pointer_rtx,
++ GEN_INT (residual
++ - UNITS_PER_LONG)));
++
++ return temp_reg_clobbered_p;
++ }
++ }
++
++ /* Subtract frame size from stack pointer. */
++ s390_prologue_plus_offset (stack_pointer_rtx,
++ stack_pointer_rtx,
++ size, true);
++
++ return temp_reg_clobbered_p;
++}
++
++
+ /* Expand the prologue into a bunch of separate insns. */
+
+ void
+@@ -10391,6 +10569,19 @@ s390_emit_prologue (void)
+ else
+ temp_reg = gen_rtx_REG (Pmode, 1);
+
++ /* When probing for stack-clash mitigation, we have to track the distance
++ between the stack pointer and closest known reference.
++
++ Most of the time we have to make a worst cast assumption. The
++ only exception is when TARGET_BACKCHAIN is active, in which case
++ we know *sp (offset 0) was written. */
++ HOST_WIDE_INT probe_interval
++ = 1 << PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL);
++ HOST_WIDE_INT last_probe_offset
++ = (TARGET_BACKCHAIN
++ ? (TARGET_PACKED_STACK ? STACK_POINTER_OFFSET - UNITS_PER_LONG : 0)
++ : probe_interval - (STACK_BOUNDARY / UNITS_PER_WORD));
++
+ /* Save call saved gprs. */
+ if (cfun_frame_layout.first_save_gpr != -1)
+ {
+@@ -10400,6 +10591,14 @@ s390_emit_prologue (void)
+ - cfun_frame_layout.first_save_gpr_slot),
+ cfun_frame_layout.first_save_gpr,
+ cfun_frame_layout.last_save_gpr);
++
++ /* This is not 100% correct. If we have more than one register saved,
++ then LAST_PROBE_OFFSET can move even closer to sp. */
++ last_probe_offset
++ = (cfun_frame_layout.gprs_offset +
++ UNITS_PER_LONG * (cfun_frame_layout.first_save_gpr
++ - cfun_frame_layout.first_save_gpr_slot));
++
+ emit_insn (insn);
+ }
+
+@@ -10416,6 +10615,8 @@ s390_emit_prologue (void)
+ if (cfun_fpr_bit_p (i))
+ {
+ save_fpr (stack_pointer_rtx, offset, i + 16);
++ if (offset < last_probe_offset)
++ last_probe_offset = offset;
+ offset += 8;
+ }
+ else if (!TARGET_PACKED_STACK)
+@@ -10429,6 +10630,8 @@ s390_emit_prologue (void)
+ if (cfun_fpr_bit_p (i))
+ {
+ insn = save_fpr (stack_pointer_rtx, offset, i + 16);
++ if (offset < last_probe_offset)
++ last_probe_offset = offset;
+ offset += 8;
+
+ /* If f4 and f6 are call clobbered they are saved due to stdargs and
+@@ -10451,6 +10654,8 @@ s390_emit_prologue (void)
+ if (cfun_fpr_bit_p (i))
+ {
+ insn = save_fpr (stack_pointer_rtx, offset, i + 16);
++ if (offset < last_probe_offset)
++ last_probe_offset = offset;
+
+ RTX_FRAME_RELATED_P (insn) = 1;
+ offset -= 8;
+@@ -10470,10 +10675,11 @@ s390_emit_prologue (void)
+ if (cfun_frame_layout.frame_size > 0)
+ {
+ rtx frame_off = GEN_INT (-cfun_frame_layout.frame_size);
+- rtx real_frame_off;
++ rtx stack_pointer_backup_loc;
++ bool temp_reg_clobbered_p;
+
+ if (s390_stack_size)
+- {
++ {
+ HOST_WIDE_INT stack_guard;
+
+ if (s390_stack_guard)
+@@ -10538,35 +10744,36 @@ s390_emit_prologue (void)
+ if (s390_warn_dynamicstack_p && cfun->calls_alloca)
+ warning (0, "%qs uses dynamic stack allocation", current_function_name ());
+
+- /* Save incoming stack pointer into temp reg. */
+- if (TARGET_BACKCHAIN || next_fpr)
+- insn = emit_insn (gen_move_insn (temp_reg, stack_pointer_rtx));
++ /* Save the location where we could backup the incoming stack
++ pointer. */
++ stack_pointer_backup_loc = get_last_insn ();
+
+- /* Subtract frame size from stack pointer. */
++ temp_reg_clobbered_p = allocate_stack_space (frame_off, last_probe_offset,
++ temp_reg);
+
+- if (DISP_IN_RANGE (INTVAL (frame_off)))
+- {
+- insn = gen_rtx_SET (VOIDmode, stack_pointer_rtx,
+- gen_rtx_PLUS (Pmode, stack_pointer_rtx,
+- frame_off));
+- insn = emit_insn (insn);
+- }
+- else
++ if (TARGET_BACKCHAIN || next_fpr)
+ {
+- if (!CONST_OK_FOR_K (INTVAL (frame_off)))
+- frame_off = force_const_mem (Pmode, frame_off);
+-
+- insn = emit_insn (gen_add2_insn (stack_pointer_rtx, frame_off));
+- annotate_constant_pool_refs (&PATTERN (insn));
++ if (temp_reg_clobbered_p)
++ {
++ /* allocate_stack_space had to make use of temp_reg and
++ we need it to hold a backup of the incoming stack
++ pointer. Calculate back that value from the current
++ stack pointer. */
++ s390_prologue_plus_offset (temp_reg, stack_pointer_rtx,
++ GEN_INT (cfun_frame_layout.frame_size),
++ false);
++ }
++ else
++ {
++ /* allocate_stack_space didn't actually required
++ temp_reg. Insert the stack pointer backup insn
++ before the stack pointer decrement code - knowing now
++ that the value will survive. */
++ emit_insn_after (gen_move_insn (temp_reg, stack_pointer_rtx),
++ stack_pointer_backup_loc);
++ }
+ }
+
+- RTX_FRAME_RELATED_P (insn) = 1;
+- real_frame_off = GEN_INT (-cfun_frame_layout.frame_size);
+- add_reg_note (insn, REG_FRAME_RELATED_EXPR,
+- gen_rtx_SET (VOIDmode, stack_pointer_rtx,
+- gen_rtx_PLUS (Pmode, stack_pointer_rtx,
+- real_frame_off)));
+-
+ /* Set backchain. */
+
+ if (TARGET_BACKCHAIN)
+@@ -10590,6 +10797,8 @@ s390_emit_prologue (void)
+ emit_clobber (addr);
+ }
+ }
++ else if (flag_stack_clash_protection)
++ dump_stack_clash_frame_info (NO_PROBE_NO_FRAME, false);
+
+ /* Save fprs 8 - 15 (64 bit ABI). */
+
+diff --git a/gcc/testsuite/gcc.dg/stack-check-5.c b/gcc/testsuite/gcc.dg/stack-check-5.c
+index 2171d9b6c23..3178f5d8ce5 100644
+--- a/gcc/testsuite/gcc.dg/stack-check-5.c
++++ b/gcc/testsuite/gcc.dg/stack-check-5.c
+@@ -3,6 +3,10 @@
+ /* { dg-require-effective-target supports_stack_clash_protection } */
+
+
++/* Otherwise the S/390 back-end might save the stack pointer in f2 ()
++ into an FPR. */
++/* { dg-additional-options "-msoft-float" { target { s390x-*-* } } } */
++
+ extern void foo (char *);
+ extern void bar (void);
+
+diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
+index 2c669a9822f..f24c5c6e0ac 100644
+--- a/gcc/testsuite/lib/target-supports.exp
++++ b/gcc/testsuite/lib/target-supports.exp
+@@ -5422,12 +5422,12 @@ proc check_effective_target_supports_stack_clash_protection { } {
+
+ # Temporary until the target bits are fully ACK'd.
+ # if { [istarget aarch*-*-*]
+-# || [istarget s390*-*-*]
+ # || [istarget powerpc*-*-*] || [istarget rs6000*-*-*] } {
+ # return 1
+ # }
+
+- if { [istarget x86_64-*-*] || [istarget i?86-*-*] } {
++ if { [istarget x86_64-*-*] || [istarget i?86-*-*]
++ || [istarget s390*-*-*] } {
+ return 1
+ }
+ return 0
diff --git a/SOURCES/gcc48-rh1482762.patch b/SOURCES/gcc48-rh1482762.patch
new file mode 100644
index 0000000..bb570d4
--- /dev/null
+++ b/SOURCES/gcc48-rh1482762.patch
@@ -0,0 +1,53 @@
+2017-03-25 Uros Bizjak
+
+ PR target/80180
+ * config/i386/i386.c (ix86_expand_builtin)
+ : Do not expand arg0 between
+ flags reg setting and flags reg using instructions.
+ : Ditto. Use non-flags reg
+ clobbering instructions to zero extend op2.
+
+--- gcc/config/i386/i386.c (revision 246478)
++++ gcc/config/i386/i386.c (revision 246479)
+@@ -39533,9 +39533,6 @@
+ mode0 = DImode;
+
+ rdrand_step:
+- op0 = gen_reg_rtx (mode0);
+- emit_insn (GEN_FCN (icode) (op0));
+-
+ arg0 = CALL_EXPR_ARG (exp, 0);
+ op1 = expand_normal (arg0);
+ if (!address_operand (op1, VOIDmode))
+@@ -39543,6 +39540,10 @@
+ op1 = convert_memory_address (Pmode, op1);
+ op1 = copy_addr_to_reg (op1);
+ }
++
++ op0 = gen_reg_rtx (mode0);
++ emit_insn (GEN_FCN (icode) (op0));
++
+ emit_move_insn (gen_rtx_MEM (mode0, op1), op0);
+
+ op1 = gen_reg_rtx (SImode);
+@@ -39584,9 +39597,6 @@
+ mode0 = DImode;
+
+ rdseed_step:
+- op0 = gen_reg_rtx (mode0);
+- emit_insn (GEN_FCN (icode) (op0));
+-
+ arg0 = CALL_EXPR_ARG (exp, 0);
+ op1 = expand_normal (arg0);
+ if (!address_operand (op1, VOIDmode))
+@@ -39594,6 +39604,10 @@
+ op1 = convert_memory_address (Pmode, op1);
+ op1 = copy_addr_to_reg (op1);
+ }
++
++ op0 = gen_reg_rtx (mode0);
++ emit_insn (GEN_FCN (icode) (op0));
++
+ emit_move_insn (gen_rtx_MEM (mode0, op1), op0);
+
+ op2 = gen_reg_rtx (QImode);
diff --git a/SOURCES/gcc48-rh1487434.patch b/SOURCES/gcc48-rh1487434.patch
new file mode 100644
index 0000000..5295ce6
--- /dev/null
+++ b/SOURCES/gcc48-rh1487434.patch
@@ -0,0 +1,49 @@
+2016-05-04 Alan Modra
+
+ * config/rs6000/rs6000.c (rs6000_elf_output_toc_section_asm_op):
+ Align .toc.
+
+--- gcc/config/rs6000/rs6000.c
++++ gcc/config/rs6000/rs6000.c
+@@ -31339,8 +31339,8 @@ rs6000_elf_output_toc_section_asm_op (const void *data ATTRIBUTE_UNUSED)
+ {
+ if (!toc_initialized)
+ {
+- toc_initialized = 1;
+ fprintf (asm_out_file, "%s\n", TOC_SECTION_ASM_OP);
++ ASM_OUTPUT_ALIGN (asm_out_file, TARGET_64BIT ? 3 : 2);
+ (*targetm.asm_out.internal_label) (asm_out_file, "LCTOC", 0);
+ fprintf (asm_out_file, "\t.tc ");
+ ASM_OUTPUT_INTERNAL_LABEL_PREFIX (asm_out_file, "LCTOC1[TC],");
+@@ -31348,20 +31348,30 @@ rs6000_elf_output_toc_section_asm_op (const void *data ATTRIBUTE_UNUSED)
+ fprintf (asm_out_file, "\n");
+
+ fprintf (asm_out_file, "%s\n", MINIMAL_TOC_SECTION_ASM_OP);
++ ASM_OUTPUT_ALIGN (asm_out_file, TARGET_64BIT ? 3 : 2);
+ ASM_OUTPUT_INTERNAL_LABEL_PREFIX (asm_out_file, "LCTOC1");
+ fprintf (asm_out_file, " = .+32768\n");
++ toc_initialized = 1;
+ }
+ else
+ fprintf (asm_out_file, "%s\n", MINIMAL_TOC_SECTION_ASM_OP);
+ }
+ else if ((DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_ELFv2)
+ && !TARGET_RELOCATABLE)
+- fprintf (asm_out_file, "%s\n", TOC_SECTION_ASM_OP);
++ {
++ fprintf (asm_out_file, "%s\n", TOC_SECTION_ASM_OP);
++ if (!toc_initialized)
++ {
++ ASM_OUTPUT_ALIGN (asm_out_file, TARGET_64BIT ? 3 : 2);
++ toc_initialized = 1;
++ }
++ }
+ else
+ {
+ fprintf (asm_out_file, "%s\n", MINIMAL_TOC_SECTION_ASM_OP);
+ if (!toc_initialized)
+ {
++ ASM_OUTPUT_ALIGN (asm_out_file, TARGET_64BIT ? 3 : 2);
+ ASM_OUTPUT_INTERNAL_LABEL_PREFIX (asm_out_file, "LCTOC1");
+ fprintf (asm_out_file, " = .+32768\n");
+ toc_initialized = 1;
diff --git a/SOURCES/gcc48-rh1491395.patch b/SOURCES/gcc48-rh1491395.patch
new file mode 100644
index 0000000..f0a8bb4
--- /dev/null
+++ b/SOURCES/gcc48-rh1491395.patch
@@ -0,0 +1,177 @@
+2016-01-16 Torvald Riegel
+
+ * method-gl.cc (gl_wt_dispatch::trycommit): Ensure proxy privatization
+ safety.
+ * method-ml.cc (ml_wt_dispatch::trycommit): Likewise.
+ * libitm/testsuite/libitm.c/priv-1.c: New.
+
+--- libitm/method-gl.cc
++++ libitm/method-gl.cc
+@@ -291,12 +291,18 @@ public:
+ // See begin_or_restart() for why we need release memory order here.
+ v = gl_mg::clear_locked(v) + 1;
+ o_gl_mg.orec.store(v, memory_order_release);
+-
+- // Need to ensure privatization safety. Every other transaction must
+- // have a snapshot time that is at least as high as our commit time
+- // (i.e., our commit must be visible to them).
+- priv_time = v;
+ }
++
++ // Need to ensure privatization safety. Every other transaction must have
++ // a snapshot time that is at least as high as our commit time (i.e., our
++ // commit must be visible to them). Because of proxy privatization, we
++ // must ensure that even if we are a read-only transaction. See
++ // ml_wt_dispatch::trycommit() for details: We can't get quite the same
++ // set of problems because we just use one orec and thus, for example,
++ // there cannot be concurrent writers -- but we can still get pending
++ // loads to privatized data when not ensuring privatization safety, which
++ // is problematic if the program unmaps the privatized memory.
++ priv_time = v;
+ return true;
+ }
+
+--- libitm/method-ml.cc
++++ libitm/method-ml.cc
+@@ -513,6 +513,21 @@ public:
+ if (!tx->writelog.size())
+ {
+ tx->readlog.clear();
++ // We still need to ensure privatization safety, unfortunately. While
++ // we cannot have privatized anything by ourselves (because we are not
++ // an update transaction), we can have observed the commits of
++ // another update transaction that privatized something. Because any
++ // commit happens before ensuring privatization, our snapshot and
++ // commit can thus have happened before ensuring privatization safety
++ // for this commit/snapshot time. Therefore, before we can return to
++ // nontransactional code that might use the privatized data, we must
++ // ensure privatization safety for our snapshot time.
++ // This still seems to be better than not allowing use of the
++ // snapshot time before privatization safety has been ensured because
++ // we at least can run transactions such as this one, and in the
++ // meantime the transaction producing this commit time might have
++ // finished ensuring privatization safety for it.
++ priv_time = tx->shared_state.load(memory_order_relaxed);
+ return true;
+ }
+
+--- /dev/null
++++ libitm/testsuite/libitm.c/priv-1.c
+@@ -0,0 +1,117 @@
++/* Quick stress test for proxy privatization. */
++
++/* We need to use a TM method that has to enforce privatization safety
++ explicitly. */
++/* { dg-set-target-env-var ITM_DEFAULT_METHOD "ml_wt" } */
++/* { dg-options "-std=gnu11" } */
++
++#include