change log for rtems (2010-05-21)
rtems-vc at rtems.org
rtems-vc at rtems.org
Fri May 21 17:12:53 UTC 2010
*joel*:
2010-05-21 Joel Sherrill <joel.sherrill at oarcorp.com>
* sh7032/score/cpu_asm.c, sh7045/score/cpu_asm.c,
sh7750/score/cpu_asm.c, shgdb/score/cpu_asm.c: Spacing.
M 1.61 c/src/lib/libcpu/sh/ChangeLog
M 1.15 c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
M 1.17 c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
M 1.13 c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c
M 1.2 c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c
diff -u rtems/c/src/lib/libcpu/sh/ChangeLog:1.60 rtems/c/src/lib/libcpu/sh/ChangeLog:1.61
--- rtems/c/src/lib/libcpu/sh/ChangeLog:1.60 Thu Apr 15 03:39:33 2010
+++ rtems/c/src/lib/libcpu/sh/ChangeLog Fri May 21 11:33:00 2010
@@ -1,3 +1,8 @@
+2010-05-21 Joel Sherrill <joel.sherrill at oarcorp.com>
+
+ * sh7032/score/cpu_asm.c, sh7045/score/cpu_asm.c,
+ sh7750/score/cpu_asm.c, shgdb/score/cpu_asm.c: Spacing.
+
2010-04-15 Ralf Corsépius <ralf.corsepius at rtems.org>
* sh7045/include/sci_termios.h, sh7045/sci/sci.c,
diff -u rtems/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c:1.14 rtems/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c:1.15
--- rtems/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c:1.14 Thu Sep 25 14:32:15 2008
+++ rtems/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c Fri May 21 11:33:00 2010
@@ -45,7 +45,7 @@
/* from cpu_isps.c */
extern proc_ptr _Hardware_isr_Table[];
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
unsigned long *_old_stack_ptr;
#endif
@@ -76,18 +76,18 @@
/*
* first check for valid interrupt
*/
- if(( irq > 113) || (_Hardware_isr_Table[irq] == _dummy_isp))
+ if (( irq > 113) || (_Hardware_isr_Table[irq] == _dummy_isp))
return -1;
/*
* check for valid irq priority
*/
- if( prio > 15 )
+ if ( prio > 15 )
return -1;
/*
* look up appropriate interrupt priority register
*/
- if( irq > 71)
+ if ( irq > 71)
{
irq = irq - 72;
shiftcount = 12 - ((irq & ~0x03) % 16);
@@ -103,7 +103,7 @@
else
{
shiftcount = 12 - 4 * ( irq % 4);
- if( irq > 67)
+ if ( irq > 67)
prioreg = INTC_IPRB;
else
prioreg = INTC_IPRA;
@@ -136,8 +136,8 @@
_Thread_Dispatch_disable_level++;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+ if ( _ISR_Nest_level == 0 )
{
/* Install irq stack */
_old_stack_ptr = stack_ptr;
@@ -151,7 +151,7 @@
_ISR_Enable( level );
/* call isp */
- if( _ISR_Vector_table[ vector])
+ if ( _ISR_Vector_table[ vector])
(*_ISR_Vector_table[ vector ])( vector );
_ISR_Disable( level );
@@ -160,9 +160,9 @@
_ISR_Nest_level--;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if(CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+ if ( _ISR_Nest_level == 0 )
/* restore old stack pointer */
stack_ptr = _old_stack_ptr;
#endif
diff -u rtems/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c:1.16 rtems/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c:1.17
--- rtems/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c:1.16 Thu Sep 25 14:32:15 2008
+++ rtems/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c Fri May 21 11:33:00 2010
@@ -44,7 +44,7 @@
/* from cpu_isps.c */
extern proc_ptr _Hardware_isr_Table[];
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
unsigned long *_old_stack_ptr;
#endif
@@ -75,18 +75,18 @@
/*
* first check for valid interrupt
*/
- if(( irq > 156) || (irq < 64) || (_Hardware_isr_Table[irq] == _dummy_isp))
+ if (( irq > 156) || (irq < 64) || (_Hardware_isr_Table[irq] == _dummy_isp))
return -1;
/*
* check for valid irq priority
*/
- if( prio > 15 )
+ if ( prio > 15 )
return -1;
/*
* look up appropriate interrupt priority register
*/
- if( irq > 71)
+ if ( irq > 71)
{
irq = irq - 72;
shiftcount = 12 - ((irq & ~0x03) % 16);
@@ -105,7 +105,7 @@
else
{
shiftcount = 12 - 4 * ( irq % 4);
- if( irq > 67)
+ if ( irq > 67)
prioreg = INTC_IPRB;
else
prioreg = INTC_IPRA;
@@ -138,8 +138,8 @@
_Thread_Dispatch_disable_level++;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+ if ( _ISR_Nest_level == 0 )
{
/* Install irq stack */
_old_stack_ptr = stack_ptr;
@@ -153,7 +153,7 @@
_ISR_Enable( level );
/* call isp */
- if( _ISR_Vector_table[ vector])
+ if ( _ISR_Vector_table[ vector])
(*_ISR_Vector_table[ vector ])( vector );
_ISR_Disable( level );
@@ -162,9 +162,9 @@
_ISR_Nest_level--;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+ if ( _ISR_Nest_level == 0 )
/* restore old stack pointer */
stack_ptr = _old_stack_ptr;
#endif
diff -u rtems/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c:1.12 rtems/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c:1.13
--- rtems/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c:1.12 Thu Sep 25 14:32:15 2008
+++ rtems/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c Fri May 21 11:33:00 2010
@@ -44,7 +44,7 @@
/* from cpu_isps.c */
extern proc_ptr _Hardware_isr_Table[];
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
unsigned long *_old_stack_ptr;
#endif
@@ -62,8 +62,8 @@
_Thread_Dispatch_disable_level++;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+ if ( _ISR_Nest_level == 0 )
{
/* Install irq stack */
_old_stack_ptr = stack_ptr;
@@ -77,7 +77,7 @@
_ISR_Enable( level );
/* call isp */
- if( _ISR_Vector_table[ vector])
+ if ( _ISR_Vector_table[ vector])
(*_ISR_Vector_table[ vector ])( vector );
_ISR_Disable( level );
@@ -86,9 +86,8 @@
_ISR_Nest_level--;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
-
- if( _ISR_Nest_level == 0 )
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+ if ( _ISR_Nest_level == 0 )
/* restore old stack pointer */
stack_ptr = _old_stack_ptr;
#endif
diff -u rtems/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c:1.1 rtems/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c:1.2
--- rtems/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c:1.1 Thu Sep 25 14:32:15 2008
+++ rtems/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c Fri May 21 11:33:00 2010
@@ -17,7 +17,7 @@
#include <rtems/score/thread.h>
#include <rtems/score/sh.h>
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
unsigned long *_old_stack_ptr;
#endif
@@ -35,8 +35,8 @@
_Thread_Dispatch_disable_level++;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+ if ( _ISR_Nest_level == 0 )
{
/* Install irq stack */
_old_stack_ptr = stack_ptr;
@@ -50,7 +50,7 @@
_ISR_Enable( level );
/* call isp */
- if( _ISR_Vector_table[ vector])
+ if ( _ISR_Vector_table[ vector])
(*_ISR_Vector_table[ vector ])( vector );
_ISR_Disable( level );
@@ -59,9 +59,9 @@
_ISR_Nest_level--;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+ if ( _ISR_Nest_level == 0 )
/* restore old stack pointer */
stack_ptr = _old_stack_ptr;
#endif
*ralf*:
New.
A 1.1 contrib/crossrpms/rtems4.11/sparc64/.cvsignore
A 1.1 contrib/crossrpms/rtems4.11/sparc64/Makefile.am
A 1.1 contrib/crossrpms/rtems4.11/sparc64/binutils-sources.add
A 1.1 contrib/crossrpms/rtems4.11/sparc64/cpukit-sources.add
A 1.1 contrib/crossrpms/rtems4.11/sparc64/gcc-sources.add
A 1.1 contrib/crossrpms/rtems4.11/sparc64/gdb-sources.add
A 1.1 contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec
diff -u /dev/null rtems/contrib/crossrpms/rtems4.11/sparc64/.cvsignore:1.1
--- /dev/null Fri May 21 12:12:52 2010
+++ rtems/contrib/crossrpms/rtems4.11/sparc64/.cvsignore Fri May 21 11:16:18 2010
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+*.spec.in
diff -u /dev/null rtems/contrib/crossrpms/rtems4.11/sparc64/Makefile.am:1.1
--- /dev/null Fri May 21 12:12:52 2010
+++ rtems/contrib/crossrpms/rtems4.11/sparc64/Makefile.am Fri May 21 11:16:18 2010
@@ -0,0 +1,33 @@
+# $Id$
+
+rtems_api = 4.11
+TARGET = sparc64-rtems4.11
+
+include $(top_srcdir)/mkspec.am
+
+BINUTILS_VERS = 2.20.1
+BINUTILS_PKGVERS = $(BINUTILS_VERS)
+BINUTILS_RPMREL = 2
+include ../binutils.am
+BINUTILS_OPTS +=
+
+#GCC_VERS = 4.5.0
+#GCC_PKGVERS = $(GCC_VERS)
+#GCC_RPMREL = 0
+#NEWLIB_VERS = 1.18.0
+#NEWLIB_PKGVERS = $(NEWLIB_VERS)
+#NEWLIB_RPMREL = `expr $(GCC_RPMREL)`
+#include ../gcc.am
+#GCC_OPTS += --languages=cxx
+
+#GDB_VERS = 7.1
+#GDB_PKGVERS = $(GDB_VERS)
+#GDB_RPMREL = 0
+#include ../gdb.am
+#GDB_OPTS +=
+
+#CPUKIT_VERS = 4.9.99.0
+#CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2
+#CPUKIT_RPMREL = 1
+#include ../cpukit.am
+#CPUKIT_OPTS +=
diff -u /dev/null rtems/contrib/crossrpms/rtems4.11/sparc64/binutils-sources.add:1.1
--- /dev/null Fri May 21 12:12:52 2010
+++ rtems/contrib/crossrpms/rtems4.11/sparc64/binutils-sources.add Fri May 21 11:15:59 2010
@@ -0,0 +1,2 @@
+Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.20.1-rtems4.11-20100521.diff
diff -u /dev/null rtems/contrib/crossrpms/rtems4.11/sparc64/cpukit-sources.add:1.1
--- /dev/null Fri May 21 12:12:52 2010
+++ rtems/contrib/crossrpms/rtems4.11/sparc64/cpukit-sources.add Fri May 21 11:16:00 2010
@@ -0,0 +1,2 @@
+Source0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/rtems-%{cpukit_pkgvers}.tar.bz2
+%{?_without_sources:NoSource: 0}
diff -u /dev/null rtems/contrib/crossrpms/rtems4.11/sparc64/gcc-sources.add:1.1
--- /dev/null Fri May 21 12:12:52 2010
+++ rtems/contrib/crossrpms/rtems4.11/sparc64/gcc-sources.add Fri May 21 11:16:00 2010
@@ -0,0 +1,47 @@
+%if "%{gcc_version}" == "4.5.0"
+Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.0-rtems4.11-20100414.diff
+%endif
+%if "%{gcc_version}" == "4.4.3"
+Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.3-rtems4.10-20100315.diff
+%endif
+%{?_without_sources:NoSource: 0}
+
+%if %build_cxx
+%if "%{gcc_version}" == "4.5.0"
+Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
+%if "%{gcc_version}" == "4.4.3"
+Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+%endif
+%{?_without_sources:NoSource: 1}
+
+%endif
+%if %build_fortran
+Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
+%{?_without_sources:NoSource: 2}
+
+%endif
+%if %build_gcj
+Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-java-%{gcc_pkgvers}.tar.bz2
+%{?_without_sources:NoSource: 3}
+
+%endif
+%if %build_gnat
+Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-ada-%{gcc_pkgvers}.tar.bz2
+%{?_without_sources:NoSource: 4}
+
+%endif
+%if %build_objc
+Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.tar.bz2
+%{?_without_sources:NoSource: 5}
+
+%endif
+%if %build_newlib
+%if "%{newlib_version}" == "1.18.0"
+Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
+Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.11-20100423.diff
+%endif
+%{?_without_sources:NoSource: 50}
+%endif
diff -u /dev/null rtems/contrib/crossrpms/rtems4.11/sparc64/gdb-sources.add:1.1
--- /dev/null Fri May 21 12:12:53 2010
+++ rtems/contrib/crossrpms/rtems4.11/sparc64/gdb-sources.add Fri May 21 11:16:00 2010
@@ -0,0 +1,9 @@
+%if "%{gdb_version}" == "7.1"
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-7.1-rtems4.10-20100319.diff
+%endif
+
+%if "%{gdb_version}" == "7.0.1"
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-%{gdb_version}-rtems4.10-20091222.diff
+%endif
diff -u /dev/null rtems/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec:1.1
--- /dev/null Fri May 21 12:12:53 2010
+++ rtems/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec Fri May 21 11:16:18 2010
@@ -0,0 +1,268 @@
+#
+# Please send bugfixes or comments to
+# http://www.rtems.org/bugzilla
+#
+
+%define _prefix /opt/rtems-4.11
+%define _exec_prefix %{_prefix}
+%define _bindir %{_exec_prefix}/bin
+%define _sbindir %{_exec_prefix}/sbin
+%define _libexecdir %{_exec_prefix}/libexec
+%define _datarootdir %{_prefix}/share
+%define _datadir %{_datarootdir}
+%define _sysconfdir %{_prefix}/etc
+%define _sharedstatedir %{_prefix}/com
+%define _localstatedir %{_prefix}/var
+%define _includedir %{_prefix}/include
+%define _libdir %{_exec_prefix}/%{_lib}
+%define _mandir %{_datarootdir}/man
+%define _infodir %{_datarootdir}/info
+%define _localedir %{_datarootdir}/locale
+
+%ifos cygwin cygwin32 mingw mingw32
+%define _exeext .exe
+%define debug_package %{nil}
+%define _libdir %{_exec_prefix}/lib
+%else
+%define _exeext %{nil}
+%endif
+
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix %{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%define binutils_pkgvers 2.20.1
+%define binutils_version 2.20.1
+%define binutils_rpmvers %{expand:%(echo "2.20.1" | tr - _ )}
+
+Name: rtems-4.11-sparc64-rtems4.11-binutils
+Summary: Binutils for target sparc64-rtems4.11
+Group: Development/Tools
+Version: %{binutils_rpmvers}
+Release: 2%{?dist}
+License: GPL/LGPL
+URL: http://sources.redhat.com/binutils
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: %{_host_rpmprefix}gcc
+
+%if "%{binutils_version}" >= "2.18"
+# Bug in bfd: Doesn't build without texinfo installed
+BuildRequires: texinfo >= 4.2
+%else
+# Required for building the infos
+BuildRequires: /sbin/install-info
+BuildRequires: texinfo >= 4.2
+%endif
+BuildRequires: flex
+BuildRequires: bison
+
+Requires: rtems-4.11-binutils-common
+
+Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.20.1-rtems4.11-20100521.diff
+
+%description
+Cross binutils for target sparc64-rtems4.11
+%prep
+%setup -q -c -T -n %{name}-%{version}
+
+%setup -q -D -T -n %{name}-%{version} -a0
+cd binutils-%{binutils_pkgvers}
+%{?PATCH0:%patch0 -p1}
+cd ..
+
+%build
+ export PATH="%{_bindir}:${PATH}"
+ mkdir -p build
+ cd build
+%if "%{_build}" != "%{_host}"
+ CFLAGS_FOR_BUILD="-g -O2 -Wall" \
+%endif
+ CFLAGS="$RPM_OPT_FLAGS" \
+ ../binutils-%{binutils_pkgvers}/configure \
+ --build=%_build --host=%_host \
+ --target=sparc64-rtems4.11 \
+ --verbose --disable-nls \
+ --without-included-gettext \
+ --disable-win32-registry \
+ --disable-werror \
+ --prefix=%{_prefix} --bindir=%{_bindir} \
+ --exec-prefix=%{_exec_prefix} \
+ --includedir=%{_includedir} --libdir=%{_libdir} \
+ --mandir=%{_mandir} --infodir=%{_infodir}
+
+ make %{?_smp_mflags} all
+ make info
+ cd ..
+
+%install
+ export PATH="%{_bindir}:${PATH}"
+ rm -rf $RPM_BUILD_ROOT
+
+ cd build
+ make DESTDIR=$RPM_BUILD_ROOT install
+
+ make prefix=$RPM_BUILD_ROOT%{_prefix} \
+ bindir=$RPM_BUILD_ROOT%{_bindir} \
+ includedir=$RPM_BUILD_ROOT%{_includedir} \
+ libdir=$RPM_BUILD_ROOT%{_libdir} \
+ infodir=$RPM_BUILD_ROOT%{_infodir} \
+ mandir=$RPM_BUILD_ROOT%{_mandir} \
+ exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
+ install-info
+
+# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
+ rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
+
+ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+ touch $RPM_BUILD_ROOT%{_infodir}/dir
+
+# binutils does not install share/locale, however it uses it
+ mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
+
+# We don't ship host files
+ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
+
+# manpages without corresponding tools
+ if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc64-rtems4.11-dlltool%{_exeext}; then
+ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc64-rtems4.11-dlltool*
+ fi
+ if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc64-rtems4.11-nlmconv%{_exeext}; then
+ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc64-rtems4.11-nlmconv*
+ fi
+ if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc64-rtems4.11-windres%{_exeext}; then
+ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc64-rtems4.11-windres*
+ fi
+ if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc64-rtems4.11-windmc%{_exeext}; then
+ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc64-rtems4.11-windmc*
+ fi
+
+ cd ..
+
+# Extract %%__os_install_post into os_install_post~
+cat << \EOF > os_install_post~
+%__os_install_post
+EOF
+
+# Generate customized brp-*scripts
+cat os_install_post~ | while read a x y; do
+case $a in
+# Prevent brp-strip* from trying to handle foreign binaries
+*/brp-strip*)
+ b=$(basename $a)
+ sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
+ chmod a+x $b
+ ;;
+# Fix up brp-compress to handle %%_prefix != /usr
+*/brp-compress*)
+ b=$(basename $a)
+ sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
+ chmod a+x $b
+ ;;
+esac
+done
+
+sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+< os_install_post~ > os_install_post
+%define __os_install_post . ./os_install_post
+
+%clean
+ rm -rf $RPM_BUILD_ROOT
+
+# ==============================================================
+# sparc64-rtems4.11-binutils
+# ==============================================================
+# %package -n rtems-4.11-sparc64-rtems4.11-binutils
+# Summary: rtems binutils for sparc64-rtems4.11
+# Group: Development/Tools
+# %if %build_infos
+# Requires: rtems-4.11-binutils-common
+# %endif
+
+%description -n rtems-4.11-sparc64-rtems4.11-binutils
+GNU binutils targetting sparc64-rtems4.11.
+
+%files -n rtems-4.11-sparc64-rtems4.11-binutils
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_datarootdir}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
+%{_mandir}/man1/sparc64-rtems4.11-*.1*
+
+%dir %{_bindir}
+%{_bindir}/sparc64-rtems4.11-*
+
+%dir %{_exec_prefix}/sparc64-rtems4.11
+%dir %{_exec_prefix}/sparc64-rtems4.11/bin
+%{_exec_prefix}/sparc64-rtems4.11/bin/*
+
+%dir %{_exec_prefix}/sparc64-rtems4.11/lib
+%{_exec_prefix}/sparc64-rtems4.11/lib/ldscripts
+# ==============================================================
+# rtems-4.11-binutils-common
+# ==============================================================
+%package -n rtems-4.11-binutils-common
+Summary: Base package for RTEMS binutils
+Group: Development/Tools
+%{?_with_noarch_subpackages:BuildArch: noarch}
+
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+
+%description -n rtems-4.11-binutils-common
+
+RTEMS is an open source operating system for embedded systems.
+
+This is the base for binutils regardless of target CPU.
+
+%post -n rtems-4.11-binutils-common
+ /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
+ /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
+ /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
+ /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
+ /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
+ /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
+
+%preun -n rtems-4.11-binutils-common
+if [ $1 -eq 0 ]; then
+ /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || :
+ /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || :
+ /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || :
+ /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || :
+ /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || :
+ /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || :
+fi
+
+%files -n rtems-4.11-binutils-common
+%defattr(-,root,root)
+%dir %{_prefix}
+%dir %{_infodir}
+%ghost %{_infodir}/dir
+%{_infodir}/as.info*
+%{_infodir}/bfd.info*
+%{_infodir}/binutils.info*
+%{_infodir}/ld.info*
+%{_infodir}/standards.info*
+%{_infodir}/gprof.info*
+
+%dir %{_prefix}/share
+%dir %{_prefix}/share/locale
+
*ralf*:
Add sparc64.
M 1.2 contrib/crossrpms/rtems4.11/Makefile.am
diff -u rtems/contrib/crossrpms/rtems4.11/Makefile.am:1.1 rtems/contrib/crossrpms/rtems4.11/Makefile.am:1.2
--- rtems/contrib/crossrpms/rtems4.11/Makefile.am:1.1 Wed Mar 17 00:06:20 2010
+++ rtems/contrib/crossrpms/rtems4.11/Makefile.am Fri May 21 11:16:56 2010
@@ -15,3 +15,5 @@
SUBDIRS += powerpc
SUBDIRS += sh
SUBDIRS += sparc
+
+SUBDIRS += sparc64
*ralf*:
Add netbsd, rtems4.11/sparc64.
M 1.73 contrib/crossrpms/configure.ac
diff -u rtems/contrib/crossrpms/configure.ac:1.72 rtems/contrib/crossrpms/configure.ac:1.73
--- rtems/contrib/crossrpms/configure.ac:1.72 Mon Apr 19 11:58:15 2010
+++ rtems/contrib/crossrpms/configure.ac Fri May 21 11:19:04 2010
@@ -41,6 +41,7 @@
targets="$targets $a-$o"
done
for d in freebsd*/*/Makefile.am \
+ netbsd*/*/Makefile.am \
cygwin*/*/Makefile.am \
mingw*/*/Makefile.am; \
do
@@ -201,6 +202,7 @@
AC_CONFIG_FILES([rtems4.11/powerpc/Makefile])
AC_CONFIG_FILES([rtems4.11/sh/Makefile])
AC_CONFIG_FILES([rtems4.11/sparc/Makefile])
+AC_CONFIG_FILES([rtems4.11/sparc64/Makefile])
AC_CONFIG_FILES([autotools/Makefile])
*ralf*:
Merge sparc64-rtems.
A 1.1 contrib/crossrpms/patches/binutils-2.20.1-rtems4.11-20100521.diff
diff -u /dev/null rtems/contrib/crossrpms/patches/binutils-2.20.1-rtems4.11-20100521.diff:1.1
--- /dev/null Fri May 21 12:12:53 2010
+++ rtems/contrib/crossrpms/patches/binutils-2.20.1-rtems4.11-20100521.diff Fri May 21 11:21:07 2010
@@ -0,0 +1,76 @@
+diff -Naur binutils-2.20.1.orig/bfd/config.bfd binutils-2.20.1/bfd/config.bfd
+--- binutils-2.20.1.orig/bfd/config.bfd 2009-08-06 19:38:00.000000000 +0200
++++ binutils-2.20.1/bfd/config.bfd 2010-05-21 17:57:15.000000000 +0200
+@@ -1430,7 +1430,7 @@
+ targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
+ want64=true
+ ;;
+- sparc64-*-elf*)
++ sparc64-*-elf* | sparc64-*-rtems* )
+ targ_defvec=bfd_elf64_sparc_vec
+ targ_selvecs=bfd_elf32_sparc_vec
+ want64=true
+@@ -1439,7 +1439,7 @@
+ sparc*-*-coff*)
+ targ_defvec=sparccoff_vec
+ ;;
+- sparc*-*-rtems*)
++ sparc-*-rtems*)
+ targ_defvec=bfd_elf32_sparc_vec
+ targ_selvecs="sunos_big_vec sparccoff_vec"
+ ;;
+diff -Naur binutils-2.20.1.orig/bfd/Makefile.am binutils-2.20.1/bfd/Makefile.am
+--- binutils-2.20.1.orig/bfd/Makefile.am 2010-03-03 14:31:55.000000000 +0100
++++ binutils-2.20.1/bfd/Makefile.am 2010-05-21 17:55:59.000000000 +0200
+@@ -4,7 +4,7 @@
+ ACLOCAL_AMFLAGS = -I . -I .. -I ../config
+
+ # Uncomment the following line when doing a release.
+-# RELEASE=y
++RELEASE=y
+
+ INCDIR = $(srcdir)/../include
+ CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
+diff -Naur binutils-2.20.1.orig/bfd/Makefile.in binutils-2.20.1/bfd/Makefile.in
+--- binutils-2.20.1.orig/bfd/Makefile.in 2010-03-03 14:59:15.000000000 +0100
++++ binutils-2.20.1/bfd/Makefile.in 2010-05-21 17:55:59.000000000 +0200
+@@ -317,7 +317,7 @@
+ ACLOCAL_AMFLAGS = -I . -I .. -I ../config
+
+ # Uncomment the following line when doing a release.
+-# RELEASE=y
++RELEASE = y
+ INCDIR = $(srcdir)/../include
+ CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
+ SUBDIRS = doc po
+diff -Naur binutils-2.20.1.orig/gas/configure.tgt binutils-2.20.1/gas/configure.tgt
+--- binutils-2.20.1.orig/gas/configure.tgt 2009-09-09 10:13:28.000000000 +0200
++++ binutils-2.20.1/gas/configure.tgt 2010-05-21 17:57:15.000000000 +0200
+@@ -369,6 +369,7 @@
+ shle*-*-kaos*) fmt=elf ;;
+ sh64-*-elf*) fmt=elf ;;
+
++ sparc64-*-rtems*) fmt=elf ;;
+ sparc-*-rtems*) fmt=elf ;;
+ sparc-*-sunos4*) fmt=aout em=sun3 ;;
+ sparc-*-aout) fmt=aout em=sparcaout ;;
+diff -Naur binutils-2.20.1.orig/ld/configure.tgt binutils-2.20.1/ld/configure.tgt
+--- binutils-2.20.1.orig/ld/configure.tgt 2009-08-06 19:38:03.000000000 +0200
++++ binutils-2.20.1/ld/configure.tgt 2010-05-21 17:57:15.000000000 +0200
+@@ -564,6 +564,7 @@
+ targ_extra_libpath=$targ_extra_emuls ;;
+ sparc64-*-aout*) targ_emul=sparcaout ;;
+ sparc64-*-elf*) targ_emul=elf64_sparc ;;
++sparc64-*-rtems*) targ_emul=elf64_sparc ;;
+ sparc-sun-sunos4*) targ_emul=sun4 ;;
+ sparclite*-*-elf) targ_emul=elf32_sparc ;;
+ sparclite*-*-coff) targ_emul=coff_sparc ;;
+@@ -612,7 +613,7 @@
+ tdir_elf32_sparc=`echo ${targ_alias} | sed -e 's/64//'` ;;
+ sparc*-*-solaris2*) targ_emul=elf32_sparc ;;
+ sparc*-wrs-vxworks*) targ_emul=sparcaout ;;
+-sparc*-*-rtems*) targ_emul=elf32_sparc
++sparc-*-rtems*) targ_emul=elf32_sparc
+ ;;
+ spu-*-elf*) targ_emul=elf32_spu ;;
+ tic30-*-*aout*) targ_emul=tic30aout ;;
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100521/350a0960/attachment.html>
More information about the vc
mailing list