From 114ef0827924b6f8165fc83801fd895619d993ee Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Fri, 25 Jul 2014 04:55:14 +0000
Subject: RTEMS 4.11 Update to gcc-4.8.3 with Newlib CVS 26-Jul-2014.

Refactor some of the configurations to make it easier to maintain.

Add gcc-4.9.x support.
---
 rtems/config/tools/rtems-gcc-4.8-newlib-cvs-1.cfg  | 41 ++++++++++++++++++++++
 .../config/tools/rtems-gcc-4.8.2-newlib-cvs-1.cfg  | 35 ++----------------
 .../config/tools/rtems-gcc-4.8.3-newlib-cvs-1.cfg  | 11 ++++++
 rtems/config/tools/rtems-gcc-4.9-newlib-cvs-1.cfg  | 41 ++++++++++++++++++++++
 .../config/tools/rtems-gcc-4.9.0-newlib-cvs-1.cfg  | 11 ++++++
 .../config/tools/rtems-gcc-4.9.1-newlib-cvs-1.cfg  | 11 ++++++
 rtems/config/tools/rtems-gdb-7.7.1-1.cfg           | 23 ++++++++++++
 7 files changed, 141 insertions(+), 32 deletions(-)
 create mode 100644 rtems/config/tools/rtems-gcc-4.8-newlib-cvs-1.cfg
 create mode 100644 rtems/config/tools/rtems-gcc-4.8.3-newlib-cvs-1.cfg
 create mode 100644 rtems/config/tools/rtems-gcc-4.9-newlib-cvs-1.cfg
 create mode 100644 rtems/config/tools/rtems-gcc-4.9.0-newlib-cvs-1.cfg
 create mode 100644 rtems/config/tools/rtems-gcc-4.9.1-newlib-cvs-1.cfg
 create mode 100644 rtems/config/tools/rtems-gdb-7.7.1-1.cfg

(limited to 'rtems/config/tools')

diff --git a/rtems/config/tools/rtems-gcc-4.8-newlib-cvs-1.cfg b/rtems/config/tools/rtems-gcc-4.8-newlib-cvs-1.cfg
new file mode 100644
index 0000000..3ce89c2
--- /dev/null
+++ b/rtems/config/tools/rtems-gcc-4.8-newlib-cvs-1.cfg
@@ -0,0 +1,41 @@
+#
+# GCC 4.8.x., Newlib CVS
+#
+
+%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
+
+#
+# Newlib is from CVS.
+#
+%source set newlib cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}?reset
+
+#
+# Joel's stack_t patch.
+#
+%patch add newlib -p0 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff
+
+#
+# The gcc/newlib build instructions. We use 4.8 Release 1.
+#
+%include %{_configdir}/gcc-4.8-1.cfg
diff --git a/rtems/config/tools/rtems-gcc-4.8.2-newlib-cvs-1.cfg b/rtems/config/tools/rtems-gcc-4.8.2-newlib-cvs-1.cfg
index ca62545..37ca021 100644
--- a/rtems/config/tools/rtems-gcc-4.8.2-newlib-cvs-1.cfg
+++ b/rtems/config/tools/rtems-gcc-4.8.2-newlib-cvs-1.cfg
@@ -2,39 +2,10 @@
 # GCC 4.8.2., Newlib CVS
 #
 
-%include %{_configdir}/checks.cfg
-%include %{_configdir}/base.cfg
-%include %{_configdir}/versions.cfg
-
 %define gcc_version    4.8.2
-%define newlib_version 11-Dec-2013
-%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
-
-#
-# Newlib is from CVS.
-#
-%source set newlib cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}?reset
-
-#
-# Chris's patch to use the POSIX thread model for C++.
-#
-%patch add gcc %{rtems_gcc_patches}/gcc-rtems-thread-model-posix-1.diff
-
-#
-# Joel's stack_t patch.
-#
-%patch add newlib -p0 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff
+%define newlib_version 12-Jul-2014
 
 #
-# The gcc/newlib build instructions. We use 4.8 Release 1.
+# The gcc/newlib build instructions.
 #
-%include %{_configdir}/gcc-4.8-1.cfg
+%include tools/rtems-gcc-4.8-newlib-cvs-1.cfg
diff --git a/rtems/config/tools/rtems-gcc-4.8.3-newlib-cvs-1.cfg b/rtems/config/tools/rtems-gcc-4.8.3-newlib-cvs-1.cfg
new file mode 100644
index 0000000..2cbacd7
--- /dev/null
+++ b/rtems/config/tools/rtems-gcc-4.8.3-newlib-cvs-1.cfg
@@ -0,0 +1,11 @@
+#
+# GCC 4.8.3., Newlib CVS
+#
+
+%define gcc_version    4.8.3
+%define newlib_version 26-Jul-2014
+
+#
+# The gcc/newlib build instructions.
+#
+%include tools/rtems-gcc-4.8-newlib-cvs-1.cfg
diff --git a/rtems/config/tools/rtems-gcc-4.9-newlib-cvs-1.cfg b/rtems/config/tools/rtems-gcc-4.9-newlib-cvs-1.cfg
new file mode 100644
index 0000000..aedba21
--- /dev/null
+++ b/rtems/config/tools/rtems-gcc-4.9-newlib-cvs-1.cfg
@@ -0,0 +1,41 @@
+#
+# GCC 4.9.x., Newlib CVS.
+#
+
+%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
+
+#
+# Newlib is from CVS.
+#
+%source set newlib cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}?reset
+
+#
+# Joel's stack_t patch.
+#
+%patch add newlib -p0 %{rtems_newlib_patches}/newlib-sys-signal-20130532.diff
+
+#
+# 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.0-newlib-cvs-1.cfg b/rtems/config/tools/rtems-gcc-4.9.0-newlib-cvs-1.cfg
new file mode 100644
index 0000000..c8ba8b7
--- /dev/null
+++ b/rtems/config/tools/rtems-gcc-4.9.0-newlib-cvs-1.cfg
@@ -0,0 +1,11 @@
+#
+# GCC 4.9.0., Newlib CVS
+#
+
+%define gcc_version    4.9.0
+%define newlib_version 12-Jul-2014
+
+#
+# The gcc/newlib build instructions.
+#
+%include tools/rtems-gcc-4.9-newlib-cvs-1.cfg
diff --git a/rtems/config/tools/rtems-gcc-4.9.1-newlib-cvs-1.cfg b/rtems/config/tools/rtems-gcc-4.9.1-newlib-cvs-1.cfg
new file mode 100644
index 0000000..93e59e9
--- /dev/null
+++ b/rtems/config/tools/rtems-gcc-4.9.1-newlib-cvs-1.cfg
@@ -0,0 +1,11 @@
+#
+# GCC 4.9.1., Newlib CVS
+#
+
+%define gcc_version    4.9.1
+%define newlib_version 26-Jul-2014
+
+#
+# The gcc/newlib build instructions.
+#
+%include tools/rtems-gcc-4.9-newlib-cvs-1.cfg
diff --git a/rtems/config/tools/rtems-gdb-7.7.1-1.cfg b/rtems/config/tools/rtems-gdb-7.7.1-1.cfg
new file mode 100644
index 0000000..55096e6
--- /dev/null
+++ b/rtems/config/tools/rtems-gdb-7.7.1-1.cfg
@@ -0,0 +1,23 @@
+#
+# GDB 7.7.1.
+#
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+
+%define gdb_version 7.7.1
+
+#
+# Clean up the sim-arange inline code so it builds.
+#
+%patch add gdb %{rtems_gdb_patches}/gdb-sim-arange-inline.diff
+%patch add gdb %{rtems_gdb_patches}/gdb-sim-cgen-inline.diff
+
+%if %{_build_os} == freebsd
+ %patch add gdb -p0 %{rtems_gdb_patches}/patch-gdb-python-python-config.py
+%endif
+
+#
+# The gdb build instructions. We use 7.xx Release 1.
+#
+%include %{_configdir}/gdb-7-1.cfg
-- 
cgit v1.2.3