[ptxdist] [PATCH] OSELAS.Toolchain: gcc6 support

["Enrico Weigelt, metux IT consult" <enrico.weigelt@gr13.net>]

[-- Attachment #1: Type: text/plain, Size: 123 bytes --]


-- 

mit freundlichen Grüßen
--
Enrico, Sohn von Wilfried, a.d.F. Weigelt,
metux IT consulting
+49-151-27565287

[-- Attachment #2: 0004-cross-gcc-added-version-6.2.patch --]
[-- Type: text/x-patch, Size: 5782 bytes --]

From 5985c6c672b85a5347d69bbf42b9a13caeaee103 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <enrico.weigelt@gr13.net>
Date: Mon, 24 Oct 2016 12:44:41 +0200
Subject: [PATCH 04/11] cross-gcc: added version 6.2

---
 fixup_ptxconfigs.sh                                |  3 +
 .../0001-make-libmpx-optional.patch                | 95 ++++++++++++++++++++++
 patches/gcc-first-6.2.0/series                     |  1 +
 rules/cross-gcc-first.make                         |  1 +
 rules/cross-gcc.in                                 |  9 +-
 5 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 patches/gcc-first-6.2.0/0001-make-libmpx-optional.patch
 create mode 100644 patches/gcc-first-6.2.0/series

diff --git a/fixup_ptxconfigs.sh b/fixup_ptxconfigs.sh
index 09185bd..fb57b49 100755
--- a/fixup_ptxconfigs.sh
+++ b/fixup_ptxconfigs.sh
@@ -305,6 +305,9 @@ fixup()
 	5.*)
 	    PTXCONF_CROSS_GCC_50=y
 	    ;;
+	6.*)
+	    PTXCONF_CROSS_GCC_60=y
+	    ;;
 	*)
 	    echo "unknown CROSS_GCC_VERSION: ${PTXCONF_CROSS_GCC_VERSION}"
 	    exit 1
diff --git a/patches/gcc-first-6.2.0/0001-make-libmpx-optional.patch b/patches/gcc-first-6.2.0/0001-make-libmpx-optional.patch
new file mode 100644
index 0000000..1618531
--- /dev/null
+++ b/patches/gcc-first-6.2.0/0001-make-libmpx-optional.patch
@@ -0,0 +1,95 @@
+From ea6af3c98c7a3a74e27a6f0f886b757dbc95916e Mon Sep 17 00:00:00 2001
+From: "Enrico Weigelt, metux IT consult" <enrico.weigelt@gr13.net>
+Date: Fri, 14 Oct 2016 15:53:53 +0200
+Subject: [PATCH] make libmpx optional
+
+---
+ configure    | 20 ++++++++++++++++++++
+ configure.ac | 12 ++++++++++++
+ 2 files changed, 32 insertions(+)
+
+diff --git a/configure b/configure
+index 35f231e..b27d32d 100755
+--- a/configure
++++ b/configure
+@@ -759,6 +759,7 @@ enable_libquadmath
+ enable_libquadmath_support
+ enable_libada
+ enable_libssp
++enable_libmpx
+ enable_libstdcxx
+ enable_liboffloadmic
+ enable_static_libjava
+@@ -1486,6 +1487,7 @@ Optional Features:
+                           disable libquadmath support for Fortran
+   --enable-libada         build libada directory
+   --enable-libssp         build libssp directory
++  --enable-libmpx         build libmpx directory
+   --disable-libstdcxx     do not build libstdc++-v3 directory
+   --enable-liboffloadmic=ARG
+                           build liboffloadmic [ARG={no,host,target}]
+@@ -3099,6 +3101,12 @@ else
+ fi
+ 
+ 
++# Check whether --enable-libmpx was given.
++if test "${enable_libmpx+set}" = set; then :
++  enableval=$enable_libmpx;
++fi
++
++
+ # Check whether --enable-libstdcxx was given.
+ if test "${enable_libstdcxx+set}" = set; then :
+   enableval=$enable_libstdcxx; ENABLE_LIBSTDCXX=$enableval
+@@ -3204,6 +3212,18 @@ if test x$enable_libgomp = x ; then
+     esac
+ fi
+ 
++# Disable libmpx (eg. bootstrap)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmpx support: $enable_libmpx" >&5
++$as_echo_n "checking for libmpx support: $enable_libmpx... " >&6; }
++if test x$enable_libmpx = xno; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
++$as_echo "disabled" >&6; }
++    noconfigdirs="$noconfigdirs target-libmpx"
++else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled" >&5
++$as_echo "enabled" >&6; }
++fi
++
+ # Disable libatomic on unsupported systems.
+ if test -d ${srcdir}/libatomic; then
+     if test x$enable_libatomic = x; then
+diff --git a/configure.ac b/configure.ac
+index 74bf58a..affe0cd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -462,6 +462,9 @@ AC_ARG_ENABLE(libssp,
+ ENABLE_LIBSSP=$enableval,
+ ENABLE_LIBSSP=yes)
+ 
++AC_ARG_ENABLE(libmpx,
++[AS_HELP_STRING([--enable-libmpx], [build libmpx directory])],,)
++
+ AC_ARG_ENABLE(libstdcxx,
+ AS_HELP_STRING([--disable-libstdcxx],
+   [do not build libstdc++-v3 directory]),
+@@ -561,6 +564,15 @@ if test x$enable_libgomp = x ; then
+     esac
+ fi
+ 
++# Disable libmpx (eg. bootstrap)
++AC_MSG_CHECKING([for libmpx support: $enable_libmpx])
++if test x$enable_libmpx = xno; then
++    AC_MSG_RESULT([disabled])
++    noconfigdirs="$noconfigdirs target-libmpx"
++else
++    AC_MSG_RESULT([enabled])
++fi
++
+ # Disable libatomic on unsupported systems.
+ if test -d ${srcdir}/libatomic; then
+     if test x$enable_libatomic = x; then
+-- 
+2.6.4.442.g545299f
+
diff --git a/patches/gcc-first-6.2.0/series b/patches/gcc-first-6.2.0/series
new file mode 100644
index 0000000..8565c6c
--- /dev/null
+++ b/patches/gcc-first-6.2.0/series
@@ -0,0 +1 @@
+0001-make-libmpx-optional.patch
diff --git a/rules/cross-gcc-first.make b/rules/cross-gcc-first.make
index 406070b..4a7203e 100644
--- a/rules/cross-gcc-first.make
+++ b/rules/cross-gcc-first.make
@@ -59,6 +59,7 @@ CROSS_GCC_FIRST_CONF_OPT	 = \
 	--disable-libgomp \
 	--disable-libquadmath \
 	--disable-libatomic \
+	--disable-libmpx \
 	--with-system-zlib
 
 # ----------------------------------------------------------------------------
diff --git a/rules/cross-gcc.in b/rules/cross-gcc.in
index 5b2f356..79fdd61 100644
--- a/rules/cross-gcc.in
+++ b/rules/cross-gcc.in
@@ -10,7 +10,7 @@ menuconfig CROSS_GCC
 	select HOST_MPC		if CROSS_GCC_43
 	select HOST_ZLIB	if CROSS_GCC_43
 	select HOST_LIBELF	if CROSS_GCC_45
-	select HOST_CLOOG	if CROSS_GCC_48 && ! CROSS_GCC_50
+	select HOST_CLOOG	if CROSS_GCC_48 && ! CROSS_GCC_50 && ! CROSS_GCC_60
 	select HOST_ISL		if CROSS_GCC_48
 	select CROSS_ECJ	if CROSS_GCC_LANG_JAVA
 
@@ -67,6 +67,13 @@ config CROSS_GCC_50
 	help
 	  Add new dependencies for gcc >= 5.0: "isl" but not "cloog"
 
+config CROSS_GCC_60
+	bool
+	prompt "additional deps for gcc >= 6.0"
+	select CROSS_GCC_50
+	help
+	  Add new dependencies for gcc >= 6.0: "isl" but not "cloog"
+
 config CROSS_GCC_SERIES
 	string
 	default "series"
-- 
2.6.4.442.g545299f


[-- Attachment #3: Type: text/plain, Size: 91 bytes --]

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de