rtems4.11: Upgrade to gcc-4.9.2. Build rtems-tools and install.

RTEMS kernel requires the rtems-tools package be installed to
build the libdl tests.

27 files changed, 221 insertions, 19 deletions

diff --git a/rtems/config/4.11/rtems-arm.bset b/rtems/config/4.11/rtems-arm.bset
index 6bd5e74..7cd1d45 100644
--- a/rtems/config/4.11/rtems-arm.bset
+++ b/rtems/config/4.11/rtems-arm.bset
@@ -17,17 +17,12 @@
 %define enable_obsolete 1
 
 #
-# Add support for Cortex-M4 and Cortex-R based chips
-#
-%patch add gcc pw://patchwork.ozlabs.org/patch/372178/raw/v2-RTEMS-Add-multilibs-for-ARM.patch
-%hash  md5 v2-RTEMS-Add-multilibs-for-ARM.patch 2f3b5cf8db2a4c19f77752851ca10f6e
-
-#
 # Tools configuration.
 #
 4.11/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.2-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-avr.bset b/rtems/config/4.11/rtems-avr.bset
index 41aa26b..0ef22b5 100644
--- a/rtems/config/4.11/rtems-avr.bset
+++ b/rtems/config/4.11/rtems-avr.bset
@@ -35,6 +35,7 @@
 4.11/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.2-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-bfin.bset b/rtems/config/4.11/rtems-bfin.bset
index 678c66e..1a40df5 100644
--- a/rtems/config/4.11/rtems-bfin.bset
+++ b/rtems/config/4.11/rtems-bfin.bset
@@ -17,6 +17,7 @@
 4.11/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-h8300.bset b/rtems/config/4.11/rtems-h8300.bset
index 8d4e793..e2af02d 100644
--- a/rtems/config/4.11/rtems-h8300.bset
+++ b/rtems/config/4.11/rtems-h8300.bset
@@ -24,4 +24,5 @@ devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
 tools/rtems-gcc-4.8.3-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-i386.bset b/rtems/config/4.11/rtems-i386.bset
index d0a2f37..c29882e 100644
--- a/rtems/config/4.11/rtems-i386.bset
+++ b/rtems/config/4.11/rtems-i386.bset
@@ -17,6 +17,7 @@
 4.11/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-lm32.bset b/rtems/config/4.11/rtems-lm32.bset
index 38df58d..11f3105 100644
--- a/rtems/config/4.11/rtems-lm32.bset
+++ b/rtems/config/4.11/rtems-lm32.bset
@@ -25,4 +25,5 @@ devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
 tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-m32c.bset b/rtems/config/4.11/rtems-m32c.bset
index 7627999..b242a90 100644
--- a/rtems/config/4.11/rtems-m32c.bset
+++ b/rtems/config/4.11/rtems-m32c.bset
@@ -43,4 +43,5 @@ devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
 tools/rtems-gcc-4.8.3-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-m32r.bset b/rtems/config/4.11/rtems-m32r.bset
index 666da93..0f53c9a 100644
--- a/rtems/config/4.11/rtems-m32r.bset
+++ b/rtems/config/4.11/rtems-m32r.bset
@@ -17,6 +17,7 @@
 4.11/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-m68k.bset b/rtems/config/4.11/rtems-m68k.bset
index b4a2f8c..fad28b3 100644
--- a/rtems/config/4.11/rtems-m68k.bset
+++ b/rtems/config/4.11/rtems-m68k.bset
@@ -17,6 +17,7 @@
 4.11/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-microblaze.bset b/rtems/config/4.11/rtems-microblaze.bset
index 71ff584..b787fe0 100644
--- a/rtems/config/4.11/rtems-microblaze.bset
+++ b/rtems/config/4.11/rtems-microblaze.bset
@@ -30,4 +30,5 @@ devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
 tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-mips.bset b/rtems/config/4.11/rtems-mips.bset
index af41f33..5f9b023 100644
--- a/rtems/config/4.11/rtems-mips.bset
+++ b/rtems/config/4.11/rtems-mips.bset
@@ -27,7 +27,8 @@
 4.11/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
 tools/rtems-mipstx39-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-moxie.bset b/rtems/config/4.11/rtems-moxie.bset
index 0c417eb..738548b 100644
--- a/rtems/config/4.11/rtems-moxie.bset
+++ b/rtems/config/4.11/rtems-moxie.bset
@@ -23,6 +23,7 @@
 devel/expat-2.1.0-1
 devel/dtc-1.2.0
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-nios2.bset b/rtems/config/4.11/rtems-nios2.bset
index 82fb25d..5e64c87 100644
--- a/rtems/config/4.11/rtems-nios2.bset
+++ b/rtems/config/4.11/rtems-nios2.bset
@@ -27,4 +27,5 @@ devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
 tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-or1k.bset b/rtems/config/4.11/rtems-or1k.bset
index 6a727d2..48ca165 100644
--- a/rtems/config/4.11/rtems-or1k.bset
+++ b/rtems/config/4.11/rtems-or1k.bset
@@ -43,4 +43,5 @@
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
 tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-tools-4.11-1
 tools/rtems-gdb-7.7-1
diff --git a/rtems/config/4.11/rtems-powerpc.bset b/rtems/config/4.11/rtems-powerpc.bset
index 3ecd981..6a23672 100644
--- a/rtems/config/4.11/rtems-powerpc.bset
+++ b/rtems/config/4.11/rtems-powerpc.bset
@@ -27,6 +27,7 @@
 4.11/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-sh.bset b/rtems/config/4.11/rtems-sh.bset
index 2dac171..f5a8ba1 100644
--- a/rtems/config/4.11/rtems-sh.bset
+++ b/rtems/config/4.11/rtems-sh.bset
@@ -17,6 +17,7 @@
 4.11/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-sparc.bset b/rtems/config/4.11/rtems-sparc.bset
index f668edb..b1f7946 100644
--- a/rtems/config/4.11/rtems-sparc.bset
+++ b/rtems/config/4.11/rtems-sparc.bset
@@ -28,6 +28,7 @@
 4.11/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-sparc64.bset b/rtems/config/4.11/rtems-sparc64.bset
index 341cc00..4549129 100644
--- a/rtems/config/4.11/rtems-sparc64.bset
+++ b/rtems/config/4.11/rtems-sparc64.bset
@@ -17,6 +17,7 @@
 4.11/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/4.11/rtems-tools.bset b/rtems/config/4.11/rtems-tools.bset
new file mode 100644
index 0000000..bdda60e
--- /dev/null
+++ b/rtems/config/4.11/rtems-tools.bset
@@ -0,0 +1,7 @@
+#
+# Tools Set for RTEMS 4.11 Tools Stable
+#
+
+%define release 1
+
+tools/rtems-tools-4.11-1
diff --git a/rtems/config/4.11/rtems-v850.bset b/rtems/config/4.11/rtems-v850.bset
index e814f5e..8c134ca 100644
--- a/rtems/config/4.11/rtems-v850.bset
+++ b/rtems/config/4.11/rtems-v850.bset
@@ -22,6 +22,7 @@
 4.11/rtems-autotools
 devel/expat-2.1.0-1
 tools/rtems-binutils-2.24-1
-tools/rtems-gcc-4.8.3-newlib-git-1
+tools/rtems-gcc-4.9.1-newlib-git-1
 tools/rtems-gdb-7.7-1
+tools/rtems-tools-4.11-1
 tools/rtems-kernel-4.11
diff --git a/rtems/config/tools/rtems-binutils-git-1.cfg b/rtems/config/tools/rtems-binutils-git-1.cfg
new file mode 100644
index 0000000..da64bc1
--- /dev/null
+++ b/rtems/config/tools/rtems-binutils-git-1.cfg
@@ -0,0 +1,21 @@
+#
+# Binutils GIT.
+#
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+
+%define binutils_version 6ae274b7dc305ae7cebcf55c5018dab05228235a
+%source set binutils git://sourceware.org/git/binutils-gdb.git?fetch?reset=hard?branch=master?checkout=%{binutils_version}
+
+#
+# Enable deterministic archives by default. This will be the default
+# there all tools using this binutils will create deterministic
+# archives.
+#
+%define with_deterministic_archives 1
+
+#
+# The binutils build instructions. We use 2.xx Release 1.
+#
+%include %{_configdir}/binutils-2-1.cfg
diff --git a/rtems/config/tools/rtems-gcc-4.9-newlib-git-1.cfg b/rtems/config/tools/rtems-gcc-4.9-newlib-git-1.cfg
new file mode 100644
index 0000000..98caa2f
--- /dev/null
+++ b/rtems/config/tools/rtems-gcc-4.9-newlib-git-1.cfg
@@ -0,0 +1,43 @@
+#
+# GCC 4.9.x., Newlib GIT.
+#
+
+%ifn %{defined gcc_version}
+ %error No GCC version defined.
+%endif
+
+%ifn %{defined newlib_version}
+ %error No Newlib version defined.
+%endif
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+%include %{_configdir}/versions.cfg
+
+%define mpfr_version   3.0.1
+%define mpc_version    0.8.2
+%define gmp_version    5.0.5
+
+%define with_threads 1
+%define with_plugin  0
+
+%ifn %{defined with_iconv}
+ %define with_iconv 1
+%endif
+
+#
+# Hash checksums of the libraries used in GCC.
+#
+%hash md5 mpfr-%{mpfr_version}.tar.bz2 bfbecb2eacb6d48432ead5cfc3f7390a
+%hash md5 mpc-%{mpc_version}.tar.gz    e98267ebd5648a39f881d66797122fb6
+%hash md5 gmp-%{gmp_version}.tar.bz2   041487d25e9c230b0c42b106361055fe
+
+#
+# Newlib is from CVS and this is via a git mirror. No hash on GIT
+#
+%source set newlib git://sourceware.org/git/newlib.git?fetch?reset=hard?branch=master?checkout=%{newlib_version}
+
+#
+# The gcc/newlib build instructions. We use 4.9 Release 1.
+#
+%include %{_configdir}/gcc-4.9-1.cfg
diff --git a/rtems/config/tools/rtems-gcc-4.9.1-newlib-git-1.cfg b/rtems/config/tools/rtems-gcc-4.9.1-newlib-git-1.cfg
new file mode 100644
index 0000000..c724407
--- /dev/null
+++ b/rtems/config/tools/rtems-gcc-4.9.1-newlib-git-1.cfg
@@ -0,0 +1,13 @@
+#
+# GCC 4.9.1., Newlib GIT
+#
+
+%define gcc_version    4.9.1
+%define newlib_version 6f25fbe648379f5cc47c41c67bf93720bb1feab3
+
+%hash md5 gcc-%{gcc_version}.tar.bz2 fddf71348546af523353bd43d34919c1
+
+#
+# The gcc/newlib build instructions.
+#
+%include tools/rtems-gcc-4.9-newlib-git-1.cfg
diff --git a/rtems/config/tools/rtems-gcc-4.9.2-newlib-git-1.cfg b/rtems/config/tools/rtems-gcc-4.9.2-newlib-git-1.cfg
new file mode 100644
index 0000000..67e5b35
--- /dev/null
+++ b/rtems/config/tools/rtems-gcc-4.9.2-newlib-git-1.cfg
@@ -0,0 +1,13 @@
+#
+# GCC 4.9.2., Newlib GIT
+#
+
+%define gcc_version    4.9.2
+%define newlib_version 9b9f839addfe16ab0fd11f09a30a28139bfae6d5
+
+%hash md5 gcc-%{gcc_version}.tar.bz2 4df8ee253b7f3863ad0b86359cd39c43
+
+#
+# The gcc/newlib build instructions.
+#
+%include tools/rtems-gcc-4.9-newlib-git-1.cfg
diff --git a/rtems/config/tools/rtems-tools-1.cfg b/rtems/config/tools/rtems-tools-1.cfg
new file mode 100644
index 0000000..42acb9e
--- /dev/null
+++ b/rtems/config/tools/rtems-tools-1.cfg
@@ -0,0 +1,38 @@
+#
+# RTEMS Tools from git://git.rtems.org/rtems-tools.git
+#
+
+#
+# Optionally enable/disable building the RTEMS Tools via the command line.
+#
+%if %{defined with_rtems_tools}
+ %define rtems_tools_build 1
+%endif
+%if %{defined without_rtems_tools}
+ %define rtems_tools_build 0
+%endif
+
+#
+# Build by default.
+#
+%if ! %{defined rtems_tools_build}
+ %define rtems_tools_build 1
+%endif
+
+%if %{rtems_tools_build}
+ #
+ # Pull the latest changes from git each build. Override if this is not what you
+ # want.
+ #
+ %if %{defined rtems_tools_version}
+  %define rtems_tools_git_checkout ?checkout=%{rtems_tools_version}
+ %else
+  %define rtems_tools_git_checkout %{nil}
+ %endif
+ %source set rtems-tools git://git.rtems.org/rtems-tools.git?fetch?reset=hard?branch=master%{rtems_tools_git_checkout}
+
+ #
+ # The RTEMS Tools build instructions. We use GIT Release 1.
+ #
+ %include tools/rtems-tools-git-1.cfg
+%endif
diff --git a/rtems/config/tools/rtems-tools-4.11-1.cfg b/rtems/config/tools/rtems-tools-4.11-1.cfg
new file mode 100644
index 0000000..b1344b7
--- /dev/null
+++ b/rtems/config/tools/rtems-tools-4.11-1.cfg
@@ -0,0 +1,10 @@
+#
+# RTEMS Tools for 4.11.
+#
+
+%define rtems_tools_version fdb1fe685ab60de784b5f20413fe54cd70a01ff2
+
+#
+# The RTEMS Tools build instructions. We use GIT Release 1.
+#
+%include tools/rtems-tools-1.cfg
diff --git a/rtems/config/tools/rtems-tools-git-1.cfg b/rtems/config/tools/rtems-tools-git-1.cfg
new file mode 100644
index 0000000..dc9bdae
--- /dev/null
+++ b/rtems/config/tools/rtems-tools-git-1.cfg
@@ -0,0 +1,44 @@
+#
+# RTEMS Tools GIT Version 1.
+#
+# This configuration file configure's, builds and install's RTEMS Tools.
+#
+
+Name:      rtems-tools-%{rtems_tools_version}-%{release}
+Summary:   RTEMS Tools %{rtems_tools_version} for host %{_host}
+Version:   %{rtems_tools_version}
+Release:   %{release}
+URL: 	   http://www..rtems.org/
+BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
+
+#
+# Prepare the source code.
+#
+%prep
+  # save the build top directory and cd back to it rather than
+  # using 'cd ..' because some shells change $PWD to a symlink's
+  # target location and 'cd ..' fails.
+  build_top=$(pwd)
+
+  source_dir_rtems_tools="%{name}"
+  %source setup rtems-tools -q -D -n %{name}
+  %patch setup rtems-tools -p1
+
+  cd ${build_top}
+
+%build
+  build_top=$(pwd)
+
+  cd ${source_dir_rtems_tools}
+  ./waf configure --prefix=%{_prefix}
+  ./waf
+  cd ${build_top}
+
+%install
+  build_top=$(pwd)
+
+  %{__rmdir} $SB_BUILD_ROOT
+
+  cd ${source_dir_rtems_tools}
+  ./waf --destdir=$SB_BUILD_ROOT install
+  cd ${build_top}