Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-26 22:48:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Housekeeping.

Browse Source
This commit is contained in:
Ralf Corsepius
2009-10-09 03:53:42 +00:00
parent 8e686a2448
commit 301c09d303
13 changed files with 0 additions and 13982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1859
contrib/crossrpms/patches/gdb-6.8-rtems4.10-20090122.diff
View File

File diff suppressed because it is too large Load Diff

2151
contrib/crossrpms/patches/gdb-6.8-rtems4.10-20090312.diff
View File

File diff suppressed because it is too large Load Diff

544
contrib/crossrpms/patches/gdb-6.8.91-rtems4.10-20090917.diff
View File

@@ -1,544 +0,0 @@
diff -Naur gdb-6.8.91.orig/bfd/sysdep.h gdb-6.8.91/bfd/sysdep.h
--- gdb-6.8.91.orig/bfd/sysdep.h 2009-09-02 09:18:37.000000000 +0200
+++ gdb-6.8.91/bfd/sysdep.h 2009-09-17 03:43:48.000000000 +0200
@@ -136,7 +136,7 @@
#endif
#if !HAVE_DECL_STRSTR
-extern char *strstr ();
+/* extern char *strstr (); */
#endif
#ifdef HAVE_FTELLO
diff -Naur gdb-6.8.91.orig/gdb/lm32-tdep.c gdb-6.8.91/gdb/lm32-tdep.c
--- gdb-6.8.91.orig/gdb/lm32-tdep.c 2009-07-02 19:25:55.000000000 +0200
+++ gdb-6.8.91/gdb/lm32-tdep.c 2009-09-17 03:43:48.000000000 +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-6.8.91.orig/gdb/sparc-tdep.c gdb-6.8.91/gdb/sparc-tdep.c
--- gdb-6.8.91.orig/gdb/sparc-tdep.c 2009-09-07 19:52:41.000000000 +0200
+++ gdb-6.8.91/gdb/sparc-tdep.c 2009-09-17 04:29:30.000000000 +0200
@@ -1100,7 +1100,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-6.8.91.orig/sim/erc32/configure gdb-6.8.91/sim/erc32/configure
--- gdb-6.8.91.orig/sim/erc32/configure 2009-08-22 18:56:52.000000000 +0200
+++ gdb-6.8.91/sim/erc32/configure 2009-09-17 03:43:48.000000000 +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
@@ -715,6 +716,7 @@
enable_sim_profile
with_pkgversion
with_bugurl
+with_system_readline
'
ac_precious_vars='build_alias
host_alias
@@ -1356,6 +1358,7 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--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
@@ -2411,7 +2414,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.
@@ -2911,18 +2913,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:
@@ -2984,10 +2986,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
@@ -2995,51 +2997,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"
@@ -3079,6 +3048,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 :
@@ -4510,86 +4536,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.
@@ -4598,33 +4579,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_DIR)/libreadline.a'
+ READLINE_DEPS='$(READLINE)'
+ READLINE_CFLAGS='-I$(READLINE_SRC)/..'
fi
-fi
+
+
ac_sources="$sim_link_files"
diff -Naur gdb-6.8.91.orig/sim/erc32/configure.ac gdb-6.8.91/sim/erc32/configure.ac
--- gdb-6.8.91.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100
+++ gdb-6.8.91/sim/erc32/configure.ac 2009-09-17 03:43:48.000000000 +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_DIR)/libreadline.a'
+ 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-6.8.91.orig/sim/erc32/erc32.c gdb-6.8.91/sim/erc32/erc32.c
--- gdb-6.8.91.orig/sim/erc32/erc32.c 2008-11-11 23:20:54.000000000 +0100
+++ gdb-6.8.91/sim/erc32/erc32.c 2009-09-17 03:43:48.000000000 +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-6.8.91.orig/sim/erc32/Makefile.in gdb-6.8.91/sim/erc32/Makefile.in
--- gdb-6.8.91.orig/sim/erc32/Makefile.in 2009-01-14 11:53:07.000000000 +0100
+++ gdb-6.8.91/sim/erc32/Makefile.in 2009-09-17 03:43:48.000000000 +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-6.8.91.orig/sim/h8300/compile.c gdb-6.8.91/sim/h8300/compile.c
--- gdb-6.8.91.orig/sim/h8300/compile.c 2008-12-01 17:10:45.000000000 +0100
+++ gdb-6.8.91/sim/h8300/compile.c 2009-09-17 03:43:48.000000000 +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-6.8.91.orig/sim/m32c/Makefile.in gdb-6.8.91/sim/m32c/Makefile.in
--- gdb-6.8.91.orig/sim/m32c/Makefile.in 2009-01-14 11:53:07.000000000 +0100
+++ gdb-6.8.91/sim/m32c/Makefile.in 2009-09-17 03:43:48.000000000 +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

555
contrib/crossrpms/patches/gdb-6.8.91-rtems4.10-20090918.diff
View File

@@ -1,555 +0,0 @@
diff -Naur gdb-6.8.91.orig/bfd/sysdep.h gdb-6.8.91-rtems4.10-20090918/bfd/sysdep.h
--- gdb-6.8.91.orig/bfd/sysdep.h 2009-09-02 09:18:37.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090918/bfd/sysdep.h 2009-09-18 08:45:22.000000000 +0200
@@ -136,7 +136,7 @@
#endif
#if !HAVE_DECL_STRSTR
-extern char *strstr ();
+/* extern char *strstr (); */
#endif
#ifdef HAVE_FTELLO
diff -Naur gdb-6.8.91.orig/gdb/lm32-tdep.c gdb-6.8.91-rtems4.10-20090918/gdb/lm32-tdep.c
--- gdb-6.8.91.orig/gdb/lm32-tdep.c 2009-07-02 19:25:55.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090918/gdb/lm32-tdep.c 2009-09-18 08:45:22.000000000 +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-6.8.91.orig/gdb/sparc-tdep.c gdb-6.8.91-rtems4.10-20090918/gdb/sparc-tdep.c
--- gdb-6.8.91.orig/gdb/sparc-tdep.c 2009-09-07 19:52:41.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090918/gdb/sparc-tdep.c 2009-09-18 08:45:22.000000000 +0200
@@ -1100,7 +1100,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-6.8.91.orig/sim/common/Make-common.in gdb-6.8.91-rtems4.10-20090918/sim/common/Make-common.in
--- gdb-6.8.91.orig/sim/common/Make-common.in 2009-07-12 18:59:34.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090918/sim/common/Make-common.in 2009-09-18 11:36:22.000000000 +0200
@@ -52,6 +52,7 @@
tooldir = $(libdir)/$(target_alias)
datadir = @datadir@
+datarootdir = @datarootdir@
mandir = @mandir@
man1dir = $(mandir)/man1
infodir = @infodir@
diff -Naur gdb-6.8.91.orig/sim/erc32/configure gdb-6.8.91-rtems4.10-20090918/sim/erc32/configure
--- gdb-6.8.91.orig/sim/erc32/configure 2009-08-22 18:56:52.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090918/sim/erc32/configure 2009-09-18 08:49:23.000000000 +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
@@ -715,6 +716,7 @@
enable_sim_profile
with_pkgversion
with_bugurl
+with_system_readline
'
ac_precious_vars='build_alias
host_alias
@@ -1356,6 +1358,7 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--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
@@ -2411,7 +2414,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.
@@ -2911,18 +2913,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:
@@ -2984,10 +2986,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
@@ -2995,51 +2997,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"
@@ -3079,6 +3048,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 :
@@ -4510,86 +4536,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.
@@ -4598,33 +4579,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-6.8.91.orig/sim/erc32/configure.ac gdb-6.8.91-rtems4.10-20090918/sim/erc32/configure.ac
--- gdb-6.8.91.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100
+++ gdb-6.8.91-rtems4.10-20090918/sim/erc32/configure.ac 2009-09-18 08:46:17.000000000 +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-6.8.91.orig/sim/erc32/erc32.c gdb-6.8.91-rtems4.10-20090918/sim/erc32/erc32.c
--- gdb-6.8.91.orig/sim/erc32/erc32.c 2008-11-11 23:20:54.000000000 +0100
+++ gdb-6.8.91-rtems4.10-20090918/sim/erc32/erc32.c 2009-09-18 08:45:22.000000000 +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-6.8.91.orig/sim/erc32/Makefile.in gdb-6.8.91-rtems4.10-20090918/sim/erc32/Makefile.in
--- gdb-6.8.91.orig/sim/erc32/Makefile.in 2009-01-14 11:53:07.000000000 +0100
+++ gdb-6.8.91-rtems4.10-20090918/sim/erc32/Makefile.in 2009-09-18 08:45:22.000000000 +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-6.8.91.orig/sim/h8300/compile.c gdb-6.8.91-rtems4.10-20090918/sim/h8300/compile.c
--- gdb-6.8.91.orig/sim/h8300/compile.c 2008-12-01 17:10:45.000000000 +0100
+++ gdb-6.8.91-rtems4.10-20090918/sim/h8300/compile.c 2009-09-18 08:45:22.000000000 +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-6.8.91.orig/sim/m32c/Makefile.in gdb-6.8.91-rtems4.10-20090918/sim/m32c/Makefile.in
--- gdb-6.8.91.orig/sim/m32c/Makefile.in 2009-01-14 11:53:07.000000000 +0100
+++ gdb-6.8.91-rtems4.10-20090918/sim/m32c/Makefile.in 2009-09-18 08:45:22.000000000 +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

666
contrib/crossrpms/patches/gdb-6.8.91-rtems4.10-20090926.diff
View File

@@ -1,666 +0,0 @@
diff -Naur gdb-6.8.91.orig/bfd/sysdep.h gdb-6.8.91-rtems4.10-20090926/bfd/sysdep.h
--- gdb-6.8.91.orig/bfd/sysdep.h 2009-09-02 09:18:37.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090926/bfd/sysdep.h 2009-09-26 07:47:29.000000000 +0200
@@ -136,7 +136,7 @@
#endif
#if !HAVE_DECL_STRSTR
-extern char *strstr ();
+/* extern char *strstr (); */
#endif
#ifdef HAVE_FTELLO
diff -Naur gdb-6.8.91.orig/gdb/config.in gdb-6.8.91-rtems4.10-20090926/gdb/config.in
--- gdb-6.8.91.orig/gdb/config.in 2009-08-22 18:56:42.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090926/gdb/config.in 2009-09-26 07:47:29.000000000 +0200
@@ -792,6 +792,9 @@
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t
+/* readline-6.0 started to use different name. */
+#undef readline_echoing_p
+
/* Define to the equivalent of the C99 'restrict' keyword, or to
nothing if this is not supported. Do not define if restrict is
supported directly. */
diff -Naur gdb-6.8.91.orig/gdb/configure gdb-6.8.91-rtems4.10-20090926/gdb/configure
--- gdb-6.8.91.orig/gdb/configure 2009-09-10 05:59:37.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090926/gdb/configure 2009-09-26 07:47:29.000000000 +0200
@@ -8431,6 +8431,69 @@
READLINE=-lreadline
READLINE_DEPS=
READLINE_CFLAGS=
+
+ # readline-6.0 started to use the name `_rl_echoing_p'.
+ # `$(READLINE_DIR)/' of bundled readline would not resolve in configure.
+
+ echo "$as_me:$LINENO: checking for readline_echoing_p" >&5
+echo $ECHO_N "checking for readline_echoing_p... $ECHO_C" >&6
+ save_LIBS=$LIBS
+ LIBS="$LIBS $READLINE"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+extern int readline_echoing_p;
+ return readline_echoing_p;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ READLINE_ECHOING_P=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+READLINE_ECHOING_P=no
+
+cat >>confdefs.h <<\_ACEOF
+#define readline_echoing_p _rl_echoing_p
+_ACEOF
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$save_LIBS"
+ echo "$as_me:$LINENO: result: $READLINE_ECHOING_P" >&5
+echo "${ECHO_T}$READLINE_ECHOING_P" >&6
else
READLINE='$(READLINE_DIR)/libreadline.a'
READLINE_DEPS='$(READLINE)'
diff -Naur gdb-6.8.91.orig/gdb/configure.ac gdb-6.8.91-rtems4.10-20090926/gdb/configure.ac
--- gdb-6.8.91.orig/gdb/configure.ac 2009-09-10 05:59:36.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090926/gdb/configure.ac 2009-09-26 07:47:29.000000000 +0200
@@ -534,6 +534,21 @@
READLINE=-lreadline
READLINE_DEPS=
READLINE_CFLAGS=
+
+ # readline-6.0 started to use the name `_rl_echoing_p'.
+ # `$(READLINE_DIR)/' of bundled readline would not resolve in configure.
+
+ AC_MSG_CHECKING([for readline_echoing_p])
+ save_LIBS=$LIBS
+ LIBS="$LIBS $READLINE"
+ AC_LINK_IFELSE(AC_LANG_PROGRAM(,[[extern int readline_echoing_p;
+ return readline_echoing_p;]]),
+ [READLINE_ECHOING_P=yes],
+ [READLINE_ECHOING_P=no
+ AC_DEFINE([readline_echoing_p], [_rl_echoing_p],
+ [readline-6.0 started to use different name.])])
+ LIBS="$save_LIBS"
+ AC_MSG_RESULT([$READLINE_ECHOING_P])
else
READLINE='$(READLINE_DIR)/libreadline.a'
READLINE_DEPS='$(READLINE)'
diff -Naur gdb-6.8.91.orig/gdb/lm32-tdep.c gdb-6.8.91-rtems4.10-20090926/gdb/lm32-tdep.c
--- gdb-6.8.91.orig/gdb/lm32-tdep.c 2009-07-02 19:25:55.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090926/gdb/lm32-tdep.c 2009-09-26 07:47:29.000000000 +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-6.8.91.orig/gdb/sparc-tdep.c gdb-6.8.91-rtems4.10-20090926/gdb/sparc-tdep.c
--- gdb-6.8.91.orig/gdb/sparc-tdep.c 2009-09-07 19:52:41.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090926/gdb/sparc-tdep.c 2009-09-26 07:47:29.000000000 +0200
@@ -1100,7 +1100,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-6.8.91.orig/sim/common/Make-common.in gdb-6.8.91-rtems4.10-20090926/sim/common/Make-common.in
--- gdb-6.8.91.orig/sim/common/Make-common.in 2009-07-12 18:59:34.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090926/sim/common/Make-common.in 2009-09-26 07:47:29.000000000 +0200
@@ -52,6 +52,7 @@
tooldir = $(libdir)/$(target_alias)
datadir = @datadir@
+datarootdir = @datarootdir@
mandir = @mandir@
man1dir = $(mandir)/man1
infodir = @infodir@
diff -Naur gdb-6.8.91.orig/sim/erc32/configure gdb-6.8.91-rtems4.10-20090926/sim/erc32/configure
--- gdb-6.8.91.orig/sim/erc32/configure 2009-08-22 18:56:52.000000000 +0200
+++ gdb-6.8.91-rtems4.10-20090926/sim/erc32/configure 2009-09-26 07:47:29.000000000 +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
@@ -715,6 +716,7 @@
enable_sim_profile
with_pkgversion
with_bugurl
+with_system_readline
'
ac_precious_vars='build_alias
host_alias
@@ -1356,6 +1358,7 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--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
@@ -2411,7 +2414,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.
@@ -2911,18 +2913,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:
@@ -2984,10 +2986,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
@@ -2995,51 +2997,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"
@@ -3079,6 +3048,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 :
@@ -4510,86 +4536,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.
@@ -4598,33 +4579,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-6.8.91.orig/sim/erc32/configure.ac gdb-6.8.91-rtems4.10-20090926/sim/erc32/configure.ac
--- gdb-6.8.91.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100
+++ gdb-6.8.91-rtems4.10-20090926/sim/erc32/configure.ac 2009-09-26 07:47:29.000000000 +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-6.8.91.orig/sim/erc32/erc32.c gdb-6.8.91-rtems4.10-20090926/sim/erc32/erc32.c
--- gdb-6.8.91.orig/sim/erc32/erc32.c 2008-11-11 23:20:54.000000000 +0100
+++ gdb-6.8.91-rtems4.10-20090926/sim/erc32/erc32.c 2009-09-26 07:47:29.000000000 +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-6.8.91.orig/sim/erc32/Makefile.in gdb-6.8.91-rtems4.10-20090926/sim/erc32/Makefile.in
--- gdb-6.8.91.orig/sim/erc32/Makefile.in 2009-01-14 11:53:07.000000000 +0100
+++ gdb-6.8.91-rtems4.10-20090926/sim/erc32/Makefile.in 2009-09-26 07:47:29.000000000 +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-6.8.91.orig/sim/h8300/compile.c gdb-6.8.91-rtems4.10-20090926/sim/h8300/compile.c
--- gdb-6.8.91.orig/sim/h8300/compile.c 2008-12-01 17:10:45.000000000 +0100
+++ gdb-6.8.91-rtems4.10-20090926/sim/h8300/compile.c 2009-09-26 07:47:29.000000000 +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-6.8.91.orig/sim/m32c/Makefile.in gdb-6.8.91-rtems4.10-20090926/sim/m32c/Makefile.in
--- gdb-6.8.91.orig/sim/m32c/Makefile.in 2009-01-14 11:53:07.000000000 +0100
+++ gdb-6.8.91-rtems4.10-20090926/sim/m32c/Makefile.in 2009-09-26 07:47:29.000000000 +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

666
contrib/crossrpms/patches/gdb-6.8.92-rtems4.10-20091001.diff
View File

@@ -1,666 +0,0 @@
diff -Naur gdb-6.8.92.orig/bfd/sysdep.h gdb-6.8.92/bfd/sysdep.h
--- gdb-6.8.92.orig/bfd/sysdep.h 2009-09-02 09:18:37.000000000 +0200
+++ gdb-6.8.92/bfd/sysdep.h 2009-10-01 05:12:58.000000000 +0200
@@ -136,7 +136,7 @@
#endif
#if !HAVE_DECL_STRSTR
-extern char *strstr ();
+/* extern char *strstr (); */
#endif
#ifdef HAVE_FTELLO
diff -Naur gdb-6.8.92.orig/gdb/config.in gdb-6.8.92/gdb/config.in
--- gdb-6.8.92.orig/gdb/config.in 2009-08-22 18:56:42.000000000 +0200
+++ gdb-6.8.92/gdb/config.in 2009-10-01 05:12:58.000000000 +0200
@@ -792,6 +792,9 @@
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t
+/* readline-6.0 started to use different name. */
+#undef readline_echoing_p
+
/* Define to the equivalent of the C99 'restrict' keyword, or to
nothing if this is not supported. Do not define if restrict is
supported directly. */
diff -Naur gdb-6.8.92.orig/gdb/configure gdb-6.8.92/gdb/configure
--- gdb-6.8.92.orig/gdb/configure 2009-09-10 05:59:37.000000000 +0200
+++ gdb-6.8.92/gdb/configure 2009-10-01 05:12:58.000000000 +0200
@@ -8431,6 +8431,69 @@
READLINE=-lreadline
READLINE_DEPS=
READLINE_CFLAGS=
+
+ # readline-6.0 started to use the name `_rl_echoing_p'.
+ # `$(READLINE_DIR)/' of bundled readline would not resolve in configure.
+
+ echo "$as_me:$LINENO: checking for readline_echoing_p" >&5
+echo $ECHO_N "checking for readline_echoing_p... $ECHO_C" >&6
+ save_LIBS=$LIBS
+ LIBS="$LIBS $READLINE"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+extern int readline_echoing_p;
+ return readline_echoing_p;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ READLINE_ECHOING_P=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+READLINE_ECHOING_P=no
+
+cat >>confdefs.h <<\_ACEOF
+#define readline_echoing_p _rl_echoing_p
+_ACEOF
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$save_LIBS"
+ echo "$as_me:$LINENO: result: $READLINE_ECHOING_P" >&5
+echo "${ECHO_T}$READLINE_ECHOING_P" >&6
else
READLINE='$(READLINE_DIR)/libreadline.a'
READLINE_DEPS='$(READLINE)'
diff -Naur gdb-6.8.92.orig/gdb/configure.ac gdb-6.8.92/gdb/configure.ac
--- gdb-6.8.92.orig/gdb/configure.ac 2009-09-10 05:59:36.000000000 +0200
+++ gdb-6.8.92/gdb/configure.ac 2009-10-01 05:12:58.000000000 +0200
@@ -534,6 +534,21 @@
READLINE=-lreadline
READLINE_DEPS=
READLINE_CFLAGS=
+
+ # readline-6.0 started to use the name `_rl_echoing_p'.
+ # `$(READLINE_DIR)/' of bundled readline would not resolve in configure.
+
+ AC_MSG_CHECKING([for readline_echoing_p])
+ save_LIBS=$LIBS
+ LIBS="$LIBS $READLINE"
+ AC_LINK_IFELSE(AC_LANG_PROGRAM(,[[extern int readline_echoing_p;
+ return readline_echoing_p;]]),
+ [READLINE_ECHOING_P=yes],
+ [READLINE_ECHOING_P=no
+ AC_DEFINE([readline_echoing_p], [_rl_echoing_p],
+ [readline-6.0 started to use different name.])])
+ LIBS="$save_LIBS"
+ AC_MSG_RESULT([$READLINE_ECHOING_P])
else
READLINE='$(READLINE_DIR)/libreadline.a'
READLINE_DEPS='$(READLINE)'
diff -Naur gdb-6.8.92.orig/gdb/lm32-tdep.c gdb-6.8.92/gdb/lm32-tdep.c
--- gdb-6.8.92.orig/gdb/lm32-tdep.c 2009-07-02 19:25:55.000000000 +0200
+++ gdb-6.8.92/gdb/lm32-tdep.c 2009-10-01 05:12:58.000000000 +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-6.8.92.orig/gdb/sparc-tdep.c gdb-6.8.92/gdb/sparc-tdep.c
--- gdb-6.8.92.orig/gdb/sparc-tdep.c 2009-09-07 19:52:41.000000000 +0200
+++ gdb-6.8.92/gdb/sparc-tdep.c 2009-10-01 05:12:58.000000000 +0200
@@ -1100,7 +1100,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-6.8.92.orig/sim/common/Make-common.in gdb-6.8.92/sim/common/Make-common.in
--- gdb-6.8.92.orig/sim/common/Make-common.in 2009-07-12 18:59:34.000000000 +0200
+++ gdb-6.8.92/sim/common/Make-common.in 2009-10-01 05:12:58.000000000 +0200
@@ -52,6 +52,7 @@
tooldir = $(libdir)/$(target_alias)
datadir = @datadir@
+datarootdir = @datarootdir@
mandir = @mandir@
man1dir = $(mandir)/man1
infodir = @infodir@
diff -Naur gdb-6.8.92.orig/sim/erc32/configure gdb-6.8.92/sim/erc32/configure
--- gdb-6.8.92.orig/sim/erc32/configure 2009-08-22 18:56:52.000000000 +0200
+++ gdb-6.8.92/sim/erc32/configure 2009-10-01 05:12:58.000000000 +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
@@ -715,6 +716,7 @@
enable_sim_profile
with_pkgversion
with_bugurl
+with_system_readline
'
ac_precious_vars='build_alias
host_alias
@@ -1356,6 +1358,7 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--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
@@ -2411,7 +2414,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.
@@ -2911,18 +2913,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:
@@ -2984,10 +2986,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
@@ -2995,51 +2997,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"
@@ -3079,6 +3048,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 :
@@ -4510,86 +4536,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.
@@ -4598,33 +4579,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-6.8.92.orig/sim/erc32/configure.ac gdb-6.8.92/sim/erc32/configure.ac
--- gdb-6.8.92.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100
+++ gdb-6.8.92/sim/erc32/configure.ac 2009-10-01 05:12:58.000000000 +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-6.8.92.orig/sim/erc32/erc32.c gdb-6.8.92/sim/erc32/erc32.c
--- gdb-6.8.92.orig/sim/erc32/erc32.c 2008-11-11 23:20:54.000000000 +0100
+++ gdb-6.8.92/sim/erc32/erc32.c 2009-10-01 05:12:58.000000000 +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-6.8.92.orig/sim/erc32/Makefile.in gdb-6.8.92/sim/erc32/Makefile.in
--- gdb-6.8.92.orig/sim/erc32/Makefile.in 2009-01-14 11:53:07.000000000 +0100
+++ gdb-6.8.92/sim/erc32/Makefile.in 2009-10-01 05:12:58.000000000 +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-6.8.92.orig/sim/h8300/compile.c gdb-6.8.92/sim/h8300/compile.c
--- gdb-6.8.92.orig/sim/h8300/compile.c 2008-12-01 17:10:45.000000000 +0100
+++ gdb-6.8.92/sim/h8300/compile.c 2009-10-01 05:12:58.000000000 +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-6.8.92.orig/sim/m32c/Makefile.in gdb-6.8.92/sim/m32c/Makefile.in
--- gdb-6.8.92.orig/sim/m32c/Makefile.in 2009-01-14 11:53:07.000000000 +0100
+++ gdb-6.8.92/sim/m32c/Makefile.in 2009-10-01 05:12:58.000000000 +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

911
contrib/crossrpms/patches/newlib-1.17.0-rtems4.10-20090715.diff
View File

@@ -1,911 +0,0 @@
diff -Naur newlib-1.17.0.orig/newlib/ChangeLog.rtems newlib-1.17.0/newlib/ChangeLog.rtems
--- newlib-1.17.0.orig/newlib/ChangeLog.rtems 1970-01-01 01:00:00.000000000 +0100
+++ newlib-1.17.0/newlib/ChangeLog.rtems 2009-07-15 09:27:36.000000000 +0200
@@ -0,0 +1,59 @@
+2009-07-06 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * libc/include/sys/features.h: Define _UNIX98_THREAD_MUTEX_ATTRIBUTES.
+
+2009-05-05 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * configure.host: Remove -DMISSING_SYSCALL_NAMES.
+
+2009-03-11 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/stdlib/assert.c: Don't build __assert_func.
+ * libc/sys/rtems/crt0.c: Add __assert_func.
+
+2009-03-09 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/machine/powerpc/times.c: Remove.
+ * libc/machine/powerpc/Makefile.am: Remove times.c.
+ * libc/machine/powerpc/Makefile.in: Regenerate.
+
+2009-02-24 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/unix/ttyname.c: Sync with newlib-cvs.
+ * configure.host: Add -DHAVE_BLKSIZE to newlib_cflags.
+
+2009-02-22 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/sys/rtems/machine/stdint.h: Add __lm32__.
+ * libc/machine/lm32/configure.in: Set AC_CONFIG_SRC to setjmp.S.
+ * libc/machine/lm32/configure: Regenerate.
+
+2009-02-20 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/unix/Makefile.in: Regenerate.
+
+2009-02-20 Craig Howland <howland@LGSInnovations.com> on behalf of
+ Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * libc/unix/ttyname.c: Remove ttyname_r() (to a new file to avoid
+ coupling ttyname_r() and ttyname() due to the latter's large buffer).
+ * libc/unix/ttyname_r.c: New file to hold ttyname_r(), previously in
+ ttyname.c.
+ * libc/unix/ttyname.h: New file (common size definition for the 2
+ ttyname*c files that are now split).
+ * libc/unix/Makefile.am (ELIX_2_SOURCES): Add ttyname_r.c.
+
+2009-02-16 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/sys/rtems/sys/param.h:
+ Update copyright notice from FreeBSD.
+ Remove HZ.
+ Add #include <sys/priority.h>
+ Remove priority handling (moved to sys/priority.h).
+ Remove CLBYTES (Unused, abandoned in BSD).
+
+2009-02-06 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/include/sched.h:
+ Remove (collides with RTEMS's schedul.h).
+
diff -Naur newlib-1.17.0.orig/newlib/configure.host newlib-1.17.0/newlib/configure.host
--- newlib-1.17.0.orig/newlib/configure.host 2008-12-18 00:09:09.000000000 +0100
+++ newlib-1.17.0/newlib/configure.host 2009-07-15 09:21:32.000000000 +0200
@@ -537,7 +537,7 @@
*-*-rtems*)
default_newlib_io_long_long="yes"
default_newlib_io_c99_formats="yes"
- newlib_cflags="${newlib_cflags} -DMALLOC_PROVIDED -DEXIT_PROVIDED -DMISSING_SYSCALL_NAMES -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_NANOSLEEP -DHAVE_FCNTL"
+ newlib_cflags="${newlib_cflags} -DMALLOC_PROVIDED -DEXIT_PROVIDED -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_NANOSLEEP -DHAVE_BLKSIZE -DHAVE_FCNTL"
# turn off unsupported items in posix directory
newlib_cflags="${newlib_cflags} -D_NO_GETLOGIN -D_NO_GETPWENT -D_NO_GETUT -D_NO_GETPASS -D_NO_SIGSET"
;;
diff -Naur newlib-1.17.0.orig/newlib/libc/include/inttypes.h newlib-1.17.0/newlib/libc/include/inttypes.h
--- newlib-1.17.0.orig/newlib/libc/include/inttypes.h 2005-12-16 20:03:12.000000000 +0100
+++ newlib-1.17.0/newlib/libc/include/inttypes.h 2009-07-15 09:21:32.000000000 +0200
@@ -163,12 +163,12 @@
/* 64-bit types */
-#if __have_longlong64
-#define __PRI64(x) __STRINGIFY(ll##x)
-#define __SCN64(x) __STRINGIFY(ll##x)
-#elif __have_long64
+#if __have_long64
#define __PRI64(x) __STRINGIFY(l##x)
#define __SCN64(x) __STRINGIFY(l##x)
+#elif __have_longlong64
+#define __PRI64(x) __STRINGIFY(ll##x)
+#define __SCN64(x) __STRINGIFY(ll##x)
#else
#define __PRI64(x) __STRINGIFY(x)
#define __SCN64(x) __STRINGIFY(x)
@@ -217,12 +217,12 @@
#endif
/* max-bit types */
-#if __have_longlong64
-#define __PRIMAX(x) __STRINGIFY(ll##x)
-#define __SCNMAX(x) __STRINGIFY(ll##x)
-#elif __have_long64
+#if __have_long64
#define __PRIMAX(x) __STRINGIFY(l##x)
#define __SCNMAX(x) __STRINGIFY(l##x)
+#elif __have_longlong64
+#define __PRIMAX(x) __STRINGIFY(ll##x)
+#define __SCNMAX(x) __STRINGIFY(ll##x)
#else
#define __PRIMAX(x) __STRINGIFY(x)
#define __SCNMAX(x) __STRINGIFY(x)
@@ -242,12 +242,12 @@
#define SCNxMAX __SCNMAX(x)
/* ptr types */
-#if __have_longlong64
-#define __PRIPTR(x) __STRINGIFY(ll##x)
-#define __SCNPTR(x) __STRINGIFY(ll##x)
-#elif __have_long64
+#if __have_long64
#define __PRIPTR(x) __STRINGIFY(l##x)
#define __SCNPTR(x) __STRINGIFY(l##x)
+#elif __have_longlong64
+#define __PRIPTR(x) __STRINGIFY(ll##x)
+#define __SCNPTR(x) __STRINGIFY(ll##x)
#else
#define __PRIPTR(x) __STRINGIFY(x)
#define __SCNPTR(x) __STRINGIFY(x)
diff -Naur newlib-1.17.0.orig/newlib/libc/include/machine/ieeefp.h newlib-1.17.0/newlib/libc/include/machine/ieeefp.h
--- newlib-1.17.0.orig/newlib/libc/include/machine/ieeefp.h 2008-12-11 21:05:38.000000000 +0100
+++ newlib-1.17.0/newlib/libc/include/machine/ieeefp.h 2009-07-15 09:21:32.000000000 +0200
@@ -62,8 +62,12 @@
# define __IEEE_BIG_ENDIAN
# endif
#else
-# define __IEEE_BIG_ENDIAN
# ifdef __ARMEL__
+# define __IEEE_LITTLE_ENDIAN
+# else
+# define __IEEE_BIG_ENDIAN
+# endif
+# ifdef __ARMWEL__
# define __IEEE_BYTES_LITTLE_ENDIAN
# endif
#endif
diff -Naur newlib-1.17.0.orig/newlib/libc/include/machine/setjmp.h newlib-1.17.0/newlib/libc/include/machine/setjmp.h
--- newlib-1.17.0.orig/newlib/libc/include/machine/setjmp.h 2008-12-11 21:05:38.000000000 +0100
+++ newlib-1.17.0/newlib/libc/include/machine/setjmp.h 2009-07-15 09:21:32.000000000 +0200
@@ -27,7 +27,7 @@
/* necv70 was 9 as well. */
-#ifdef __mc68000__
+#if defined(__m68k__) || defined(__mc68000__)
/*
* onsstack,sigmask,sp,pc,psl,d2-d7,a2-a6,
* fp2-fp7 for 68881.
diff -Naur newlib-1.17.0.orig/newlib/libc/include/sched.h newlib-1.17.0/newlib/libc/include/sched.h
--- newlib-1.17.0.orig/newlib/libc/include/sched.h 2007-09-21 23:02:15.000000000 +0200
+++ newlib-1.17.0/newlib/libc/include/sched.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#ifndef _SCHED_H_
-#define _SCHED_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/sched.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SCHED_H_ */
diff -Naur newlib-1.17.0.orig/newlib/libc/include/stdint.h newlib-1.17.0/newlib/libc/include/stdint.h
--- newlib-1.17.0.orig/newlib/libc/include/stdint.h 2008-12-10 22:27:58.000000000 +0100
+++ newlib-1.17.0/newlib/libc/include/stdint.h 2009-07-15 09:21:32.000000000 +0200
@@ -475,6 +475,9 @@
#define UINTMAX_C(x) x##UL
#endif
+#ifdef __rtems__
+#include <machine/stdint.h>
+#endif
#ifdef __cplusplus
}
diff -Naur newlib-1.17.0.orig/newlib/libc/include/sys/features.h newlib-1.17.0/newlib/libc/include/sys/features.h
--- newlib-1.17.0.orig/newlib/libc/include/sys/features.h 2008-12-12 18:16:03.000000000 +0100
+++ newlib-1.17.0/newlib/libc/include/sys/features.h 2009-07-15 09:23:47.000000000 +0200
@@ -73,6 +73,9 @@
#define _POSIX_INTERRUPT_CONTROL 1
#define _POSIX_ADVISORY_INFO 1
+/* UNIX98 added some new pthread mutex attributes */
+#define _UNIX98_THREAD_MUTEX_ATTRIBUTES 1
+
#endif
#ifdef __svr4__
diff -Naur newlib-1.17.0.orig/newlib/libc/include/sys/_types.h newlib-1.17.0/newlib/libc/include/sys/_types.h
--- newlib-1.17.0.orig/newlib/libc/include/sys/_types.h 2007-09-18 22:05:17.000000000 +0200
+++ newlib-1.17.0/newlib/libc/include/sys/_types.h 2009-07-15 09:21:32.000000000 +0200
@@ -84,4 +84,7 @@
typedef void *_iconv_t;
#endif
+typedef long * __intptr_t;
+typedef unsigned long* __uintptr_t;
+
#endif /* _SYS__TYPES_H */
diff -Naur newlib-1.17.0.orig/newlib/libc/machine/arm/machine/endian.h newlib-1.17.0/newlib/libc/machine/arm/machine/endian.h
--- newlib-1.17.0.orig/newlib/libc/machine/arm/machine/endian.h 2004-05-07 22:29:24.000000000 +0200
+++ newlib-1.17.0/newlib/libc/machine/arm/machine/endian.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-/* ARM configuration file */
-
-#ifndef _MACHINE_ENDIAN_H
-# define _MACHINE_ENDIAN_H
-
-#ifdef __ARMEB__
-#define BYTE_ORDER BIG_ENDIAN
-#else
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
-#endif
diff -Naur newlib-1.17.0.orig/newlib/libc/machine/lm32/configure newlib-1.17.0/newlib/libc/machine/lm32/configure
--- newlib-1.17.0.orig/newlib/libc/machine/lm32/configure 2008-12-22 20:45:44.000000000 +0100
+++ newlib-1.17.0/newlib/libc/machine/lm32/configure 2009-07-15 09:21:32.000000000 +0200
@@ -271,7 +271,7 @@
PACKAGE_STRING='newlib 1.17.0'
PACKAGE_BUGREPORT=''
-ac_unique_file="setjmp.s"
+ac_unique_file="setjmp.S"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAY_SUPPLY_SYSCALLS_TRUE MAY_SUPPLY_SYSCALLS_FALSE newlib_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB READELF ac_ct_READELF MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CCAS CCASFLAGS NEWLIB_CFLAGS LDFLAGS ELIX_LEVEL_0_TRUE ELIX_LEVEL_0_FALSE ELIX_LEVEL_1_TRUE ELIX_LEVEL_1_FALSE ELIX_LEVEL_2_TRUE ELIX_LEVEL_2_FALSE ELIX_LEVEL_3_TRUE ELIX_LEVEL_3_FALSE ELIX_LEVEL_4_TRUE ELIX_LEVEL_4_FALSE USE_LIBTOOL_TRUE USE_LIBTOOL_FALSE OBJEXT oext aext lpfx libm_machine_dir machine_dir sys_dir LIBOBJS LTLIBOBJS'
ac_subst_files=''
diff -Naur newlib-1.17.0.orig/newlib/libc/machine/lm32/configure.in newlib-1.17.0/newlib/libc/machine/lm32/configure.in
--- newlib-1.17.0.orig/newlib/libc/machine/lm32/configure.in 2008-12-11 21:05:38.000000000 +0100
+++ newlib-1.17.0/newlib/libc/machine/lm32/configure.in 2009-07-15 09:21:32.000000000 +0200
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
AC_INIT([newlib],[NEWLIB_VERSION])
-AC_CONFIG_SRCDIR([setjmp.s])
+AC_CONFIG_SRCDIR([setjmp.S])
dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake.
AC_CONFIG_AUX_DIR(../../../..)
diff -Naur newlib-1.17.0.orig/newlib/libc/machine/powerpc/Makefile.am newlib-1.17.0/newlib/libc/machine/powerpc/Makefile.am
--- newlib-1.17.0.orig/newlib/libc/machine/powerpc/Makefile.am 2007-05-24 19:33:35.000000000 +0200
+++ newlib-1.17.0/newlib/libc/machine/powerpc/Makefile.am 2009-07-15 09:21:32.000000000 +0200
@@ -10,7 +10,7 @@
AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
-lib_a_SOURCES = setjmp.S times.c
+lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS=$(AM_CCASFLAGS)
lib_a_CFLAGS=$(AM_CFLAGS)
lib_a_LIBADD = @extra_objs@
diff -Naur newlib-1.17.0.orig/newlib/libc/machine/powerpc/Makefile.in newlib-1.17.0/newlib/libc/machine/powerpc/Makefile.in
--- newlib-1.17.0.orig/newlib/libc/machine/powerpc/Makefile.in 2009-06-29 11:05:21.000000000 +0200
+++ newlib-1.17.0/newlib/libc/machine/powerpc/Makefile.in 2009-07-15 09:21:32.000000000 +0200
@@ -39,8 +39,7 @@
DIST_COMMON = $(srcdir)/../../../../config.guess \
$(srcdir)/../../../../config.sub $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/../../../../mkinstalldirs \
- $(srcdir)/../../../../compile
+ $(am__configure_deps) $(srcdir)/../../../../mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../../acinclude.m4 \
@@ -54,7 +53,7 @@
LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
lib_a_AR = $(AR) $(ARFLAGS)
-am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-times.$(OBJEXT)
+am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT)
lib_a_OBJECTS = $(am_lib_a_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir)
depcomp =
@@ -128,11 +127,6 @@
USE_LIBTOOL_FALSE = @USE_LIBTOOL_FALSE@
USE_LIBTOOL_TRUE = @USE_LIBTOOL_TRUE@
VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_READELF = @ac_ct_READELF@
-ac_ct_STRIP = @ac_ct_STRIP@
aext = @aext@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -148,6 +142,9 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
extra_objs = @extra_objs@
extra_sources = @extra_sources@
@@ -156,12 +153,14 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
libm_machine_dir = @libm_machine_dir@
+localedir = @localedir@
localstatedir = @localstatedir@
lpfx = @lpfx@
machine_dir = @machine_dir@
@@ -170,8 +169,10 @@
newlib_basedir = @newlib_basedir@
oext = @oext@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sys_dir = @sys_dir@
@@ -182,7 +183,7 @@
AM_CCASFLAGS = $(INCLUDES)
noinst_LIBRARIES = lib.a
AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
-lib_a_SOURCES = setjmp.S times.c
+lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
lib_a_CFLAGS = $(AM_CFLAGS)
lib_a_LIBADD = @extra_objs@
@@ -193,7 +194,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .S .c .o .obj
+.SUFFIXES: .S .o .obj
am--refresh:
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@@ -252,18 +253,6 @@
lib_a-setjmp.obj: setjmp.S
$(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-setjmp.obj `if test -f 'setjmp.S'; then $(CYGPATH_W) 'setjmp.S'; else $(CYGPATH_W) '$(srcdir)/setjmp.S'; fi`
-
-.c.o:
- $(COMPILE) -c $<
-
-.c.obj:
- $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-lib_a-times.o: times.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.o `test -f 'times.c' || echo '$(srcdir)/'`times.c
-
-lib_a-times.obj: times.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.obj `if test -f 'times.c'; then $(CYGPATH_W) 'times.c'; else $(CYGPATH_W) '$(srcdir)/times.c'; fi`
uninstall-info-am:
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
diff -Naur newlib-1.17.0.orig/newlib/libc/machine/powerpc/times.c newlib-1.17.0/newlib/libc/machine/powerpc/times.c
--- newlib-1.17.0.orig/newlib/libc/machine/powerpc/times.c 2002-07-22 22:26:51.000000000 +0200
+++ newlib-1.17.0/newlib/libc/machine/powerpc/times.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-/* Time support routines for PowerPC.
- *
- * Written by Aldy Hernandez.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/resource.h>
-
-clock_t
-times (struct tms *tp)
-{
- struct rusage usage;
- union {
- struct rusage r;
- /* Newlib's rusage has only 2 fields. We need to make room for
- when we call the system's rusage. This should be enough. */
- int filler[32];
- } host_ru;
-
- getrusage (RUSAGE_SELF, (void *)&host_ru);
-
- if (tp)
- {
- tp->tms_utime = host_ru.r.ru_utime.tv_sec * 1000
- + host_ru.r.ru_utime.tv_usec;
- tp->tms_stime = host_ru.r.ru_stime.tv_sec * 1000
- + host_ru.r.ru_stime.tv_usec;
- tp->tms_cutime = 0; /* user time, children */
- tp->tms_cstime = 0; /* system time, children */
- }
-
- return tp->tms_utime;
-}
diff -Naur newlib-1.17.0.orig/newlib/libc/stdlib/assert.c newlib-1.17.0/newlib/libc/stdlib/assert.c
--- newlib-1.17.0.orig/newlib/libc/stdlib/assert.c 2007-06-27 14:44:41.000000000 +0200
+++ newlib-1.17.0/newlib/libc/stdlib/assert.c 2009-07-15 09:21:32.000000000 +0200
@@ -47,6 +47,9 @@
#include <stdlib.h>
#include <stdio.h>
+#if !defined(__rtems__)
+/* RTEMS has a version of its own */
+
/* func can be NULL, in which case no function information is given. */
void
_DEFUN (__assert_func, (file, line, func, failedexpr),
@@ -62,6 +65,7 @@
abort();
/* NOTREACHED */
}
+#endif
void
_DEFUN (__assert, (file, line, failedexpr),
diff -Naur newlib-1.17.0.orig/newlib/libc/sys/rtems/crt0.c newlib-1.17.0/newlib/libc/sys/rtems/crt0.c
--- newlib-1.17.0.orig/newlib/libc/sys/rtems/crt0.c 2008-12-12 18:11:33.000000000 +0100
+++ newlib-1.17.0/newlib/libc/sys/rtems/crt0.c 2009-07-15 09:21:32.000000000 +0200
@@ -84,6 +84,9 @@
int _execve(const char *path, char * const *argv, char * const *envp) { return -1; }
int _exit(int status) { return -1; }
+/* stubs for functions required by libc/stdlib */
+void __assert_func(const char *file, int line, const char *failedexpr) {}
+
/* gcc can implicitly generate references to these */
/* strcmp() {} */
/* strcpy() {} */
diff -Naur newlib-1.17.0.orig/newlib/libc/sys/rtems/machine/stdint.h newlib-1.17.0/newlib/libc/sys/rtems/machine/stdint.h
--- newlib-1.17.0.orig/newlib/libc/sys/rtems/machine/stdint.h 1970-01-01 01:00:00.000000000 +0100
+++ newlib-1.17.0/newlib/libc/sys/rtems/machine/stdint.h 2009-07-15 09:21:32.000000000 +0200
@@ -0,0 +1,48 @@
+/*
+ *
+ */
+#ifndef _MACHINE_STDINT_H
+#define _MACHINE_STDINT_H
+
+#ifndef _STDINT_H
+#error machine/stdint.h is an internal file and must not be directly included
+#endif
+
+#ifndef __rtems__
+#error machine/stdint.h is an RTEMS specific internal file and must not be used otherwise
+#endif
+
+#if defined(__m32c__) || defined(__m32r__) || defined(__lm32__)
+#if (__SIZEOF_PTRDIFF_T__ == __SIZEOF_LONG__)
+#define __ptrint_t_long_defined 1
+#endif
+#if (__SIZEOF_PTRDIFF_T__ == __SIZEOF_INT__)
+#define __ptrint_t_int_defined 1
+#endif
+#endif
+
+#if defined(__sparc__) \
+ || defined(__powerpc__) || defined(__PPC__) \
+ || defined(__mips__) \
+ || defined(__sh__) \
+ || defined(__AVR__) \
+ || defined(_C4x) || defined(_C3x) \
+ || defined(__H8300__)
+/* PTRDIFF_TYPE = int */
+#define __ptrint_t_int_defined 1
+#endif
+
+#if defined(__i386__) \
+ || defined(__m68k__) \
+ || defined(__bfin__) \
+ || defined(__arm__) \
+ || defined(__H8300S__) || defined(__H8300H__) || defined(__H8300SX__) \
+/* PTRDIFF_TYPE = long */
+#define __ptrint_t_long_defined 1
+#endif
+
+#if !defined(__ptrint_t_int_defined) && !defined(__ptrint_t_long_defined)
+#error Failed to determine ptrint_t
+#endif
+
+#endif
diff -Naur newlib-1.17.0.orig/newlib/libc/sys/rtems/sys/param.h newlib-1.17.0/newlib/libc/sys/rtems/sys/param.h
--- newlib-1.17.0.orig/newlib/libc/sys/rtems/sys/param.h 2008-11-17 23:05:12.000000000 +0100
+++ newlib-1.17.0/newlib/libc/sys/rtems/sys/param.h 2009-07-15 09:21:32.000000000 +0200
@@ -15,10 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -47,7 +43,6 @@
#include <sys/config.h>
#include <machine/endian.h>
-# define HZ (60)
# define PATHSIZE (1024)
/* end of from newlib's <sys/param.h> */
@@ -86,13 +81,13 @@
#define MAXHOSTNAMELEN 256 /* max hostname size */
/* More types and definitions used throughout the kernel. */
-#ifdef KERNEL
+#if defined(KERNEL) || defined(_KERNEL)
#include <sys/cdefs.h>
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/resource.h>
-#include <sys/ucred.h>
#include <sys/uio.h>
+#include <sys/priority.h>
#ifndef FALSE
#define FALSE 0
@@ -109,23 +104,6 @@
#include <machine/param.h>
#include <machine/limits.h>
-/*
- * Priorities. Note that with 32 run queues, differences less than 4 are
- * insignificant.
- */
-#define PSWP 0
-#define PVM 4
-#define PINOD 8
-#define PRIBIO 16
-#define PVFS 20
-#define PZERO 22 /* No longer magic, shouldn't be here. XXX */
-#define PSOCK 24
-#define PWAIT 32
-#define PLOCK 36
-#define PPAUSE 40
-#define PUSER 50
-#define MAXPRI 127 /* Priorities range from 0 through MAXPRI. */
-
#define PRIMASK 0x0ff
#define PCATCH 0x100 /* OR'd with pri for tsleep to check signals */
@@ -136,15 +114,6 @@
#define CMASK 022 /* default file mask: S_IWGRP|S_IWOTH */
#define NODEV (dev_t)(-1) /* non-existent device */
-/*
- * Clustering of hardware pages on machines with ridiculously small
- * page sizes is done here. The paging subsystem deals with units of
- * CLSIZE pte's describing PAGE_SIZE (from machine/machparam.h) pages each.
- */
-#if 0
-#define CLBYTES (CLSIZE*PAGE_SIZE)
-#endif
-
#define CBLOCK 128 /* Clist block size, must be a power of 2. */
#define CBQSIZE (CBLOCK/NBBY) /* Quote bytes/cblock - can do better. */
/* Data chars/clist. */
@@ -200,7 +169,7 @@
#define powerof2(x) ((((x)-1)&(x))==0)
/* Macros for min/max. */
-#ifndef KERNEL
+#if !(defined(KERNEL) || defined(_KERNEL))
#define MIN(a,b) (((a)<(b))?(a):(b))
#define MAX(a,b) (((a)>(b))?(a):(b))
#endif
diff -Naur newlib-1.17.0.orig/newlib/libc/unix/Makefile.am newlib-1.17.0/newlib/libc/unix/Makefile.am
--- newlib-1.17.0.orig/newlib/libc/unix/Makefile.am 2006-05-02 00:01:07.000000000 +0200
+++ newlib-1.17.0/newlib/libc/unix/Makefile.am 2009-07-15 09:21:32.000000000 +0200
@@ -12,7 +12,8 @@
## Distinguish different EL/IX level interfaces
ELIX_2_SOURCES = \
- ttyname.c
+ ttyname.c \
+ ttyname_r.c
ELIX_4_SOURCES = \
basename.c \
diff -Naur newlib-1.17.0.orig/newlib/libc/unix/Makefile.in newlib-1.17.0/newlib/libc/unix/Makefile.in
--- newlib-1.17.0.orig/newlib/libc/unix/Makefile.in 2009-06-29 11:05:21.000000000 +0200
+++ newlib-1.17.0/newlib/libc/unix/Makefile.in 2009-07-15 09:21:32.000000000 +0200
@@ -59,7 +59,7 @@
lib_a_LIBADD =
am__objects_1 = lib_a-getcwd.$(OBJEXT) lib_a-pread.$(OBJEXT) \
lib_a-pwrite.$(OBJEXT) lib_a-sigset.$(OBJEXT)
-am__objects_2 = lib_a-ttyname.$(OBJEXT)
+am__objects_2 = lib_a-ttyname.$(OBJEXT) lib_a-ttyname_r.$(OBJEXT)
am__objects_3 = lib_a-basename.$(OBJEXT) lib_a-dirname.$(OBJEXT) \
lib_a-getlogin.$(OBJEXT) lib_a-getpass.$(OBJEXT) \
lib_a-getpwent.$(OBJEXT) lib_a-getut.$(OBJEXT)
@@ -74,7 +74,7 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libunix_la_LIBADD =
am__objects_5 = getcwd.lo pread.lo pwrite.lo sigset.lo
-am__objects_6 = ttyname.lo
+am__objects_6 = ttyname.lo ttyname_r.lo
am__objects_7 = basename.lo dirname.lo getlogin.lo getpass.lo \
getpwent.lo getut.lo
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@am__objects_8 = $(am__objects_6) \
@@ -278,7 +278,8 @@
sigset.c
ELIX_2_SOURCES = \
- ttyname.c
+ ttyname.c \
+ ttyname_r.c
ELIX_4_SOURCES = \
basename.c \
@@ -402,6 +403,12 @@
lib_a-ttyname.obj: ttyname.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ttyname.obj `if test -f 'ttyname.c'; then $(CYGPATH_W) 'ttyname.c'; else $(CYGPATH_W) '$(srcdir)/ttyname.c'; fi`
+lib_a-ttyname_r.o: ttyname_r.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ttyname_r.o `test -f 'ttyname_r.c' || echo '$(srcdir)/'`ttyname_r.c
+
+lib_a-ttyname_r.obj: ttyname_r.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ttyname_r.obj `if test -f 'ttyname_r.c'; then $(CYGPATH_W) 'ttyname_r.c'; else $(CYGPATH_W) '$(srcdir)/ttyname_r.c'; fi`
+
lib_a-basename.o: basename.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-basename.o `test -f 'basename.c' || echo '$(srcdir)/'`basename.c
diff -Naur newlib-1.17.0.orig/newlib/libc/unix/ttyname.c newlib-1.17.0/newlib/libc/unix/ttyname.c
--- newlib-1.17.0.orig/newlib/libc/unix/ttyname.c 2008-11-18 23:55:06.000000000 +0100
+++ newlib-1.17.0/newlib/libc/unix/ttyname.c 2009-07-15 09:21:32.000000000 +0200
@@ -28,67 +28,14 @@
* SUCH DAMAGE.
*/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#include "ttyname.h"
+
#include <dirent.h>
#include <unistd.h>
-#include <string.h>
#include <paths.h>
-#include <_syslist.h>
#include <errno.h>
-static char ttyname_buf[sizeof (_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
-
-/*
- * ttyname_r() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
- */
-int
-_DEFUN( ttyname_r,(fd, name, namesize),
- int fd _AND
- char *name _AND
- size_t namesize)
-{
- struct stat sb;
- struct dirent *dirp;
- DIR *dp;
- struct stat dsb;
- char buf[sizeof(ttyname_buf)];
-
- /* Must be a terminal. */
- if (!isatty(fd))
- return ENOTTY;
-
- /* Must be a character device. */
- if (fstat (fd, &sb) || !S_ISCHR (sb.st_mode))
- return ENOTTY;
-
- if ((dp = opendir (_PATH_DEV)) == NULL)
- return EBADF;
-
- strcpy(buf, _PATH_DEV);
- while ((dirp = readdir (dp)) != NULL)
- {
- if (dirp->d_ino != sb.st_ino)
- continue;
- strcpy (buf + sizeof (_PATH_DEV) - 1, dirp->d_name);
- if (stat (buf, &dsb) || sb.st_dev != dsb.st_dev ||
- sb.st_ino != dsb.st_ino)
- continue;
- (void) closedir (dp);
- if(strlen(buf) < namesize) /* < to account for terminating null */
- {
- strcpy(name, buf);
- return 0;
- }
- else
- {
- return ERANGE;
- }
- }
- (void) closedir (dp);
- return EBADF;
-}
+static char ttyname_buf[TTYNAME_BUFSIZE] = _PATH_DEV;
/*
* ttyname() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
diff -Naur newlib-1.17.0.orig/newlib/libc/unix/ttyname.h newlib-1.17.0/newlib/libc/unix/ttyname.h
--- newlib-1.17.0.orig/newlib/libc/unix/ttyname.h 1970-01-01 01:00:00.000000000 +0100
+++ newlib-1.17.0/newlib/libc/unix/ttyname.h 2009-07-15 09:21:32.000000000 +0200
@@ -0,0 +1,6 @@
+/* Common defines for ttyname.c and ttyname_r.c */
+
+#include <dirent.h> /* For MAXNAMLEN */
+#include <paths.h> /* For _PATH_DEV */
+
+#define TTYNAME_BUFSIZE (sizeof (_PATH_DEV) + MAXNAMLEN)
diff -Naur newlib-1.17.0.orig/newlib/libc/unix/ttyname_r.c newlib-1.17.0/newlib/libc/unix/ttyname_r.c
--- newlib-1.17.0.orig/newlib/libc/unix/ttyname_r.c 1970-01-01 01:00:00.000000000 +0100
+++ newlib-1.17.0/newlib/libc/unix/ttyname_r.c 2009-07-15 09:21:32.000000000 +0200
@@ -0,0 +1,93 @@
+#ifndef _NO_TTYNAME
+/*
+ * Copyright (c) 1988 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "ttyname.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <string.h>
+#include <paths.h>
+#include <_syslist.h>
+#include <errno.h>
+
+/*
+ * ttyname_r() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
+ */
+int
+_DEFUN( ttyname_r,(fd, name, namesize),
+ int fd _AND
+ char *name _AND
+ size_t namesize)
+{
+ struct stat sb;
+ struct dirent *dirp;
+ DIR *dp;
+ struct stat dsb;
+ char buf[TTYNAME_BUFSIZE];
+
+ /* Must be a terminal. */
+ if (!isatty(fd))
+ return ENOTTY;
+
+ /* Must be a character device. */
+ if (fstat (fd, &sb) || !S_ISCHR (sb.st_mode))
+ return ENOTTY;
+
+ if ((dp = opendir (_PATH_DEV)) == NULL)
+ return EBADF;
+
+ strcpy(buf, _PATH_DEV);
+ while ((dirp = readdir (dp)) != NULL)
+ {
+ if (dirp->d_ino != sb.st_ino)
+ continue;
+ strcpy (buf + sizeof (_PATH_DEV) - 1, dirp->d_name);
+ if (stat (buf, &dsb) || sb.st_dev != dsb.st_dev ||
+ sb.st_ino != dsb.st_ino)
+ continue;
+ (void) closedir (dp);
+ if(strlen(buf) < namesize) /* < to account for terminating null */
+ {
+ strcpy(name, buf);
+ return 0;
+ }
+ else
+ {
+ return ERANGE;
+ }
+ }
+ (void) closedir (dp);
+ return EBADF;
+}
+
+#endif /* !_NO_TTYNAME */
diff -Naur newlib-1.17.0.orig/newlib/Makefile.am newlib-1.17.0/newlib/Makefile.am
--- newlib-1.17.0.orig/newlib/Makefile.am 2008-01-21 19:29:17.000000000 +0100
+++ newlib-1.17.0/newlib/Makefile.am 2009-07-15 09:21:32.000000000 +0200
@@ -81,7 +81,7 @@
libc.a
endif
-noinst_DATA = stmp-targ-include
+BUILT_SOURCES = stmp-targ-include
toollib_DATA = $(CRT0) $(CRT1)
@@ -186,9 +186,6 @@
$(CRT1_DIR)$(CRT1): ; @true
-
-all-recursive: stmp-targ-include
-
# The targ-include directory just holds the includes files for the
# particular system and machine we have been configured for. It is
# used while building.
diff -Naur newlib-1.17.0.orig/newlib/Makefile.in newlib-1.17.0/newlib/Makefile.in
--- newlib-1.17.0.orig/newlib/Makefile.in 2009-06-29 11:05:19.000000000 +0200
+++ newlib-1.17.0/newlib/Makefile.in 2009-07-15 09:21:32.000000000 +0200
@@ -106,7 +106,7 @@
pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive
toollibDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(noinst_DATA) $(toollib_DATA)
+DATA = $(toollib_DATA)
ETAGS = etags
CTAGS = ctags
DEJATOOL = $(PACKAGE)
@@ -350,7 +350,7 @@
@USE_LIBTOOL_FALSE@toollib_LIBRARIES = libm.a \
@USE_LIBTOOL_FALSE@ libc.a
-noinst_DATA = stmp-targ-include
+BUILT_SOURCES = stmp-targ-include
toollib_DATA = $(CRT0) $(CRT1)
# The functions ldexp, frexp and modf are traditionally supplied in
@@ -409,7 +409,7 @@
# dejagnu support
RUNTESTFLAGS =
-all: newlib.h
+all: $(BUILT_SOURCES) newlib.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
@@ -714,14 +714,16 @@
done
check-am:
$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
-check: check-recursive
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-recursive
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) newlib.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
-install: install-recursive
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
@@ -746,6 +748,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-recursive
clean-am: clean-generic clean-libtool clean-toollibLIBRARIES \
@@ -864,8 +867,6 @@
$(CRT1_DIR)$(CRT1): ; @true
-all-recursive: stmp-targ-include
-
# The targ-include directory just holds the includes files for the
# particular system and machine we have been configured for. It is
# used while building.

923
contrib/crossrpms/patches/newlib-1.17.0-rtems4.10-20090727.diff
View File

@@ -1,923 +0,0 @@
diff -Naur newlib-1.17.0.orig/newlib/ChangeLog.rtems newlib-1.17.0/newlib/ChangeLog.rtems
--- newlib-1.17.0.orig/newlib/ChangeLog.rtems 1970-01-01 01:00:00.000000000 +0100
+++ newlib-1.17.0/newlib/ChangeLog.rtems 2009-07-27 11:29:20.000000000 +0200
@@ -0,0 +1,63 @@
+2009-07-27 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/sys/rtems/crt0.c: Add _isatty_r.
+
+2009-07-06 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * libc/include/sys/features.h: Define _UNIX98_THREAD_MUTEX_ATTRIBUTES.
+
+2009-05-05 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * configure.host: Remove -DMISSING_SYSCALL_NAMES.
+
+2009-03-11 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/stdlib/assert.c: Don't build __assert_func.
+ * libc/sys/rtems/crt0.c: Add __assert_func.
+
+2009-03-09 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/machine/powerpc/times.c: Remove.
+ * libc/machine/powerpc/Makefile.am: Remove times.c.
+ * libc/machine/powerpc/Makefile.in: Regenerate.
+
+2009-02-24 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/unix/ttyname.c: Sync with newlib-cvs.
+ * configure.host: Add -DHAVE_BLKSIZE to newlib_cflags.
+
+2009-02-22 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/sys/rtems/machine/stdint.h: Add __lm32__.
+ * libc/machine/lm32/configure.in: Set AC_CONFIG_SRC to setjmp.S.
+ * libc/machine/lm32/configure: Regenerate.
+
+2009-02-20 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/unix/Makefile.in: Regenerate.
+
+2009-02-20 Craig Howland <howland@LGSInnovations.com> on behalf of
+ Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * libc/unix/ttyname.c: Remove ttyname_r() (to a new file to avoid
+ coupling ttyname_r() and ttyname() due to the latter's large buffer).
+ * libc/unix/ttyname_r.c: New file to hold ttyname_r(), previously in
+ ttyname.c.
+ * libc/unix/ttyname.h: New file (common size definition for the 2
+ ttyname*c files that are now split).
+ * libc/unix/Makefile.am (ELIX_2_SOURCES): Add ttyname_r.c.
+
+2009-02-16 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/sys/rtems/sys/param.h:
+ Update copyright notice from FreeBSD.
+ Remove HZ.
+ Add #include <sys/priority.h>
+ Remove priority handling (moved to sys/priority.h).
+ Remove CLBYTES (Unused, abandoned in BSD).
+
+2009-02-06 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libc/include/sched.h:
+ Remove (collides with RTEMS's schedul.h).
+
diff -Naur newlib-1.17.0.orig/newlib/configure.host newlib-1.17.0/newlib/configure.host
--- newlib-1.17.0.orig/newlib/configure.host 2008-12-18 00:09:09.000000000 +0100
+++ newlib-1.17.0/newlib/configure.host 2009-07-15 09:21:32.000000000 +0200
@@ -537,7 +537,7 @@
*-*-rtems*)
default_newlib_io_long_long="yes"
default_newlib_io_c99_formats="yes"
- newlib_cflags="${newlib_cflags} -DMALLOC_PROVIDED -DEXIT_PROVIDED -DMISSING_SYSCALL_NAMES -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_NANOSLEEP -DHAVE_FCNTL"
+ newlib_cflags="${newlib_cflags} -DMALLOC_PROVIDED -DEXIT_PROVIDED -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_NANOSLEEP -DHAVE_BLKSIZE -DHAVE_FCNTL"
# turn off unsupported items in posix directory
newlib_cflags="${newlib_cflags} -D_NO_GETLOGIN -D_NO_GETPWENT -D_NO_GETUT -D_NO_GETPASS -D_NO_SIGSET"
;;
diff -Naur newlib-1.17.0.orig/newlib/libc/include/inttypes.h newlib-1.17.0/newlib/libc/include/inttypes.h
--- newlib-1.17.0.orig/newlib/libc/include/inttypes.h 2005-12-16 20:03:12.000000000 +0100
+++ newlib-1.17.0/newlib/libc/include/inttypes.h 2009-07-15 09:21:32.000000000 +0200
@@ -163,12 +163,12 @@
/* 64-bit types */
-#if __have_longlong64
-#define __PRI64(x) __STRINGIFY(ll##x)
-#define __SCN64(x) __STRINGIFY(ll##x)
-#elif __have_long64
+#if __have_long64
#define __PRI64(x) __STRINGIFY(l##x)
#define __SCN64(x) __STRINGIFY(l##x)
+#elif __have_longlong64
+#define __PRI64(x) __STRINGIFY(ll##x)
+#define __SCN64(x) __STRINGIFY(ll##x)
#else
#define __PRI64(x) __STRINGIFY(x)
#define __SCN64(x) __STRINGIFY(x)
@@ -217,12 +217,12 @@
#endif
/* max-bit types */
-#if __have_longlong64
-#define __PRIMAX(x) __STRINGIFY(ll##x)
-#define __SCNMAX(x) __STRINGIFY(ll##x)
-#elif __have_long64
+#if __have_long64
#define __PRIMAX(x) __STRINGIFY(l##x)
#define __SCNMAX(x) __STRINGIFY(l##x)
+#elif __have_longlong64
+#define __PRIMAX(x) __STRINGIFY(ll##x)
+#define __SCNMAX(x) __STRINGIFY(ll##x)
#else
#define __PRIMAX(x) __STRINGIFY(x)
#define __SCNMAX(x) __STRINGIFY(x)
@@ -242,12 +242,12 @@
#define SCNxMAX __SCNMAX(x)
/* ptr types */
-#if __have_longlong64
-#define __PRIPTR(x) __STRINGIFY(ll##x)
-#define __SCNPTR(x) __STRINGIFY(ll##x)
-#elif __have_long64
+#if __have_long64
#define __PRIPTR(x) __STRINGIFY(l##x)
#define __SCNPTR(x) __STRINGIFY(l##x)
+#elif __have_longlong64
+#define __PRIPTR(x) __STRINGIFY(ll##x)
+#define __SCNPTR(x) __STRINGIFY(ll##x)
#else
#define __PRIPTR(x) __STRINGIFY(x)
#define __SCNPTR(x) __STRINGIFY(x)
diff -Naur newlib-1.17.0.orig/newlib/libc/include/machine/ieeefp.h newlib-1.17.0/newlib/libc/include/machine/ieeefp.h
--- newlib-1.17.0.orig/newlib/libc/include/machine/ieeefp.h 2008-12-11 21:05:38.000000000 +0100
+++ newlib-1.17.0/newlib/libc/include/machine/ieeefp.h 2009-07-15 09:21:32.000000000 +0200
@@ -62,8 +62,12 @@
# define __IEEE_BIG_ENDIAN
# endif
#else
-# define __IEEE_BIG_ENDIAN
# ifdef __ARMEL__
+# define __IEEE_LITTLE_ENDIAN
+# else
+# define __IEEE_BIG_ENDIAN
+# endif
+# ifdef __ARMWEL__
# define __IEEE_BYTES_LITTLE_ENDIAN
# endif
#endif
diff -Naur newlib-1.17.0.orig/newlib/libc/include/machine/setjmp.h newlib-1.17.0/newlib/libc/include/machine/setjmp.h
--- newlib-1.17.0.orig/newlib/libc/include/machine/setjmp.h 2008-12-11 21:05:38.000000000 +0100
+++ newlib-1.17.0/newlib/libc/include/machine/setjmp.h 2009-07-15 09:21:32.000000000 +0200
@@ -27,7 +27,7 @@
/* necv70 was 9 as well. */
-#ifdef __mc68000__
+#if defined(__m68k__) || defined(__mc68000__)
/*
* onsstack,sigmask,sp,pc,psl,d2-d7,a2-a6,
* fp2-fp7 for 68881.
diff -Naur newlib-1.17.0.orig/newlib/libc/include/sched.h newlib-1.17.0/newlib/libc/include/sched.h
--- newlib-1.17.0.orig/newlib/libc/include/sched.h 2007-09-21 23:02:15.000000000 +0200
+++ newlib-1.17.0/newlib/libc/include/sched.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-#ifndef _SCHED_H_
-#define _SCHED_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/sched.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SCHED_H_ */
diff -Naur newlib-1.17.0.orig/newlib/libc/include/stdint.h newlib-1.17.0/newlib/libc/include/stdint.h
--- newlib-1.17.0.orig/newlib/libc/include/stdint.h 2008-12-10 22:27:58.000000000 +0100
+++ newlib-1.17.0/newlib/libc/include/stdint.h 2009-07-15 09:21:32.000000000 +0200
@@ -475,6 +475,9 @@
#define UINTMAX_C(x) x##UL
#endif
+#ifdef __rtems__
+#include <machine/stdint.h>
+#endif
#ifdef __cplusplus
}
diff -Naur newlib-1.17.0.orig/newlib/libc/include/sys/features.h newlib-1.17.0/newlib/libc/include/sys/features.h
--- newlib-1.17.0.orig/newlib/libc/include/sys/features.h 2008-12-12 18:16:03.000000000 +0100
+++ newlib-1.17.0/newlib/libc/include/sys/features.h 2009-07-15 09:23:47.000000000 +0200
@@ -73,6 +73,9 @@
#define _POSIX_INTERRUPT_CONTROL 1
#define _POSIX_ADVISORY_INFO 1
+/* UNIX98 added some new pthread mutex attributes */
+#define _UNIX98_THREAD_MUTEX_ATTRIBUTES 1
+
#endif
#ifdef __svr4__
diff -Naur newlib-1.17.0.orig/newlib/libc/include/sys/_types.h newlib-1.17.0/newlib/libc/include/sys/_types.h
--- newlib-1.17.0.orig/newlib/libc/include/sys/_types.h 2007-09-18 22:05:17.000000000 +0200
+++ newlib-1.17.0/newlib/libc/include/sys/_types.h 2009-07-15 09:21:32.000000000 +0200
@@ -84,4 +84,7 @@
typedef void *_iconv_t;
#endif
+typedef long * __intptr_t;
+typedef unsigned long* __uintptr_t;
+
#endif /* _SYS__TYPES_H */
diff -Naur newlib-1.17.0.orig/newlib/libc/machine/arm/machine/endian.h newlib-1.17.0/newlib/libc/machine/arm/machine/endian.h
--- newlib-1.17.0.orig/newlib/libc/machine/arm/machine/endian.h 2004-05-07 22:29:24.000000000 +0200
+++ newlib-1.17.0/newlib/libc/machine/arm/machine/endian.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-/* ARM configuration file */
-
-#ifndef _MACHINE_ENDIAN_H
-# define _MACHINE_ENDIAN_H
-
-#ifdef __ARMEB__
-#define BYTE_ORDER BIG_ENDIAN
-#else
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
-#endif
diff -Naur newlib-1.17.0.orig/newlib/libc/machine/lm32/configure newlib-1.17.0/newlib/libc/machine/lm32/configure
--- newlib-1.17.0.orig/newlib/libc/machine/lm32/configure 2008-12-22 20:45:44.000000000 +0100
+++ newlib-1.17.0/newlib/libc/machine/lm32/configure 2009-07-15 09:21:32.000000000 +0200
@@ -271,7 +271,7 @@
PACKAGE_STRING='newlib 1.17.0'
PACKAGE_BUGREPORT=''
-ac_unique_file="setjmp.s"
+ac_unique_file="setjmp.S"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAY_SUPPLY_SYSCALLS_TRUE MAY_SUPPLY_SYSCALLS_FALSE newlib_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB READELF ac_ct_READELF MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CCAS CCASFLAGS NEWLIB_CFLAGS LDFLAGS ELIX_LEVEL_0_TRUE ELIX_LEVEL_0_FALSE ELIX_LEVEL_1_TRUE ELIX_LEVEL_1_FALSE ELIX_LEVEL_2_TRUE ELIX_LEVEL_2_FALSE ELIX_LEVEL_3_TRUE ELIX_LEVEL_3_FALSE ELIX_LEVEL_4_TRUE ELIX_LEVEL_4_FALSE USE_LIBTOOL_TRUE USE_LIBTOOL_FALSE OBJEXT oext aext lpfx libm_machine_dir machine_dir sys_dir LIBOBJS LTLIBOBJS'
ac_subst_files=''
diff -Naur newlib-1.17.0.orig/newlib/libc/machine/lm32/configure.in newlib-1.17.0/newlib/libc/machine/lm32/configure.in
--- newlib-1.17.0.orig/newlib/libc/machine/lm32/configure.in 2008-12-11 21:05:38.000000000 +0100
+++ newlib-1.17.0/newlib/libc/machine/lm32/configure.in 2009-07-15 09:21:32.000000000 +0200
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
AC_INIT([newlib],[NEWLIB_VERSION])
-AC_CONFIG_SRCDIR([setjmp.s])
+AC_CONFIG_SRCDIR([setjmp.S])
dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake.
AC_CONFIG_AUX_DIR(../../../..)
diff -Naur newlib-1.17.0.orig/newlib/libc/machine/powerpc/Makefile.am newlib-1.17.0/newlib/libc/machine/powerpc/Makefile.am
--- newlib-1.17.0.orig/newlib/libc/machine/powerpc/Makefile.am 2007-05-24 19:33:35.000000000 +0200
+++ newlib-1.17.0/newlib/libc/machine/powerpc/Makefile.am 2009-07-15 09:21:32.000000000 +0200
@@ -10,7 +10,7 @@
AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
-lib_a_SOURCES = setjmp.S times.c
+lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS=$(AM_CCASFLAGS)
lib_a_CFLAGS=$(AM_CFLAGS)
lib_a_LIBADD = @extra_objs@
diff -Naur newlib-1.17.0.orig/newlib/libc/machine/powerpc/Makefile.in newlib-1.17.0/newlib/libc/machine/powerpc/Makefile.in
--- newlib-1.17.0.orig/newlib/libc/machine/powerpc/Makefile.in 2009-06-29 11:05:21.000000000 +0200
+++ newlib-1.17.0/newlib/libc/machine/powerpc/Makefile.in 2009-07-15 09:21:32.000000000 +0200
@@ -39,8 +39,7 @@
DIST_COMMON = $(srcdir)/../../../../config.guess \
$(srcdir)/../../../../config.sub $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/../../../../mkinstalldirs \
- $(srcdir)/../../../../compile
+ $(am__configure_deps) $(srcdir)/../../../../mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../../acinclude.m4 \
@@ -54,7 +53,7 @@
LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
lib_a_AR = $(AR) $(ARFLAGS)
-am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-times.$(OBJEXT)
+am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT)
lib_a_OBJECTS = $(am_lib_a_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir)
depcomp =
@@ -128,11 +127,6 @@
USE_LIBTOOL_FALSE = @USE_LIBTOOL_FALSE@
USE_LIBTOOL_TRUE = @USE_LIBTOOL_TRUE@
VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_READELF = @ac_ct_READELF@
-ac_ct_STRIP = @ac_ct_STRIP@
aext = @aext@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -148,6 +142,9 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
extra_objs = @extra_objs@
extra_sources = @extra_sources@
@@ -156,12 +153,14 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
libm_machine_dir = @libm_machine_dir@
+localedir = @localedir@
localstatedir = @localstatedir@
lpfx = @lpfx@
machine_dir = @machine_dir@
@@ -170,8 +169,10 @@
newlib_basedir = @newlib_basedir@
oext = @oext@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sys_dir = @sys_dir@
@@ -182,7 +183,7 @@
AM_CCASFLAGS = $(INCLUDES)
noinst_LIBRARIES = lib.a
AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
-lib_a_SOURCES = setjmp.S times.c
+lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS)
lib_a_CFLAGS = $(AM_CFLAGS)
lib_a_LIBADD = @extra_objs@
@@ -193,7 +194,7 @@
all: all-am
.SUFFIXES:
-.SUFFIXES: .S .c .o .obj
+.SUFFIXES: .S .o .obj
am--refresh:
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@@ -252,18 +253,6 @@
lib_a-setjmp.obj: setjmp.S
$(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-setjmp.obj `if test -f 'setjmp.S'; then $(CYGPATH_W) 'setjmp.S'; else $(CYGPATH_W) '$(srcdir)/setjmp.S'; fi`
-
-.c.o:
- $(COMPILE) -c $<
-
-.c.obj:
- $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-lib_a-times.o: times.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.o `test -f 'times.c' || echo '$(srcdir)/'`times.c
-
-lib_a-times.obj: times.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.obj `if test -f 'times.c'; then $(CYGPATH_W) 'times.c'; else $(CYGPATH_W) '$(srcdir)/times.c'; fi`
uninstall-info-am:
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
diff -Naur newlib-1.17.0.orig/newlib/libc/machine/powerpc/times.c newlib-1.17.0/newlib/libc/machine/powerpc/times.c
--- newlib-1.17.0.orig/newlib/libc/machine/powerpc/times.c 2002-07-22 22:26:51.000000000 +0200
+++ newlib-1.17.0/newlib/libc/machine/powerpc/times.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-/* Time support routines for PowerPC.
- *
- * Written by Aldy Hernandez.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/resource.h>
-
-clock_t
-times (struct tms *tp)
-{
- struct rusage usage;
- union {
- struct rusage r;
- /* Newlib's rusage has only 2 fields. We need to make room for
- when we call the system's rusage. This should be enough. */
- int filler[32];
- } host_ru;
-
- getrusage (RUSAGE_SELF, (void *)&host_ru);
-
- if (tp)
- {
- tp->tms_utime = host_ru.r.ru_utime.tv_sec * 1000
- + host_ru.r.ru_utime.tv_usec;
- tp->tms_stime = host_ru.r.ru_stime.tv_sec * 1000
- + host_ru.r.ru_stime.tv_usec;
- tp->tms_cutime = 0; /* user time, children */
- tp->tms_cstime = 0; /* system time, children */
- }
-
- return tp->tms_utime;
-}
diff -Naur newlib-1.17.0.orig/newlib/libc/stdlib/assert.c newlib-1.17.0/newlib/libc/stdlib/assert.c
--- newlib-1.17.0.orig/newlib/libc/stdlib/assert.c 2007-06-27 14:44:41.000000000 +0200
+++ newlib-1.17.0/newlib/libc/stdlib/assert.c 2009-07-15 09:21:32.000000000 +0200
@@ -47,6 +47,9 @@
#include <stdlib.h>
#include <stdio.h>
+#if !defined(__rtems__)
+/* RTEMS has a version of its own */
+
/* func can be NULL, in which case no function information is given. */
void
_DEFUN (__assert_func, (file, line, func, failedexpr),
@@ -62,6 +65,7 @@
abort();
/* NOTREACHED */
}
+#endif
void
_DEFUN (__assert, (file, line, failedexpr),
diff -Naur newlib-1.17.0.orig/newlib/libc/sys/rtems/crt0.c newlib-1.17.0/newlib/libc/sys/rtems/crt0.c
--- newlib-1.17.0.orig/newlib/libc/sys/rtems/crt0.c 2008-12-12 18:11:33.000000000 +0100
+++ newlib-1.17.0/newlib/libc/sys/rtems/crt0.c 2009-07-27 13:33:15.000000000 +0200
@@ -54,6 +54,7 @@
#endif
int _fstat_r (struct _reent *r, int fd, struct stat *buf) { return -1; }
int _getpid_r (struct _reent *r) { return -1; }
+int _isatty_r (struct _reent *r, int fd) { return isatty( fd ); }
int _kill_r ( struct _reent *r, int pid, int sig ) { return -1; }
int _link_r ( struct _reent *ptr, const char *existing, const char *new) { return -1; }
_off_t _lseek_r ( struct _reent *ptr, int fd, _off_t offset, int whence ) { return -1; }
@@ -84,6 +85,9 @@
int _execve(const char *path, char * const *argv, char * const *envp) { return -1; }
int _exit(int status) { return -1; }
+/* stubs for functions required by libc/stdlib */
+void __assert_func(const char *file, int line, const char *failedexpr) {}
+
/* gcc can implicitly generate references to these */
/* strcmp() {} */
/* strcpy() {} */
diff -Naur newlib-1.17.0.orig/newlib/libc/sys/rtems/machine/stdint.h newlib-1.17.0/newlib/libc/sys/rtems/machine/stdint.h
--- newlib-1.17.0.orig/newlib/libc/sys/rtems/machine/stdint.h 1970-01-01 01:00:00.000000000 +0100
+++ newlib-1.17.0/newlib/libc/sys/rtems/machine/stdint.h 2009-07-15 09:21:32.000000000 +0200
@@ -0,0 +1,48 @@
+/*
+ *
+ */
+#ifndef _MACHINE_STDINT_H
+#define _MACHINE_STDINT_H
+
+#ifndef _STDINT_H
+#error machine/stdint.h is an internal file and must not be directly included
+#endif
+
+#ifndef __rtems__
+#error machine/stdint.h is an RTEMS specific internal file and must not be used otherwise
+#endif
+
+#if defined(__m32c__) || defined(__m32r__) || defined(__lm32__)
+#if (__SIZEOF_PTRDIFF_T__ == __SIZEOF_LONG__)
+#define __ptrint_t_long_defined 1
+#endif
+#if (__SIZEOF_PTRDIFF_T__ == __SIZEOF_INT__)
+#define __ptrint_t_int_defined 1
+#endif
+#endif
+
+#if defined(__sparc__) \
+ || defined(__powerpc__) || defined(__PPC__) \
+ || defined(__mips__) \
+ || defined(__sh__) \
+ || defined(__AVR__) \
+ || defined(_C4x) || defined(_C3x) \
+ || defined(__H8300__)
+/* PTRDIFF_TYPE = int */
+#define __ptrint_t_int_defined 1
+#endif
+
+#if defined(__i386__) \
+ || defined(__m68k__) \
+ || defined(__bfin__) \
+ || defined(__arm__) \
+ || defined(__H8300S__) || defined(__H8300H__) || defined(__H8300SX__) \
+/* PTRDIFF_TYPE = long */
+#define __ptrint_t_long_defined 1
+#endif
+
+#if !defined(__ptrint_t_int_defined) && !defined(__ptrint_t_long_defined)
+#error Failed to determine ptrint_t
+#endif
+
+#endif
diff -Naur newlib-1.17.0.orig/newlib/libc/sys/rtems/sys/param.h newlib-1.17.0/newlib/libc/sys/rtems/sys/param.h
--- newlib-1.17.0.orig/newlib/libc/sys/rtems/sys/param.h 2008-11-17 23:05:12.000000000 +0100
+++ newlib-1.17.0/newlib/libc/sys/rtems/sys/param.h 2009-07-15 09:21:32.000000000 +0200
@@ -15,10 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -47,7 +43,6 @@
#include <sys/config.h>
#include <machine/endian.h>
-# define HZ (60)
# define PATHSIZE (1024)
/* end of from newlib's <sys/param.h> */
@@ -86,13 +81,13 @@
#define MAXHOSTNAMELEN 256 /* max hostname size */
/* More types and definitions used throughout the kernel. */
-#ifdef KERNEL
+#if defined(KERNEL) || defined(_KERNEL)
#include <sys/cdefs.h>
#include <sys/errno.h>
#include <sys/time.h>
#include <sys/resource.h>
-#include <sys/ucred.h>
#include <sys/uio.h>
+#include <sys/priority.h>
#ifndef FALSE
#define FALSE 0
@@ -109,23 +104,6 @@
#include <machine/param.h>
#include <machine/limits.h>
-/*
- * Priorities. Note that with 32 run queues, differences less than 4 are
- * insignificant.
- */
-#define PSWP 0
-#define PVM 4
-#define PINOD 8
-#define PRIBIO 16
-#define PVFS 20
-#define PZERO 22 /* No longer magic, shouldn't be here. XXX */
-#define PSOCK 24
-#define PWAIT 32
-#define PLOCK 36
-#define PPAUSE 40
-#define PUSER 50
-#define MAXPRI 127 /* Priorities range from 0 through MAXPRI. */
-
#define PRIMASK 0x0ff
#define PCATCH 0x100 /* OR'd with pri for tsleep to check signals */
@@ -136,15 +114,6 @@
#define CMASK 022 /* default file mask: S_IWGRP|S_IWOTH */
#define NODEV (dev_t)(-1) /* non-existent device */
-/*
- * Clustering of hardware pages on machines with ridiculously small
- * page sizes is done here. The paging subsystem deals with units of
- * CLSIZE pte's describing PAGE_SIZE (from machine/machparam.h) pages each.
- */
-#if 0
-#define CLBYTES (CLSIZE*PAGE_SIZE)
-#endif
-
#define CBLOCK 128 /* Clist block size, must be a power of 2. */
#define CBQSIZE (CBLOCK/NBBY) /* Quote bytes/cblock - can do better. */
/* Data chars/clist. */
@@ -200,7 +169,7 @@
#define powerof2(x) ((((x)-1)&(x))==0)
/* Macros for min/max. */
-#ifndef KERNEL
+#if !(defined(KERNEL) || defined(_KERNEL))
#define MIN(a,b) (((a)<(b))?(a):(b))
#define MAX(a,b) (((a)>(b))?(a):(b))
#endif
diff -Naur newlib-1.17.0.orig/newlib/libc/unix/Makefile.am newlib-1.17.0/newlib/libc/unix/Makefile.am
--- newlib-1.17.0.orig/newlib/libc/unix/Makefile.am 2006-05-02 00:01:07.000000000 +0200
+++ newlib-1.17.0/newlib/libc/unix/Makefile.am 2009-07-15 09:21:32.000000000 +0200
@@ -12,7 +12,8 @@
## Distinguish different EL/IX level interfaces
ELIX_2_SOURCES = \
- ttyname.c
+ ttyname.c \
+ ttyname_r.c
ELIX_4_SOURCES = \
basename.c \
diff -Naur newlib-1.17.0.orig/newlib/libc/unix/Makefile.in newlib-1.17.0/newlib/libc/unix/Makefile.in
--- newlib-1.17.0.orig/newlib/libc/unix/Makefile.in 2009-06-29 11:05:21.000000000 +0200
+++ newlib-1.17.0/newlib/libc/unix/Makefile.in 2009-07-15 09:21:32.000000000 +0200
@@ -59,7 +59,7 @@
lib_a_LIBADD =
am__objects_1 = lib_a-getcwd.$(OBJEXT) lib_a-pread.$(OBJEXT) \
lib_a-pwrite.$(OBJEXT) lib_a-sigset.$(OBJEXT)
-am__objects_2 = lib_a-ttyname.$(OBJEXT)
+am__objects_2 = lib_a-ttyname.$(OBJEXT) lib_a-ttyname_r.$(OBJEXT)
am__objects_3 = lib_a-basename.$(OBJEXT) lib_a-dirname.$(OBJEXT) \
lib_a-getlogin.$(OBJEXT) lib_a-getpass.$(OBJEXT) \
lib_a-getpwent.$(OBJEXT) lib_a-getut.$(OBJEXT)
@@ -74,7 +74,7 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libunix_la_LIBADD =
am__objects_5 = getcwd.lo pread.lo pwrite.lo sigset.lo
-am__objects_6 = ttyname.lo
+am__objects_6 = ttyname.lo ttyname_r.lo
am__objects_7 = basename.lo dirname.lo getlogin.lo getpass.lo \
getpwent.lo getut.lo
@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@am__objects_8 = $(am__objects_6) \
@@ -278,7 +278,8 @@
sigset.c
ELIX_2_SOURCES = \
- ttyname.c
+ ttyname.c \
+ ttyname_r.c
ELIX_4_SOURCES = \
basename.c \
@@ -402,6 +403,12 @@
lib_a-ttyname.obj: ttyname.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ttyname.obj `if test -f 'ttyname.c'; then $(CYGPATH_W) 'ttyname.c'; else $(CYGPATH_W) '$(srcdir)/ttyname.c'; fi`
+lib_a-ttyname_r.o: ttyname_r.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ttyname_r.o `test -f 'ttyname_r.c' || echo '$(srcdir)/'`ttyname_r.c
+
+lib_a-ttyname_r.obj: ttyname_r.c
+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ttyname_r.obj `if test -f 'ttyname_r.c'; then $(CYGPATH_W) 'ttyname_r.c'; else $(CYGPATH_W) '$(srcdir)/ttyname_r.c'; fi`
+
lib_a-basename.o: basename.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-basename.o `test -f 'basename.c' || echo '$(srcdir)/'`basename.c
diff -Naur newlib-1.17.0.orig/newlib/libc/unix/ttyname.c newlib-1.17.0/newlib/libc/unix/ttyname.c
--- newlib-1.17.0.orig/newlib/libc/unix/ttyname.c 2008-11-18 23:55:06.000000000 +0100
+++ newlib-1.17.0/newlib/libc/unix/ttyname.c 2009-07-15 09:21:32.000000000 +0200
@@ -28,67 +28,14 @@
* SUCH DAMAGE.
*/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#include "ttyname.h"
+
#include <dirent.h>
#include <unistd.h>
-#include <string.h>
#include <paths.h>
-#include <_syslist.h>
#include <errno.h>
-static char ttyname_buf[sizeof (_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
-
-/*
- * ttyname_r() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
- */
-int
-_DEFUN( ttyname_r,(fd, name, namesize),
- int fd _AND
- char *name _AND
- size_t namesize)
-{
- struct stat sb;
- struct dirent *dirp;
- DIR *dp;
- struct stat dsb;
- char buf[sizeof(ttyname_buf)];
-
- /* Must be a terminal. */
- if (!isatty(fd))
- return ENOTTY;
-
- /* Must be a character device. */
- if (fstat (fd, &sb) || !S_ISCHR (sb.st_mode))
- return ENOTTY;
-
- if ((dp = opendir (_PATH_DEV)) == NULL)
- return EBADF;
-
- strcpy(buf, _PATH_DEV);
- while ((dirp = readdir (dp)) != NULL)
- {
- if (dirp->d_ino != sb.st_ino)
- continue;
- strcpy (buf + sizeof (_PATH_DEV) - 1, dirp->d_name);
- if (stat (buf, &dsb) || sb.st_dev != dsb.st_dev ||
- sb.st_ino != dsb.st_ino)
- continue;
- (void) closedir (dp);
- if(strlen(buf) < namesize) /* < to account for terminating null */
- {
- strcpy(name, buf);
- return 0;
- }
- else
- {
- return ERANGE;
- }
- }
- (void) closedir (dp);
- return EBADF;
-}
+static char ttyname_buf[TTYNAME_BUFSIZE] = _PATH_DEV;
/*
* ttyname() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
diff -Naur newlib-1.17.0.orig/newlib/libc/unix/ttyname.h newlib-1.17.0/newlib/libc/unix/ttyname.h
--- newlib-1.17.0.orig/newlib/libc/unix/ttyname.h 1970-01-01 01:00:00.000000000 +0100
+++ newlib-1.17.0/newlib/libc/unix/ttyname.h 2009-07-15 09:21:32.000000000 +0200
@@ -0,0 +1,6 @@
+/* Common defines for ttyname.c and ttyname_r.c */
+
+#include <dirent.h> /* For MAXNAMLEN */
+#include <paths.h> /* For _PATH_DEV */
+
+#define TTYNAME_BUFSIZE (sizeof (_PATH_DEV) + MAXNAMLEN)
diff -Naur newlib-1.17.0.orig/newlib/libc/unix/ttyname_r.c newlib-1.17.0/newlib/libc/unix/ttyname_r.c
--- newlib-1.17.0.orig/newlib/libc/unix/ttyname_r.c 1970-01-01 01:00:00.000000000 +0100
+++ newlib-1.17.0/newlib/libc/unix/ttyname_r.c 2009-07-15 09:21:32.000000000 +0200
@@ -0,0 +1,93 @@
+#ifndef _NO_TTYNAME
+/*
+ * Copyright (c) 1988 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "ttyname.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <string.h>
+#include <paths.h>
+#include <_syslist.h>
+#include <errno.h>
+
+/*
+ * ttyname_r() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
+ */
+int
+_DEFUN( ttyname_r,(fd, name, namesize),
+ int fd _AND
+ char *name _AND
+ size_t namesize)
+{
+ struct stat sb;
+ struct dirent *dirp;
+ DIR *dp;
+ struct stat dsb;
+ char buf[TTYNAME_BUFSIZE];
+
+ /* Must be a terminal. */
+ if (!isatty(fd))
+ return ENOTTY;
+
+ /* Must be a character device. */
+ if (fstat (fd, &sb) || !S_ISCHR (sb.st_mode))
+ return ENOTTY;
+
+ if ((dp = opendir (_PATH_DEV)) == NULL)
+ return EBADF;
+
+ strcpy(buf, _PATH_DEV);
+ while ((dirp = readdir (dp)) != NULL)
+ {
+ if (dirp->d_ino != sb.st_ino)
+ continue;
+ strcpy (buf + sizeof (_PATH_DEV) - 1, dirp->d_name);
+ if (stat (buf, &dsb) || sb.st_dev != dsb.st_dev ||
+ sb.st_ino != dsb.st_ino)
+ continue;
+ (void) closedir (dp);
+ if(strlen(buf) < namesize) /* < to account for terminating null */
+ {
+ strcpy(name, buf);
+ return 0;
+ }
+ else
+ {
+ return ERANGE;
+ }
+ }
+ (void) closedir (dp);
+ return EBADF;
+}
+
+#endif /* !_NO_TTYNAME */
diff -Naur newlib-1.17.0.orig/newlib/Makefile.am newlib-1.17.0/newlib/Makefile.am
--- newlib-1.17.0.orig/newlib/Makefile.am 2008-01-21 19:29:17.000000000 +0100
+++ newlib-1.17.0/newlib/Makefile.am 2009-07-15 09:21:32.000000000 +0200
@@ -81,7 +81,7 @@
libc.a
endif
-noinst_DATA = stmp-targ-include
+BUILT_SOURCES = stmp-targ-include
toollib_DATA = $(CRT0) $(CRT1)
@@ -186,9 +186,6 @@
$(CRT1_DIR)$(CRT1): ; @true
-
-all-recursive: stmp-targ-include
-
# The targ-include directory just holds the includes files for the
# particular system and machine we have been configured for. It is
# used while building.
diff -Naur newlib-1.17.0.orig/newlib/Makefile.in newlib-1.17.0/newlib/Makefile.in
--- newlib-1.17.0.orig/newlib/Makefile.in 2009-06-29 11:05:19.000000000 +0200
+++ newlib-1.17.0/newlib/Makefile.in 2009-07-15 09:21:32.000000000 +0200
@@ -106,7 +106,7 @@
pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive
toollibDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(noinst_DATA) $(toollib_DATA)
+DATA = $(toollib_DATA)
ETAGS = etags
CTAGS = ctags
DEJATOOL = $(PACKAGE)
@@ -350,7 +350,7 @@
@USE_LIBTOOL_FALSE@toollib_LIBRARIES = libm.a \
@USE_LIBTOOL_FALSE@ libc.a
-noinst_DATA = stmp-targ-include
+BUILT_SOURCES = stmp-targ-include
toollib_DATA = $(CRT0) $(CRT1)
# The functions ldexp, frexp and modf are traditionally supplied in
@@ -409,7 +409,7 @@
# dejagnu support
RUNTESTFLAGS =
-all: newlib.h
+all: $(BUILT_SOURCES) newlib.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
@@ -714,14 +714,16 @@
done
check-am:
$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
-check: check-recursive
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-recursive
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) newlib.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
-install: install-recursive
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
@@ -746,6 +748,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-recursive
clean-am: clean-generic clean-libtool clean-toollibLIBRARIES \
@@ -864,8 +867,6 @@
$(CRT1_DIR)$(CRT1): ; @true
-all-recursive: stmp-targ-include
-
# The targ-include directory just holds the includes files for the
# particular system and machine we have been configured for. It is
# used while building.

1266
contrib/crossrpms/patches/newlib-1.17.0-rtems4.10-20090906.diff
View File

File diff suppressed because it is too large Load Diff

1095
contrib/crossrpms/patches/newlib-1.17.0-rtems4.10-20090909.diff
View File

File diff suppressed because it is too large Load Diff

1103
contrib/crossrpms/patches/newlib-1.17.0-rtems4.10-20090910.diff
View File

File diff suppressed because it is too large Load Diff

1116
contrib/crossrpms/patches/newlib-1.17.0-rtems4.10-20090911.diff
View File

File diff suppressed because it is too large Load Diff

1127
contrib/crossrpms/patches/newlib-1.17.0-rtems4.10-20090916.diff
View File

File diff suppressed because it is too large Load Diff