change log for rtems (2010-09-08)
rtems-vc at rtems.org
rtems-vc at rtems.org
Wed Sep 8 07:10:51 UTC 2010
*ralf*:
Housekeeping.
R 1.1 contrib/crossrpms/autotools/rtems-4.11-autoconf.spec
R 1.1 contrib/crossrpms/autotools/rtems-4.11-automake.spec
*ralf*:
Housekeeping
R 1.8 contrib/crossrpms/autotools/rtems-4.10-autoconf.spec
R 1.8 contrib/crossrpms/autotools/rtems-4.10-automake.spec
*ralf*:
Add workaround to mingw shipping an obsolete version of perl.
Remove legacy support for automake < 1.11.
M 1.14 contrib/crossrpms/autotools/automake.add
diff -u rtems/contrib/crossrpms/autotools/automake.add:1.13 rtems/contrib/crossrpms/autotools/automake.add:1.14
--- rtems/contrib/crossrpms/autotools/automake.add:1.13 Sat Jul 25 23:55:43 2009
+++ rtems/contrib/crossrpms/autotools/automake.add Tue Sep 7 09:38:36 2010
@@ -4,10 +4,10 @@
%if "%{_prefix}" != "/usr"
%define name @rpmprefix at automake
-%define requirements @rpmprefix at autoconf >= 2.60
+%define requirements @rpmprefix at autoconf >= 2.61
%else
%define name automake
-%define requirements autoconf >= 2.60
+%define requirements autoconf >= 2.61
%endif
Name: %{name}
@@ -21,10 +21,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: %{requirements} perl
-%if "%{version}" < "1.11"
-# automake >= 1.11 ships man-pages
-BuildRequires: help2man
-%endif
Requires: %{requirements}
Requires(post): /sbin/install-info
Requires(preun):/sbin/install-info
@@ -62,9 +58,16 @@
%build
PATH=%{_bindir}:$PATH
+case %_host in
+*-mingw32)
+# MinGW ships obsolete perl-5.6.1, which doesn't support threads
+ echo am_cv_prog_PERL_ithreads=no > config.cache
+ ;;
+esac
+
# Don't use %%configure, it replaces config.sub/config.guess with the
# outdated versions bundled with rpm.
-./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
+./configure -C --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
--bindir=%{_bindir} --datadir=%{_datadir} \
--docdir=%{_datadir}/automake-%{amvers}/doc
make
@@ -73,18 +76,6 @@
rm -rf "$RPM_BUILD_ROOT"
make DESTDIR=${RPM_BUILD_ROOT} install
-%if "%{version}" < "1.11"
-# automake >= 1.11 ships man-pages
-install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1
-for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \
- $RPM_BUILD_ROOT%{_bindir}/automake ;
-do
- perllibdir=$RPM_BUILD_ROOT/%{_datadir}/automake-%{amvers} \
- help2man $i > `basename $i`.1
- install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
-done
-%endif
-
%if "%{_prefix}" != "/usr"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist
*ralf* (on branch rtems-4-10-branch):
Sync with HEAD.
M 1.13.2.1 contrib/crossrpms/autotools/automake.add
diff -u rtems/contrib/crossrpms/autotools/automake.add:1.13 rtems/contrib/crossrpms/autotools/automake.add:1.13.2.1
--- rtems/contrib/crossrpms/autotools/automake.add:1.13 Sat Jul 25 23:55:43 2009
+++ rtems/contrib/crossrpms/autotools/automake.add Tue Sep 7 10:04:57 2010
@@ -4,10 +4,10 @@
%if "%{_prefix}" != "/usr"
%define name @rpmprefix at automake
-%define requirements @rpmprefix at autoconf >= 2.60
+%define requirements @rpmprefix at autoconf >= 2.61
%else
%define name automake
-%define requirements autoconf >= 2.60
+%define requirements autoconf >= 2.61
%endif
Name: %{name}
@@ -21,10 +21,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: %{requirements} perl
-%if "%{version}" < "1.11"
-# automake >= 1.11 ships man-pages
-BuildRequires: help2man
-%endif
Requires: %{requirements}
Requires(post): /sbin/install-info
Requires(preun):/sbin/install-info
@@ -62,9 +58,16 @@
%build
PATH=%{_bindir}:$PATH
+case %_host in
+*-mingw32)
+# MinGW ships obsolete perl-5.6.1, which doesn't support threads
+ echo am_cv_prog_PERL_ithreads=no > config.cache
+ ;;
+esac
+
# Don't use %%configure, it replaces config.sub/config.guess with the
# outdated versions bundled with rpm.
-./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
+./configure -C --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
--bindir=%{_bindir} --datadir=%{_datadir} \
--docdir=%{_datadir}/automake-%{amvers}/doc
make
@@ -73,18 +76,6 @@
rm -rf "$RPM_BUILD_ROOT"
make DESTDIR=${RPM_BUILD_ROOT} install
-%if "%{version}" < "1.11"
-# automake >= 1.11 ships man-pages
-install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1
-for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \
- $RPM_BUILD_ROOT%{_bindir}/automake ;
-do
- perllibdir=$RPM_BUILD_ROOT/%{_datadir}/automake-%{amvers} \
- help2man $i > `basename $i`.1
- install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
-done
-%endif
-
%if "%{_prefix}" != "/usr"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist
*ralf* (on branch rtems-4-10-branch):
Bump AUTOMAKE_RPMREL.
M 1.26 contrib/crossrpms/autotools/Makefile.am
M 1.23.2.1 contrib/crossrpms/autotools/Makefile.am
diff -u rtems/contrib/crossrpms/autotools/Makefile.am:1.25 rtems/contrib/crossrpms/autotools/Makefile.am:1.26
--- rtems/contrib/crossrpms/autotools/Makefile.am:1.25 Thu Aug 5 01:01:02 2010
+++ rtems/contrib/crossrpms/autotools/Makefile.am Tue Sep 7 09:38:54 2010
@@ -9,5 +9,5 @@
include ./autoconf.am
AUTOMAKE_VERS = 1.11.1
-AUTOMAKE_RPMREL = 1
+AUTOMAKE_RPMREL = 2
include ./automake.am
diff -u rtems/contrib/crossrpms/autotools/Makefile.am:1.23 rtems/contrib/crossrpms/autotools/Makefile.am:1.23.2.1
--- rtems/contrib/crossrpms/autotools/Makefile.am:1.23 Wed Dec 9 03:29:59 2009
+++ rtems/contrib/crossrpms/autotools/Makefile.am Tue Sep 7 10:05:17 2010
@@ -9,5 +9,5 @@
include ./autoconf.am
AUTOMAKE_VERS = 1.11.1
-AUTOMAKE_RPMREL = 1
+AUTOMAKE_RPMREL = 2
include ./automake.am
*ralf*:
Add --enable-sim-trace for powerpc-rtems*
M 1.34 contrib/crossrpms/gdb/gdb.add
diff -u rtems/contrib/crossrpms/gdb/gdb.add:1.33 rtems/contrib/crossrpms/gdb/gdb.add:1.34
--- rtems/contrib/crossrpms/gdb/gdb.add:1.33 Sat Mar 20 01:56:01 2010
+++ rtems/contrib/crossrpms/gdb/gdb.add Tue Sep 7 12:04:16 2010
@@ -18,6 +18,8 @@
%if "%{_build}" != "%{_host}"
# psim doesn't support Cdn-X
%define build_sim --disable-sim
+%else
+%define build_sim --enable-sim --enable-sim-trace
%endif
%endif
%if "@tool_target@" == "sparc-rtems at rtems_api@"
*ralf*:
Bump GDB_RPMREL.
M 1.31 contrib/crossrpms/rtems4.11/powerpc/Makefile.am
diff -u rtems/contrib/crossrpms/rtems4.11/powerpc/Makefile.am:1.30 rtems/contrib/crossrpms/rtems4.11/powerpc/Makefile.am:1.31
--- rtems/contrib/crossrpms/rtems4.11/powerpc/Makefile.am:1.30 Fri Sep 3 00:47:31 2010
+++ rtems/contrib/crossrpms/rtems4.11/powerpc/Makefile.am Tue Sep 7 12:04:44 2010
@@ -22,7 +22,7 @@
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
include ../gdb.am
GDB_OPTS +=
*ralf*:
gdb-7.2-rtems4.11-20100907.diff
M 1.6 contrib/crossrpms/rtems4.11/powerpc/gdb-sources.add
diff -u rtems/contrib/crossrpms/rtems4.11/powerpc/gdb-sources.add:1.5 rtems/contrib/crossrpms/rtems4.11/powerpc/gdb-sources.add:1.6
--- rtems/contrib/crossrpms/rtems4.11/powerpc/gdb-sources.add:1.5 Fri Sep 3 00:48:08 2010
+++ rtems/contrib/crossrpms/rtems4.11/powerpc/gdb-sources.add Tue Sep 7 12:07:44 2010
@@ -1,6 +1,6 @@
%if "%{gdb_version}" == "7.2"
Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
%endif
%if "%{gdb_version}" == "7.1"
Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2
*ralf*:
Regenerate.
M 1.8.2.1 contrib/crossrpms/autotools/rtems-4.10-automake.spec
M 1.2 contrib/crossrpms/autotools/rtems-4.11-automake.spec
M 1.8 contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec
diff -u rtems/contrib/crossrpms/autotools/rtems-4.10-automake.spec:1.8 rtems/contrib/crossrpms/autotools/rtems-4.10-automake.spec:1.8.2.1
--- rtems/contrib/crossrpms/autotools/rtems-4.10-automake.spec:1.8 Wed Dec 9 03:29:59 2009
+++ rtems/contrib/crossrpms/autotools/rtems-4.10-automake.spec Tue Sep 7 10:05:38 2010
@@ -50,23 +50,19 @@
%define amvers 1.11
%define name rtems-4.10-automake
-%define requirements rtems-4.10-autoconf >= 2.60
+%define requirements rtems-4.10-autoconf >= 2.61
Name: %{name}
URL: http://sources.redhat.com/automake
License: GPL
Group: Development/Tools
Version: %{rpmvers}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Tool for automatically generating GNU style Makefile.in's
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: %{requirements} perl
-%if "%{version}" < "1.11"
-# automake >= 1.11 ships man-pages
-BuildRequires: help2man
-%endif
Requires: %{requirements}
Requires(post): /sbin/install-info
Requires(preun):/sbin/install-info
@@ -105,9 +101,16 @@
%build
PATH=%{_bindir}:$PATH
+case %_host in
+*-mingw32)
+# MinGW ships obsolete perl-5.6.1, which doesn't support threads
+ echo am_cv_prog_PERL_ithreads=no > config.cache
+ ;;
+esac
+
# Don't use %%configure, it replaces config.sub/config.guess with the
# outdated versions bundled with rpm.
-./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
+./configure -C --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
--bindir=%{_bindir} --datadir=%{_datadir} \
--docdir=%{_datadir}/automake-%{amvers}/doc
make
@@ -116,18 +119,6 @@
rm -rf "$RPM_BUILD_ROOT"
make DESTDIR=${RPM_BUILD_ROOT} install
-%if "%{version}" < "1.11"
-# automake >= 1.11 ships man-pages
-install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1
-for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \
- $RPM_BUILD_ROOT%{_bindir}/automake ;
-do
- perllibdir=$RPM_BUILD_ROOT/%{_datadir}/automake-%{amvers} \
- help2man $i > `basename $i`.1
- install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
-done
-%endif
-
mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist
diff -u rtems/contrib/crossrpms/autotools/rtems-4.11-automake.spec:1.1 rtems/contrib/crossrpms/autotools/rtems-4.11-automake.spec:1.2
--- rtems/contrib/crossrpms/autotools/rtems-4.11-automake.spec:1.1 Mon Mar 22 08:58:24 2010
+++ rtems/contrib/crossrpms/autotools/rtems-4.11-automake.spec Tue Sep 7 09:39:18 2010
@@ -50,23 +50,19 @@
%define amvers 1.11
%define name rtems-4.11-automake
-%define requirements rtems-4.11-autoconf >= 2.60
+%define requirements rtems-4.11-autoconf >= 2.61
Name: %{name}
URL: http://sources.redhat.com/automake
License: GPL
Group: Development/Tools
Version: %{rpmvers}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Tool for automatically generating GNU style Makefile.in's
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: %{requirements} perl
-%if "%{version}" < "1.11"
-# automake >= 1.11 ships man-pages
-BuildRequires: help2man
-%endif
Requires: %{requirements}
Requires(post): /sbin/install-info
Requires(preun):/sbin/install-info
@@ -105,9 +101,16 @@
%build
PATH=%{_bindir}:$PATH
+case %_host in
+*-mingw32)
+# MinGW ships obsolete perl-5.6.1, which doesn't support threads
+ echo am_cv_prog_PERL_ithreads=no > config.cache
+ ;;
+esac
+
# Don't use %%configure, it replaces config.sub/config.guess with the
# outdated versions bundled with rpm.
-./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
+./configure -C --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
--bindir=%{_bindir} --datadir=%{_datadir} \
--docdir=%{_datadir}/automake-%{amvers}/doc
make
@@ -116,18 +119,6 @@
rm -rf "$RPM_BUILD_ROOT"
make DESTDIR=${RPM_BUILD_ROOT} install
-%if "%{version}" < "1.11"
-# automake >= 1.11 ships man-pages
-install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1
-for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \
- $RPM_BUILD_ROOT%{_bindir}/automake ;
-do
- perllibdir=$RPM_BUILD_ROOT/%{_datadir}/automake-%{amvers} \
- help2man $i > `basename $i`.1
- install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
-done
-%endif
-
mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist
diff -u rtems/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec:1.7 rtems/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec:1.8
--- rtems/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec:1.7 Fri Sep 3 00:48:41 2010
+++ rtems/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec Tue Sep 7 12:08:09 2010
@@ -52,7 +52,7 @@
Summary: Gdb for target powerpc-rtems4.11
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +64,8 @@
%if "%{_build}" != "%{_host}"
# psim doesn't support Cdn-X
%define build_sim --disable-sim
+%else
+%define build_sim --enable-sim --enable-sim-trace
%endif
%if "%{gdb_version}" >= "6.6"
@@ -106,7 +108,7 @@
%if "%{gdb_version}" == "7.2"
Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.2.tar.bz2
-Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100903.diff
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.2-rtems4.11-20100907.diff
%endif
%if "%{gdb_version}" == "7.1"
Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.1.tar.bz2
*ralf*:
Simplify %if rules.
M 1.11 contrib/crossrpms/specstrip
diff -u rtems/contrib/crossrpms/specstrip:1.10 rtems/contrib/crossrpms/specstrip:1.11
--- rtems/contrib/crossrpms/specstrip:1.10 Tue Apr 6 06:31:11 2010
+++ rtems/contrib/crossrpms/specstrip Tue Sep 7 23:01:16 2010
@@ -201,21 +201,13 @@
} elsif ( $line =~/^%if\s+(.*)\s*$/ )
{
my $exp = $1;
- if ( $condstack[$#condstack] =~ m/<FALSE:.*\s*>$/ ) {
- push @condstack,"<FALSE:$exp>";
- } else {
- push @condstack,"<IFOT:$exp>";
- push @buffer4, "$line\n";
- }
+ push @condstack,"<IFOT:$exp>";
+ push @buffer4, "$line\n";
} elsif ( $line =~/^%if((os|narch)\s+.*)\s*$/ )
{
my $exp = $1;
- if ( $condstack[$#condstack] =~ m/<FALSE:(.*)\s*>$/ ) {
- push @condstack,"<FALSE:$exp>";
- } else {
- push @condstack,"<IFOT:$exp>";
- push @buffer4, "$line\n";
- }
+ push @condstack,"<IFOT:$exp>";
+ push @buffer4, "$line\n";
} elsif ( $line =~ /^%else\s*$/ ) {
if ( $condstack[$#condstack] =~ m/<TRUE:(.*)\s*>$/ ) {
$condstack[$#condstack] = "<FALSE:$1>";
*ralf*:
Prepend @condstack to @buffer4 lines.
M 1.13 contrib/crossrpms/specstrip
M 1.12 contrib/crossrpms/specstrip
diff -u rtems/contrib/crossrpms/specstrip:1.12 rtems/contrib/crossrpms/specstrip:1.13
--- rtems/contrib/crossrpms/specstrip:1.12 Tue Sep 7 23:04:10 2010
+++ rtems/contrib/crossrpms/specstrip Tue Sep 7 23:05:24 2010
@@ -223,7 +223,7 @@
} elsif ( $condstack[$#condstack] =~ m/<FALSE:.*>$/ ) {
# print STDERR "ENDIF: FALSE\n";
} else {
- push @buffer4, "%endif\n";
+ push @buffer4, "@condstack:$line\n";
}
# print STDERR "POP: $line\n";
pop @condstack;
diff -u rtems/contrib/crossrpms/specstrip:1.11 rtems/contrib/crossrpms/specstrip:1.12
--- rtems/contrib/crossrpms/specstrip:1.11 Tue Sep 7 23:01:16 2010
+++ rtems/contrib/crossrpms/specstrip Tue Sep 7 23:04:10 2010
@@ -202,19 +202,19 @@
{
my $exp = $1;
push @condstack,"<IFOT:$exp>";
- push @buffer4, "$line\n";
+ push @buffer4, "@condstack:$line\n";
} elsif ( $line =~/^%if((os|narch)\s+.*)\s*$/ )
{
my $exp = $1;
push @condstack,"<IFOT:$exp>";
- push @buffer4, "$line\n";
+ push @buffer4, "@condstack:$line\n";
} elsif ( $line =~ /^%else\s*$/ ) {
if ( $condstack[$#condstack] =~ m/<TRUE:(.*)\s*>$/ ) {
$condstack[$#condstack] = "<FALSE:$1>";
} elsif ( $condstack[$#condstack] =~ m/<FALSE:(.*)\s*>$/ ) {
$condstack[$#condstack] = "<TRUE:$1>";
} else {
- push @buffer4, "$line\n";
+ push @buffer4, "@condstack:$line\n";
}
} elsif ( $line =~ /^%endif\s*$/ ) {
@@ -230,10 +230,10 @@
} else {
# print STDERR "CATCH $condstack[$#condstack]:$line\n";
if ( $condstack[$#condstack] =~ m/<TRUE:.*>$/ ) {
- push @buffer4, "$line\n";
+ push @buffer4, "@condstack:$line\n";
} elsif ( $condstack[$#condstack] =~ m/<FALSE:.*>$/ ) {
} else {
- push @buffer4, "$line\n";
+ push @buffer4, "@condstack:$line\n";
}
}
*ralf*:
Parse condstack in final printing.
M 1.14 contrib/crossrpms/specstrip
diff -u rtems/contrib/crossrpms/specstrip:1.13 rtems/contrib/crossrpms/specstrip:1.14
--- rtems/contrib/crossrpms/specstrip:1.13 Tue Sep 7 23:05:24 2010
+++ rtems/contrib/crossrpms/specstrip Tue Sep 7 23:11:06 2010
@@ -240,4 +240,16 @@
# print STDERR @condstack, "LINE: $line\n";
}
-print STDOUT @buffer4;
+print STDERR @buffer4 if $verbose > 2;
+
+foreach my $line (@buffer4) {
+ if ( $line =~ /^(<.*>):(.*)$/ ) {
+ if ( $1 =~ m/.*<FALSE:.*$/ ) {
+ } else {
+ print STDOUT "$2\n";
+ }
+ } else {
+ die "Unexpected value: $line\n";
+ }
+}
+
*ralf*:
New.
A 1.1 contrib/crossrpms/patches/gdb-7.2-rtems4.11-20100907.diff
diff -u /dev/null rtems/contrib/crossrpms/patches/gdb-7.2-rtems4.11-20100907.diff:1.1
--- /dev/null Wed Sep 8 02:10:51 2010
+++ rtems/contrib/crossrpms/patches/gdb-7.2-rtems4.11-20100907.diff Tue Sep 7 23:20:45 2010
@@ -0,0 +1,595 @@
+diff -Naur gdb-7.2.orig/gdb/lm32-tdep.c gdb-7.2/gdb/lm32-tdep.c
+--- gdb-7.2.orig/gdb/lm32-tdep.c 2010-01-01 08:31:37.000000000 +0100
++++ gdb-7.2/gdb/lm32-tdep.c 2010-09-07 18:58:56.459350879 +0200
+@@ -35,7 +35,7 @@
+ #include "regcache.h"
+ #include "trad-frame.h"
+ #include "reggroups.h"
+-#include "opcodes/lm32-desc.h"
++#include "../opcodes/lm32-desc.h"
+
+ #include "gdb_string.h"
+
+diff -Naur gdb-7.2.orig/gdb/sparc-tdep.c gdb-7.2/gdb/sparc-tdep.c
+--- gdb-7.2.orig/gdb/sparc-tdep.c 2010-05-05 18:58:59.000000000 +0200
++++ gdb-7.2/gdb/sparc-tdep.c 2010-09-07 18:58:56.460348909 +0200
+@@ -1105,7 +1105,7 @@
+ sparc32_store_return_value (struct type *type, struct regcache *regcache,
+ const gdb_byte *valbuf)
+ {
+- int len = TYPE_LENGTH (type);
++ size_t len = TYPE_LENGTH (type);
+ gdb_byte buf[8];
+
+ gdb_assert (!sparc_structure_or_union_p (type));
+diff -Naur gdb-7.2.orig/sim/common/gentmap.c gdb-7.2/sim/common/gentmap.c
+--- gdb-7.2.orig/sim/common/gentmap.c 2006-11-07 20:29:59.000000000 +0100
++++ gdb-7.2/sim/common/gentmap.c 2010-09-07 18:58:56.460348909 +0200
+@@ -2,6 +2,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ struct tdefs {
+ char *symbol;
+diff -Naur gdb-7.2.orig/sim/erc32/configure gdb-7.2/sim/erc32/configure
+--- gdb-7.2.orig/sim/erc32/configure 2010-01-09 22:11:39.000000000 +0100
++++ gdb-7.2/sim/erc32/configure 2010-09-07 18:58:56.462352817 +0200
+@@ -591,8 +591,9 @@
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+ cgen_breaks
++READLINE_CFLAGS
++READLINE_DEPS
+ READLINE
+-TERMCAP
+ REPORT_BUGS_TEXI
+ REPORT_BUGS_TO
+ PKGVERSION
+@@ -716,6 +717,7 @@
+ enable_sim_profile
+ with_pkgversion
+ with_bugurl
++with_system_readline
+ '
+ ac_precious_vars='build_alias
+ host_alias
+@@ -1358,6 +1360,7 @@
+ --with-zlib include zlib support (auto/yes/no) default=auto
+ --with-pkgversion=PKG Use PKG in the version string in place of "GDB"
+ --with-bugurl=URL Direct users to URL to report a bug
++ --with-system-readline use installed readline library
+
+ Some influential environment variables:
+ CC C compiler command
+@@ -2416,7 +2419,6 @@
+
+
+
+-
+ # Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
+ # it by inlining the macro's contents.
+ # This file contains common code used by all simulators.
+@@ -2916,18 +2918,18 @@
+ int
+ main ()
+ {
+-
++return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+ # The possible output files:
+@@ -2989,10 +2991,10 @@
+ else
+ ac_file=''
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+ if test -z "$ac_file"; then :
+- $as_echo "$as_me: failed program was:" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+@@ -3000,51 +3002,18 @@
+ { as_fn_set_status 77
+ as_fn_error "C compiler cannot create executables
+ See \`config.log' for more details." "$LINENO" 5; }; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
+ ac_exeext=$ac_cv_exeext
+
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+- if { ac_try='./$ac_file'
+- { { case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; }; then
+- cross_compiling=no
+- else
+- if test "$cross_compiling" = maybe; then
+- cross_compiling=yes
+- else
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
+- fi
+- fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
+ if { { ac_try="$ac_link"
+@@ -3084,6 +3053,63 @@
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run. If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++ { { ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++ if { ac_try='./conftest$ac_cv_exeext'
++ { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ cross_compiling=no
++ else
++ if test "$cross_compiling" = maybe; then
++ cross_compiling=yes
++ else
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++ fi
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+ if test "${ac_cv_objext+set}" = set; then :
+@@ -4532,86 +4558,41 @@
+ done
+
+
+-# In the Cygwin environment, we need some additional flags.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin" >&5
+-$as_echo_n "checking for cygwin... " >&6; }
+-if test "${sim_cv_os_cygwin+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+
+-#ifdef __CYGWIN__
+-lose
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "lose" >/dev/null 2>&1; then :
+- sim_cv_os_cygwin=yes
+-else
+- sim_cv_os_cygwin=no
++# Check whether --with-system-readline was given.
++if test "${with_system_readline+set}" = set; then :
++ withval=$with_system_readline;
+ fi
+-rm -f conftest*
+
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_cv_os_cygwin" >&5
+-$as_echo "$sim_cv_os_cygwin" >&6; }
+
+-if test x$sim_cv_os_cygwin = xyes; then
+- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltermcap" >&5
+-$as_echo_n "checking for main in -ltermcap... " >&6; }
+-if test "${ac_cv_lib_termcap_main+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltermcap $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++if test "$with_system_readline" = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline" >&5
++$as_echo_n "checking for readline... " >&6; }
++ save_LIBS="$LIBS"
++ LIBS="-lreadline $save_LIBS"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char add_history ();
+ int
+ main ()
+ {
+-return main ();
++return add_history ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_termcap_main=yes
+-else
+- ac_cv_lib_termcap_main=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_main" >&5
+-$as_echo "$ac_cv_lib_termcap_main" >&6; }
+-if test "x$ac_cv_lib_termcap_main" = x""yes; then :
+- TERMCAP=-ltermcap
+-else
+- TERMCAP=""
+-fi
+-
+-fi
+-
+-
+-# We prefer the in-tree readline. Top-level dependencies make sure
+-# src/readline (if it's there) is configured before src/sim.
+-if test -r ../../readline/Makefile; then
+- READLINE=../../readline/libreadline.a
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+-$as_echo_n "checking for readline in -lreadline... " >&6; }
+-if test "${ac_cv_lib_readline_readline+set}" = set; then :
+- $as_echo_n "(cached) " >&6
++ READLINE=-lreadline
+ else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $TERMCAP $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ LIBS="-lreadline -lncurses $save_LIBS"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -4620,33 +4601,39 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char readline ();
++char add_history ();
+ int
+ main ()
+ {
+-return readline ();
++return add_history ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_readline_readline=yes
++ READLINE="-lreadline -lncurses"
+ else
+- ac_cv_lib_readline_readline=no
++ as_fn_error "unable to detect readline" "$LINENO" 5
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
++
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
+-$as_echo "$ac_cv_lib_readline_readline" >&6; }
+-if test "x$ac_cv_lib_readline_readline" = x""yes; then :
+- READLINE=-lreadline
+-else
+- as_fn_error "the required \"readline\" library is missing" "$LINENO" 5
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ LIBS="$save_LIBS"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5
++$as_echo "$READLINE" >&6; }
++ READLINE_DEPS=
++ READLINE_CFLAGS=
++else
++ READLINE='../../readline/libreadline.a -lncurses'
++ READLINE_DEPS='$(READLINE)'
++ READLINE_CFLAGS='-I$(READLINE_SRC)/..'
+ fi
+
+-fi
++
++
+
+
+ ac_sources="$sim_link_files"
+diff -Naur gdb-7.2.orig/sim/erc32/configure.ac gdb-7.2/sim/erc32/configure.ac
+--- gdb-7.2.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100
++++ gdb-7.2/sim/erc32/configure.ac 2010-09-07 18:58:56.463352715 +0200
+@@ -11,27 +11,32 @@
+
+ AC_CHECK_HEADERS(stdlib.h)
+
+-# In the Cygwin environment, we need some additional flags.
+-AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
+-[AC_EGREP_CPP(lose, [
+-#ifdef __CYGWIN__
+-lose
+-#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])])
++AC_ARG_WITH([system-readline],
++ [AS_HELP_STRING([--with-system-readline],
++ [use installed readline library])])
+
+-if test x$sim_cv_os_cygwin = xyes; then
+- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
++if test "$with_system_readline" = yes; then
++ AC_MSG_CHECKING([for readline])
++ save_LIBS="$LIBS"
++ LIBS="-lreadline $save_LIBS"
++ AC_LINK_IFELSE([AC_LANG_CALL([],
++ [add_history])], [READLINE=-lreadline],
++ [ LIBS="-lreadline -lncurses $save_LIBS"
++ AC_LINK_IFELSE([AC_LANG_CALL([],
++ [add_history])], [READLINE="-lreadline -lncurses"],
++ [AC_MSG_ERROR([unable to detect readline])])
++ ])
++ LIBS="$save_LIBS"
++ AC_MSG_RESULT($READLINE)
++ READLINE_DEPS=
++ READLINE_CFLAGS=
+ else
+- AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="")
+-fi
+-AC_SUBST(TERMCAP)
+-
+-# We prefer the in-tree readline. Top-level dependencies make sure
+-# src/readline (if it's there) is configured before src/sim.
+-if test -r ../../readline/Makefile; then
+- READLINE=../../readline/libreadline.a
+-else
+- AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
+- AC_ERROR([the required "readline" library is missing]), $TERMCAP)
++ READLINE='../../readline/libreadline.a -lncurses'
++ READLINE_DEPS='$(READLINE)'
++ READLINE_CFLAGS='-I$(READLINE_SRC)/..'
+ fi
+ AC_SUBST(READLINE)
++AC_SUBST(READLINE_DEPS)
++AC_SUBST(READLINE_CFLAGS)
++
+ SIM_AC_OUTPUT
+diff -Naur gdb-7.2.orig/sim/erc32/erc32.c gdb-7.2/sim/erc32/erc32.c
+--- gdb-7.2.orig/sim/erc32/erc32.c 2010-05-11 16:18:20.000000000 +0200
++++ gdb-7.2/sim/erc32/erc32.c 2010-09-07 18:58:56.463352715 +0200
+@@ -414,7 +414,7 @@
+ if (rom8) mec_memcfg &= ~0x20000;
+ else mec_memcfg |= 0x20000;
+
+- mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7);
++ mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7);
+ mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7);
+
+ if (sparclite_board) {
+diff -Naur gdb-7.2.orig/sim/erc32/Makefile.in gdb-7.2/sim/erc32/Makefile.in
+--- gdb-7.2.orig/sim/erc32/Makefile.in 2010-01-01 11:03:28.000000000 +0100
++++ gdb-7.2/sim/erc32/Makefile.in 2010-09-07 18:58:56.463352715 +0200
+@@ -19,12 +19,12 @@
+
+ ## COMMON_PRE_CONFIG_FRAG
+
+-TERMCAP_LIB = @TERMCAP@
++# TERMCAP_LIB = -lncurses
+ READLINE_LIB = @READLINE@
+
+ SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
+ SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
+-SIM_EXTRA_ALL = sis
++SIM_EXTRA_ALL = sis$(EXEEXT)
+ SIM_EXTRA_INSTALL = install-sis
+ SIM_EXTRA_CLEAN = clean-sis
+
+@@ -38,8 +38,8 @@
+ # `sis' doesn't need interf.o.
+ SIS_OFILES = exec.o erc32.o func.o help.o float.o
+
+-sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
+- $(CC) $(ALL_CFLAGS) -o sis \
++sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
++ $(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \
+ sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
+
+ # FIXME: This computes the build host's endianness, doesn't it?
+@@ -52,11 +52,11 @@
+
+ # Copy the files into directories where they will be run.
+ install-sis: installdirs
+- n=`echo sis | sed '$(program_transform_name)'`; \
+- $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
++ n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \
++ $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n
+
+ clean-sis:
+- rm -f sis end end.h
++ rm -f sis$(EXEEXT) end end.h
+
+ configure:
+ @echo "Rebuilding configure..."
+diff -Naur gdb-7.2.orig/sim/h8300/compile.c gdb-7.2/sim/h8300/compile.c
+--- gdb-7.2.orig/sim/h8300/compile.c 2010-04-14 09:38:04.000000000 +0200
++++ gdb-7.2/sim/h8300/compile.c 2010-09-07 18:58:56.465352608 +0200
+@@ -38,6 +38,12 @@
+ # define SIGTRAP 5
+ #endif
+
++#ifdef _WIN32
++#ifndef SIGBUS
++#define SIGBUS 10
++#endif
++#endif
++
+ int debug;
+
+ host_callback *sim_callback;
+diff -Naur gdb-7.2.orig/sim/m32c/Makefile.in gdb-7.2/sim/m32c/Makefile.in
+--- gdb-7.2.orig/sim/m32c/Makefile.in 2010-01-01 11:03:31.000000000 +0100
++++ gdb-7.2/sim/m32c/Makefile.in 2010-09-07 18:58:56.465352608 +0200
+@@ -55,7 +55,7 @@
+ ./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c
+
+ opc2c : opc2c.o safe-fgets.o
+- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@
+
+ sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld
+ ../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o
+@@ -83,8 +83,10 @@
+ mem.o : mem.h cpu.h syscalls.h
+ misc.o : cpu.h misc.h
+ opc2c.o : safe-fgets.h
++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c
+ reg.o : cpu.h
+ safe-fgets.o : safe-fgets.h
++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c
+ srcdest.c : cpu.h mem.h
+ syscalls.c : cpu.h mem.h syscalls.h
+
+diff -Naur gdb-7.2.orig/sim/ppc/ChangeLog.rtems gdb-7.2/sim/ppc/ChangeLog.rtems
+--- gdb-7.2.orig/sim/ppc/ChangeLog.rtems 1970-01-01 01:00:00.000000000 +0100
++++ gdb-7.2/sim/ppc/ChangeLog.rtems 2010-09-07 19:00:36.912350575 +0200
+@@ -0,0 +1,5 @@
++2010-09-06 Ralf Corsépius <ralf.corsepius at rtems.org>
++
++ * device.h, device.c: Remove "void volatile".
++ * hw_glue.c: Use %zd to print sizes.
++
+diff -Naur gdb-7.2.orig/sim/ppc/device.c gdb-7.2/sim/ppc/device.c
+--- gdb-7.2.orig/sim/ppc/device.c 1999-04-16 03:35:08.000000000 +0200
++++ gdb-7.2/sim/ppc/device.c 2010-09-07 18:58:56.466352788 +0200
+@@ -1816,7 +1816,7 @@
+ /* I/O */
+
+ EXTERN_DEVICE\
+-(void volatile)
++(void)
+ device_error(device *me,
+ const char *fmt,
+ ...)
+diff -Naur gdb-7.2.orig/sim/ppc/device.h gdb-7.2/sim/ppc/device.h
+--- gdb-7.2.orig/sim/ppc/device.h 2001-12-14 01:22:12.000000000 +0100
++++ gdb-7.2/sim/ppc/device.h 2010-09-07 18:58:56.466352788 +0200
+@@ -727,7 +727,7 @@
+ */
+
+ EXTERN_DEVICE\
+-(void volatile) device_error
++(void) device_error
+ (device *me,
+ const char *fmt,
+ ...) __attribute__ ((format (printf, 2, 3)));
+diff -Naur gdb-7.2.orig/sim/ppc/hw_glue.c gdb-7.2/sim/ppc/hw_glue.c
+--- gdb-7.2.orig/sim/ppc/hw_glue.c 1999-04-16 03:35:09.000000000 +0200
++++ gdb-7.2/sim/ppc/hw_glue.c 2010-09-07 18:58:56.466352788 +0200
+@@ -194,13 +194,13 @@
+ if (glue->sizeof_output == 0)
+ device_error(me, "at least one reg property size must be nonzero");
+ if (glue->sizeof_output % sizeof(unsigned_word) != 0)
+- device_error(me, "reg property size must be %d aligned", sizeof(unsigned_word));
++ device_error(me, "reg property size must be %zd aligned", sizeof(unsigned_word));
+ /* and the address */
+ device_address_to_attach_address(device_parent(me),
+ &unit.address, &glue->space, &glue->address,
+ me);
+ if (glue->address % (sizeof(unsigned_word) * max_nr_interrupts) != 0)
+- device_error(me, "reg property address must be %d aligned",
++ device_error(me, "reg property address must be %zd aligned",
+ sizeof(unsigned_word) * max_nr_interrupts);
+ glue->nr_outputs = glue->sizeof_output / sizeof(unsigned_word);
+ glue->output = zalloc(glue->sizeof_output);
--
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/20100908/c713540e/attachment.html>
More information about the vc
mailing list