path: root/ndkrepo-aarch64-host.patch

project ndk/
diff --git a/build/lib/build_support.py b/build/lib/build_support.py
index d81efa2..8e6a31d 100644
--- a/build/lib/build_support.py
+++ b/build/lib/build_support.py
@@ -17,6 +17,7 @@ import argparse
 import datetime
 import multiprocessing
 import os
+import platform
 import shutil
 import subprocess
 import sys
@@ -200,7 +201,7 @@ def get_default_host():
 
 def host_to_tag(host):
     if host in ['darwin', 'linux']:
-        return host + '-x86_64'
+        return host + '-' + platform.machine()
     elif host == 'windows':
         return 'windows'
     elif host == 'windows64':
diff --git a/build/tools/prebuilt-common.sh b/build/tools/prebuilt-common.sh
index 106b661..f358d96 100644
--- a/build/tools/prebuilt-common.sh
+++ b/build/tools/prebuilt-common.sh
@@ -836,22 +836,38 @@ EOF
     fi
     $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=$BINPREFIX --dst-prefix="$DST_PREFIX" "$CROSS_WRAP_DIR" \
         --cflags="$HOST_CFLAGS" --cxxflags="$HOST_CFLAGS" --ldflags="$HOST_LDFLAGS"
-    # generate wrappers for BUILD toolchain
-    # this is required for mingw/darwin build to avoid tools canadian cross configuration issues
-    # 32-bit BUILD toolchain
-    LEGACY_TOOLCHAIN_DIR="$ANDROID_BUILD_TOP/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8"
-    $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=i386-linux-gnu- \
-            --cflags="-m32" --cxxflags="-m32" --ldflags="-m elf_i386" --asflags="--32" \
-            --dst-prefix="$LEGACY_TOOLCHAIN_DIR/bin/x86_64-linux-" "$CROSS_WRAP_DIR"
-    $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=i386-pc-linux-gnu- \
-            --cflags="-m32" --cxxflags="-m32" --ldflags="-m elf_i386" --asflags="--32" \
-            --dst-prefix="$LEGACY_TOOLCHAIN_DIR/bin/x86_64-linux-" "$CROSS_WRAP_DIR"
-    # 64-bit BUILD toolchain.  libbfd is still built in 32-bit.
-    $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=x86_64-linux-gnu- \
-            --dst-prefix="$LEGACY_TOOLCHAIN_DIR/bin/x86_64-linux-" "$CROSS_WRAP_DIR"
-    $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=x86_64-pc-linux-gnu- \
-            --dst-prefix="$LEGACY_TOOLCHAIN_DIR/bin/x86_64-linux-" "$CROSS_WRAP_DIR"
-    fail_panic "Could not create $DEBIAN_NAME wrapper toolchain in $CROSS_WRAP_DIR"
+    if [ "`uname -m`" = "aarch64" ]; then
+        LEGACY_TOOLCHAIN_DIR="$ANDROID_BUILD_TOP/prebuilts/gcc/linux-aarch64/host/aarch64-linux-glibc2.11-4.8"
+        $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=arm-linux-gnu- \
+                --cflags="-m32" --cxxflags="-m32" --ldflags="-m armelf_linux_eabi" --asflags="--32" \
+                --dst-prefix="$LEGACY_TOOLCHAIN_DIR/bin/x86_64-linux-" "$CROSS_WRAP_DIR"
+        $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=arm-linux-gnu- \
+                --cflags="-m32" --cxxflags="-m32" --ldflags="-m armelf_linux_eabi" --asflags="--32" \
+                --dst-prefix="$LEGACY_TOOLCHAIN_DIR/bin/x86_64-linux-" "$CROSS_WRAP_DIR"
+        # 64-bit BUILD toolchain.  libbfd is still built in 32-bit.
+        $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=aarch64-linux-gnu- \
+                --dst-prefix="$LEGACY_TOOLCHAIN_DIR/bin/aarch64-linux-" "$CROSS_WRAP_DIR"
+        $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=aarch64-linux-gnu- \
+                --dst-prefix="$LEGACY_TOOLCHAIN_DIR/bin/aarch64-linux-" "$CROSS_WRAP_DIR"
+        fail_panic "Could not create $DEBIAN_NAME wrapper toolchain in $CROSS_WRAP_DIR"
+    else
+        # generate wrappers for BUILD toolchain
+        # this is required for mingw/darwin build to avoid tools canadian cross configuration issues
+        # 32-bit BUILD toolchain
+        LEGACY_TOOLCHAIN_DIR="$ANDROID_BUILD_TOP/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8"
+        $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=i386-linux-gnu- \
+                --cflags="-m32" --cxxflags="-m32" --ldflags="-m elf_i386" --asflags="--32" \
+                --dst-prefix="$LEGACY_TOOLCHAIN_DIR/bin/x86_64-linux-" "$CROSS_WRAP_DIR"
+        $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=i386-pc-linux-gnu- \
+                --cflags="-m32" --cxxflags="-m32" --ldflags="-m elf_i386" --asflags="--32" \
+                --dst-prefix="$LEGACY_TOOLCHAIN_DIR/bin/x86_64-linux-" "$CROSS_WRAP_DIR"
+        # 64-bit BUILD toolchain.  libbfd is still built in 32-bit.
+        $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=x86_64-linux-gnu- \
+                --dst-prefix="$LEGACY_TOOLCHAIN_DIR/bin/x86_64-linux-" "$CROSS_WRAP_DIR"
+        $NDK_BUILDTOOLS_PATH/gen-toolchain-wrapper.sh --src-prefix=x86_64-pc-linux-gnu- \
+                --dst-prefix="$LEGACY_TOOLCHAIN_DIR/bin/x86_64-linux-" "$CROSS_WRAP_DIR"
+        fail_panic "Could not create $DEBIAN_NAME wrapper toolchain in $CROSS_WRAP_DIR"
+    fi
 
     export PATH=$CROSS_WRAP_DIR:$PATH
     dump "Using $DEBIAN_NAME wrapper: $CROSS_WRAP_DIR/${BINPREFIX}gcc"
@@ -918,8 +934,15 @@ prepare_common_build ()
     if [ -z "$CC" ]; then
         LEGACY_TOOLCHAIN_DIR=
         if [ "$HOST_OS" = "linux" ]; then
-            LEGACY_TOOLCHAIN_DIR="$ANDROID_BUILD_TOP/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8/bin"
-            LEGACY_TOOLCHAIN_PREFIX="$LEGACY_TOOLCHAIN_DIR/x86_64-linux-"
+            if [ "$HOST_ARCH" = "aarch64" ]; then
+                # No prebuilt toolchain for aarch64 hosts yet, let's use the system compiler
+                log "Using system compiler for $HOST_ARCH $HOST_OS"
+                CC=gcc
+                CXX=g++
+            else
+                LEGACY_TOOLCHAIN_DIR="$ANDROID_BUILD_TOP/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8/bin"
+                LEGACY_TOOLCHAIN_PREFIX="$LEGACY_TOOLCHAIN_DIR/x86_64-linux-"
+            fi
         elif [ "$HOST_OS" = "darwin" ]; then
             LEGACY_TOOLCHAIN_DIR="$ANDROID_BUILD_TOP/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1/bin"
             LEGACY_TOOLCHAIN_PREFIX="$LEGACY_TOOLCHAIN_DIR/i686-apple-darwin10-"
@@ -1014,6 +1037,9 @@ prepare_abi_configure_build ()
         linux-x86_64)
             ABI_CONFIGURE_BUILD=x86_64-linux-gnu
             ;;
+        linux-aarch64)
+            ABI_CONFIGURE_BUILD=aarch64-linux-gnu
+            ;;
         darwin-x86)
             ABI_CONFIGURE_BUILD=i686-apple-darwin
             ;;
@@ -1038,7 +1064,11 @@ prepare_target_build ()
     ABI_CONFIGURE_HOST="$ABI_CONFIGURE_BUILD"
 
     prepare_common_build
-    HOST_GMP_ABI=$HOST_BITS
+    if [ "$HOST_ARCH" = "aarch64" ]; then
+        HOST_GMP_ABI=standard
+    else
+        HOST_GMP_ABI=$HOST_BITS
+    fi
 
     # Now handle the --mingw/--darwin flag
     if [ "$MINGW" = "yes" -o "$DARWIN" = "yes" ] ; then
diff --git a/scripts/gen_release_table.py b/scripts/gen_release_table.py
index a600536..d800f50 100755
--- a/scripts/gen_release_table.py
+++ b/scripts/gen_release_table.py
@@ -77,6 +77,7 @@ def main():
         pretty_host = {
             'darwin-x86_64': 'Mac OS X',
             'linux-x86_64': 'Linux',
+            'linux-aarch64': 'Linux for ARMv8',
             'windows-x86_64': 'Windows 64-bit',
             'windows-x86': 'Windows 32-bit',
         }[host]
project toolchain/build/
diff --git a/Makefile.in b/Makefile.in
index 21f33d7..dab823e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -409,7 +409,7 @@ config-target-gcc: stmp-config-target-gcc
 
 GCC_CONFIG_ARGS=--prefix=$(prefix) \
 	  --target=${cur_target} --host=${cur_host} --build=${cur_build} \
-	  --with-gnu-as --with-gnu-ld --enable-languages=c,c++
+	  --with-gnu-as --with-gnu-ld --enable-languages=c,c++,fortran,objc,obj-c++
 
 # For gcc versions 4.3.0 and later, gmp and mpfr are required.
 # Also build libgcc is a seperate sub-target in 4.3.0+.
diff --git a/configure b/configure
index 738b57a..1558809 100755
--- a/configure
+++ b/configure
@@ -2659,6 +2659,8 @@ if test \( ! -d $srcdir/../$tool/ppl-${PPL_VERSION} \) -a \( x"$version" != x"no
     mkdir -p temp-src && tar -C temp-src -xzf $srcdir/../$tool/ppl-${PPL_VERSION}.tgz
   elif test -f $srcdir/../$tool/ppl-${PPL_VERSION}.tar.bz2 ; then
     mkdir -p temp-src && tar -C temp-src -xjf $srcdir/../$tool/ppl-${PPL_VERSION}.tar.bz2
+  elif test -f $srcdir/../$tool/ppl-${PPL_VERSION}.tar.xz ; then
+    mkdir -p temp-src && tar -C temp-src -xJf $srcdir/../$tool/ppl-${PPL_VERSION}.tar.xz
   elif test -f $srcdir/../tarballs/ppl-${PPL_VERSION}.tar ; then
     mkdir -p temp-src && tar -C temp-src -xf $srcdir/../tarballs/ppl-${PPL_VERSION}.tar
   elif test -f $srcdir/../tarballs/ppl-${PPL_VERSION}.tar.gz ; then
@@ -2667,6 +2669,8 @@ if test \( ! -d $srcdir/../$tool/ppl-${PPL_VERSION} \) -a \( x"$version" != x"no
     mkdir -p temp-src && tar -C temp-src -xzf $srcdir/../tarballs/ppl-${PPL_VERSION}.tgz
   elif test -f $srcdir/../tarballs/ppl-${PPL_VERSION}.tar.bz2 ; then
     mkdir -p temp-src && tar -C temp-src -xjf $srcdir/../tarballs/ppl-${PPL_VERSION}.tar.bz2
+  elif test -f $srcdir/../tarballs/ppl-${PPL_VERSION}.tar.xz ; then
+    mkdir -p temp-src && tar -C temp-src -xJf $srcdir/../tarballs/ppl-${PPL_VERSION}.tar.xz
   else
     as_fn_error "'package ppl-${PPL_VERSION} does not exist.'" "$LINENO" 5
   fi
diff --git a/configure.ac b/configure.ac
index b316a7e..6b2acff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,6 +268,8 @@ if test \( ! -d $srcdir/../$tool/$1 \) -a \( x"$version" != x"none"  \) ; then
     mkdir -p temp-src && tar -C temp-src -xzf $srcdir/../$tool/$1.tgz
   elif test -f $srcdir/../$tool/$1.tar.bz2 ; then
     mkdir -p temp-src && tar -C temp-src -xjf $srcdir/../$tool/$1.tar.bz2
+  elif test -f $srcdir/../$tool/$1.tar.xz ; then
+    mkdir -p temp-src && tar -C temp-src -xJf $srcdir/../$tool/$1.tar.xz
   elif test -f $srcdir/../tarballs/$1.tar ; then
     mkdir -p temp-src && tar -C temp-src -xf $srcdir/../tarballs/$1.tar
   elif test -f $srcdir/../tarballs/$1.tar.gz ; then
@@ -276,6 +278,8 @@ if test \( ! -d $srcdir/../$tool/$1 \) -a \( x"$version" != x"none"  \) ; then
     mkdir -p temp-src && tar -C temp-src -xzf $srcdir/../tarballs/$1.tgz
   elif test -f $srcdir/../tarballs/$1.tar.bz2 ; then
     mkdir -p temp-src && tar -C temp-src -xjf $srcdir/../tarballs/$1.tar.bz2
+  elif test -f $srcdir/../tarballs/$1.tar.xz ; then
+    mkdir -p temp-src && tar -C temp-src -xJf $srcdir/../tarballs/$1.tar.xz
   else
     AC_MSG_ERROR('package $1 does not exist.')
   fi
project toolchain/gcc/
diff --git a/build-gcc.sh b/build-gcc.sh
index 4893461..4a821d7 100755
--- a/build-gcc.sh
+++ b/build-gcc.sh
@@ -70,7 +70,7 @@ register_var_option "--ppl-version=<version>" PPL_VERSION "Specify ppl version"
 PACKAGE_DIR=
 register_var_option "--package-dir=<path>" PACKAGE_DIR "Create archive tarball in specific directory"
 
-ENABLE_LANGUAGES="c,c++"
+ENABLE_LANGUAGES="c,c++,fortran,objc,obj-c++"
 register_var_option "--enable-languages=<name>" ENABLE_LANGUAGES "Experimental: specify which languages to build"
 
 BUILD_DEBUGGABLE="no"
diff --git a/gcc-4.9/gcc/graphite-clast-to-gimple.c b/gcc-4.9/gcc/graphite-clast-to-gimple.c
index 134388c..4317989 100644
--- a/gcc-4.9/gcc/graphite-clast-to-gimple.c
+++ b/gcc-4.9/gcc/graphite-clast-to-gimple.c
@@ -28,6 +28,8 @@ along with GCC; see the file COPYING3.  If not see
 #include <isl/constraint.h>
 #include <isl/ilp.h>
 #include <isl/aff.h>
+#include <isl/deprecated/int.h>
+#include <isl/deprecated/ilp_int.h>
 #include <cloog/cloog.h>
 #include <cloog/isl/domain.h>
 #ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE
diff --git a/gcc-4.9/gcc/graphite-dependences.c b/gcc-4.9/gcc/graphite-dependences.c
index b0f8680..32000e0 100644
--- a/gcc-4.9/gcc/graphite-dependences.c
+++ b/gcc-4.9/gcc/graphite-dependences.c
@@ -183,7 +183,7 @@ scop_get_transformed_schedule (scop_p scop, vec<poly_bb_p> pbbs)
 /* Helper function used on each MAP of a isl_union_map.  Computes the
    maximal output dimension.  */
 
-static int
+static isl_stat
 max_number_of_out_dimensions (__isl_take isl_map *map, void *user)
 {
   int global_max = *((int *) user);
@@ -195,7 +195,7 @@ max_number_of_out_dimensions (__isl_take isl_map *map, void *user)
 
   isl_map_free (map);
   isl_space_free (space);
-  return 0;
+  return isl_stat_ok;
 }
 
 /* Extends the output dimension of MAP to MAX dimensions.  */
@@ -219,12 +219,12 @@ struct extend_schedule_str {
 
 /* Helper function for extend_schedule.  */
 
-static int
+static isl_stat
 extend_schedule_1 (__isl_take isl_map *map, void *user)
 {
   struct extend_schedule_str *str = (struct extend_schedule_str *) user;
   str->umap = isl_union_map_add_map (str->umap, extend_map (map, str->max));
-  return 0;
+  return isl_stat_ok;
 }
 
 /* Return a relation that has uniform output dimensions.  */
diff --git a/gcc-4.9/gcc/graphite-interchange.c b/gcc-4.9/gcc/graphite-interchange.c
index 2e625c1..1984a2c 100644
--- a/gcc-4.9/gcc/graphite-interchange.c
+++ b/gcc-4.9/gcc/graphite-interchange.c
@@ -29,6 +29,9 @@ along with GCC; see the file COPYING3.  If not see
 #include <isl/map.h>
 #include <isl/union_map.h>
 #include <isl/ilp.h>
+#include <isl/deprecated/int.h>
+#include <isl/deprecated/ilp_int.h>
+#include <isl/deprecated/constraint_int.h>
 #include <cloog/cloog.h>
 #include <cloog/isl/domain.h>
 #ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE
diff --git a/gcc-4.9/gcc/graphite-optimize-isl.c b/gcc-4.9/gcc/graphite-optimize-isl.c
index fc12eeb..f0b7506 100644
--- a/gcc-4.9/gcc/graphite-optimize-isl.c
+++ b/gcc-4.9/gcc/graphite-optimize-isl.c
@@ -28,6 +28,9 @@ along with GCC; see the file COPYING3.  If not see
 #include <isl/band.h>
 #include <isl/aff.h>
 #include <isl/options.h>
+#include <isl/union_set.h>
+#include <isl/deprecated/int.h>
+#include <isl/deprecated/aff_int.h>
 #ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE
 #include <isl/deprecated/int.h>
 #include <isl/deprecated/aff_int.h>
@@ -415,13 +418,13 @@ getScheduleMap (isl_schedule *Schedule)
   return ScheduleMap;
 }
 
-static int
+static isl_stat
 getSingleMap (__isl_take isl_map *map, void *user)
 {
   isl_map **singleMap = (isl_map **) user;
   *singleMap = map;
 
-  return 0;
+  return isl_stat_ok;
 }
 
 static void
@@ -469,7 +472,7 @@ optimize_isl (scop_p scop)
 
   isl_options_set_schedule_max_constant_term (scop->ctx, CONSTANT_BOUND);
   isl_options_set_schedule_maximize_band_depth (scop->ctx, 1);
-  isl_options_set_schedule_fuse (scop->ctx, ISL_SCHEDULE_FUSE_MIN);
+  isl_options_set_schedule_serialize_sccs (scop->ctx, 1);
   isl_options_set_on_error (scop->ctx, ISL_ON_ERROR_CONTINUE);
   schedule = isl_union_set_compute_schedule (domain, validity, proximity);
   isl_options_set_on_error (scop->ctx, ISL_ON_ERROR_ABORT);
diff --git a/gcc-4.9/gcc/graphite-poly.c b/gcc-4.9/gcc/graphite-poly.c
index fccc2ec..6b99071 100644
--- a/gcc-4.9/gcc/graphite-poly.c
+++ b/gcc-4.9/gcc/graphite-poly.c
@@ -28,6 +28,8 @@ along with GCC; see the file COPYING3.  If not see
 #include <isl/constraint.h>
 #include <isl/ilp.h>
 #include <isl/aff.h>
+#include <isl/deprecated/int.h>
+#include <isl/deprecated/ilp_int.h>
 #include <cloog/cloog.h>
 #include <cloog/isl/domain.h>
 #ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE
diff --git a/gcc-4.9/gcc/graphite-poly.h b/gcc-4.9/gcc/graphite-poly.h
index 06d320e..28a2498 100644
--- a/gcc-4.9/gcc/graphite-poly.h
+++ b/gcc-4.9/gcc/graphite-poly.h
@@ -22,6 +22,8 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_GRAPHITE_POLY_H
 #define GCC_GRAPHITE_POLY_H
 
+#include <isl/constraint.h>
+
 typedef struct poly_dr *poly_dr_p;
 
 typedef struct poly_bb *poly_bb_p;
diff --git a/gcc-4.9/gcc/graphite-sese-to-poly.c b/gcc-4.9/gcc/graphite-sese-to-poly.c
index 059c10d..65d4e56 100644
--- a/gcc-4.9/gcc/graphite-sese-to-poly.c
+++ b/gcc-4.9/gcc/graphite-sese-to-poly.c
@@ -26,6 +26,9 @@ along with GCC; see the file COPYING3.  If not see
 #include <isl/union_map.h>
 #include <isl/constraint.h>
 #include <isl/aff.h>
+#include <isl/deprecated/int.h>
+#include <isl/deprecated/aff_int.h>
+#include <isl/deprecated/constraint_int.h>
 #include <cloog/cloog.h>
 #include <cloog/cloog.h>
 #include <cloog/isl/domain.h>
diff --git a/gcc-4.9/libgfortran/intrinsics/cshift0.c b/gcc-4.9/libgfortran/intrinsics/cshift0.c
index f983754..5187ed9 100644
--- a/gcc-4.9/libgfortran/intrinsics/cshift0.c
+++ b/gcc-4.9/libgfortran/intrinsics/cshift0.c
@@ -146,7 +146,7 @@ cshift0 (gfc_array_char * ret, const gfc_array_char * array,
       return;
 # endif
 
-# ifdef HAVE_GFC_REAL_16
+# if 0 && defined(HAVE_GFC_REAL_16)
     case GFC_DTYPE_REAL_16:
       cshift0_r16 ((gfc_array_r16 *)ret, (gfc_array_r16 *) array, shift,
 		   which);
@@ -176,7 +176,7 @@ cshift0 (gfc_array_char * ret, const gfc_array_char * array,
       return;
 # endif
 
-# ifdef HAVE_GFC_COMPLEX_16
+# if 0 // defined(HAVE_GFC_COMPLEX_16)
     case GFC_DTYPE_COMPLEX_16:
       cshift0_c16 ((gfc_array_c16 *)ret, (gfc_array_c16 *) array, shift,
 		   which);
diff --git a/gcc-4.9/libgfortran/intrinsics/pack_generic.c b/gcc-4.9/libgfortran/intrinsics/pack_generic.c
index 3fbfa0a..ebaba1c 100644
--- a/gcc-4.9/libgfortran/intrinsics/pack_generic.c
+++ b/gcc-4.9/libgfortran/intrinsics/pack_generic.c
@@ -312,7 +312,7 @@ pack (gfc_array_char *ret, const gfc_array_char *array,
       return;
 # endif
 
-# ifdef HAVE_GFC_REAL_16
+# if 0 && defined(HAVE_GFC_REAL_16)
     case GFC_DTYPE_REAL_16:
       pack_r16 ((gfc_array_r16 *) ret, (gfc_array_r16 *) array,
 		(gfc_array_l1 *) mask, (gfc_array_r16 *) vector);
@@ -344,7 +344,7 @@ pack (gfc_array_char *ret, const gfc_array_char *array,
       return;
 # endif
 
-# ifdef HAVE_GFC_COMPLEX_16
+# if 0 && defined(HAVE_GFC_COMPLEX_16)
     case GFC_DTYPE_COMPLEX_16:
       pack_c16 ((gfc_array_c16 *) ret, (gfc_array_c16 *) array,
 		(gfc_array_l1 *) mask, (gfc_array_c16 *) vector);
diff --git a/gcc-4.9/libgfortran/intrinsics/spread_generic.c b/gcc-4.9/libgfortran/intrinsics/spread_generic.c
index f3f23b8..07d316c 100644
--- a/gcc-4.9/libgfortran/intrinsics/spread_generic.c
+++ b/gcc-4.9/libgfortran/intrinsics/spread_generic.c
@@ -529,7 +529,7 @@ spread_scalar (gfc_array_char *ret, const char *source,
       return;
 # endif
 
-# ifdef HAVE_GFC_REAL_16
+# if 0 && defined(HAVE_GFC_REAL_16)
     case GFC_DTYPE_REAL_16:
       spread_scalar_r16 ((gfc_array_r16 *) ret, (GFC_REAL_16 *) source,
 			*along, *pncopies);
@@ -561,7 +561,7 @@ spread_scalar (gfc_array_char *ret, const char *source,
       return;
 # endif
 
-# ifdef HAVE_GFC_COMPLEX_16
+# if 0 && defined(HAVE_GFC_COMPLEX_16)
     case GFC_DTYPE_COMPLEX_16:
       spread_scalar_c16 ((gfc_array_c16 *) ret, (GFC_COMPLEX_16 *) source,
 			*along, *pncopies);
diff --git a/gcc-4.9/libgfortran/intrinsics/unpack_generic.c b/gcc-4.9/libgfortran/intrinsics/unpack_generic.c
index 4bd9927..330c9e2 100644
--- a/gcc-4.9/libgfortran/intrinsics/unpack_generic.c
+++ b/gcc-4.9/libgfortran/intrinsics/unpack_generic.c
@@ -278,7 +278,7 @@ unpack1 (gfc_array_char *ret, const gfc_array_char *vector,
       return;
 # endif
 
-# ifdef HAVE_GFC_REAL_16
+# if 0 && defined(HAVE_GFC_REAL_16)
     case GFC_DTYPE_REAL_16:
       unpack1_r16 ((gfc_array_r16 *) ret, (gfc_array_r16 *) vector,
 		   mask, (gfc_array_r16 *) field);
@@ -310,7 +310,7 @@ unpack1 (gfc_array_char *ret, const gfc_array_char *vector,
       return;
 # endif
 
-# ifdef HAVE_GFC_COMPLEX_16
+# if 0 && defined(HAVE_GFC_COMPLEX_16)
     case GFC_DTYPE_COMPLEX_16:
       unpack1_c16 ((gfc_array_c16 *) ret, (gfc_array_c16 *) vector,
 		   mask, (gfc_array_c16 *) field);
@@ -489,7 +489,7 @@ unpack0 (gfc_array_char *ret, const gfc_array_char *vector,
       return;
 # endif
 
-# ifdef HAVE_GFC_REAL_16
+# if 0 && defined(HAVE_GFC_REAL_16)
     case GFC_DTYPE_REAL_16:
       unpack0_r16 ((gfc_array_r16 *) ret, (gfc_array_r16 *) vector,
 		   mask, (GFC_REAL_16 *) field);
@@ -521,7 +521,7 @@ unpack0 (gfc_array_char *ret, const gfc_array_char *vector,
       return;
 # endif
 
-# ifdef HAVE_GFC_COMPLEX_16
+# if 0 && defined(HAVE_GFC_COMPLEX_16)
     case GFC_DTYPE_COMPLEX_16:
       unpack0_c16 ((gfc_array_c16 *) ret, (gfc_array_c16 *) vector,
 		   mask, (GFC_COMPLEX_16 *) field);
diff --git a/gcc-4.9/libgfortran/runtime/in_pack_generic.c b/gcc-4.9/libgfortran/runtime/in_pack_generic.c
index aab155d..a2ba81e 100644
--- a/gcc-4.9/libgfortran/runtime/in_pack_generic.c
+++ b/gcc-4.9/libgfortran/runtime/in_pack_generic.c
@@ -95,7 +95,7 @@ internal_pack (gfc_array_char * source)
       return internal_pack_r10 ((gfc_array_r10 *) source);
 # endif
 
-# if defined (HAVE_GFC_REAL_16)
+# if 0 && defined (HAVE_GFC_REAL_16)
     case GFC_DTYPE_REAL_16:
       return internal_pack_r16 ((gfc_array_r16 *) source);
 # endif
@@ -119,7 +119,7 @@ internal_pack (gfc_array_char * source)
       return internal_pack_c10 ((gfc_array_c10 *) source);
 # endif
 
-# if defined (HAVE_GFC_COMPLEX_16)
+# if 0 && defined (HAVE_GFC_COMPLEX_16)
     case GFC_DTYPE_COMPLEX_16:
       return internal_pack_c16 ((gfc_array_c16 *) source);
 # endif
diff --git a/gcc-4.9/libgfortran/runtime/in_unpack_generic.c b/gcc-4.9/libgfortran/runtime/in_unpack_generic.c
index 18855e1..ff65a18 100644
--- a/gcc-4.9/libgfortran/runtime/in_unpack_generic.c
+++ b/gcc-4.9/libgfortran/runtime/in_unpack_generic.c
@@ -103,7 +103,7 @@ internal_unpack (gfc_array_char * d, const void * s)
       return;
 # endif
 
-# if defined(HAVE_GFC_REAL_16)
+# if 0 && defined(HAVE_GFC_REAL_16)
     case GFC_DTYPE_REAL_16:
       internal_unpack_r16 ((gfc_array_r16 *) d, (const GFC_REAL_16 *) s);
       return;
@@ -131,7 +131,7 @@ internal_unpack (gfc_array_char * d, const void * s)
       return;
 # endif
 
-# if defined(HAVE_GFC_COMPLEX_16)
+# if 0 && defined(HAVE_GFC_COMPLEX_16)
     case GFC_DTYPE_COMPLEX_16:
       internal_unpack_c16 ((gfc_array_c16 *) d, (const GFC_COMPLEX_16 *) s);
       return;