From 136bfdf1042a3c13a955af62895550651dc65ef9 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Tue, 14 Aug 2007 16:15:23 +0200 Subject: [PATCH] Patches updated to the newer RTEMS version. darcs-hash:20070814141523-ff715-364f586601186ae88937e678fbc273e5a84d05a8.gz --- .../rtems-clone-mrm332-to-mo376.patch | 1085 ++--------------- .../rtems-clone-ss555-to-ec555.patch | 161 ++- .../rtems-m9328-pimx1-uart1to3.patch | 12 +- .../rtems-update-mrm332-to-mo376.patch | 62 +- ...ms-update-ss555-to-ec555-cpld-remove.patch | 20 +- .../rtems-update-ss555-to-ec555.patch | 26 +- 6 files changed, 263 insertions(+), 1103 deletions(-) diff --git a/rtems-patches/rtems-clone-mrm332-to-mo376.patch b/rtems-patches/rtems-clone-mrm332-to-mo376.patch index 404a0e6..3415411 100644 --- a/rtems-patches/rtems-clone-mrm332-to-mo376.patch +++ b/rtems-patches/rtems-clone-mrm332-to-mo376.patch @@ -1,4 +1,4 @@ -Index: rtems-051009/make/custom/mo376.cfg +Index: rtems/make/custom/mo376.cfg =================================================================== --- /dev/null +++ rtems/make/custom/mo376.cfg @@ -71,7 +71,7 @@ Index: rtems-051009/make/custom/mo376.cfg +endif + +# Miscellaneous additions go here -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/console/sci.h +Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.h =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/console/sci.h @@ -307,14 +307,14 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/console/sci.h +#endif + +#endif // _sci_h_ -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM +Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM @@ -0,0 +1,200 @@ +/* linkcmds + * -+ * $Id: linkcmds_ROM,v 1.3 2004/11/26 01:54:51 joel Exp $ ++ * $Id: linkcmds_ROM,v 1.4 2006/02/08 12:25:24 joel Exp $ + */ + +OUTPUT_ARCH(m68k) @@ -377,7 +377,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM + CREATE_OBJECT_SYMBOLS + text_start = .; + _text_start = .; -+ *(.text) ++ *(.text*) + . = ALIGN (16); + + @@ -494,7 +494,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM + _clear_start = .; + *(.shbss) + *(.dynbss) -+ *(.bss .bss.* .gnu.linkonce.b.*) ++ *(.bss* .gnu.linkonce.b.*) + *(COMMON) + . = ALIGN (16); + end = .; @@ -512,7 +512,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM + [ .stabstr ] + } +} -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/except_vect_332_ROM.S +Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/except_vect_332_ROM.S =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/startup/except_vect_332_ROM.S @@ -810,7 +810,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/except_vect_332_ROM.S + state. Trace mode ( and other group 0 + and 1 exceptions) *could* screw this up if + not vectored to reboot or did not return. */ -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/console/console.c +Index: rtems/c/src/lib/libbsp/m68k/mo376/console/console.c =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/console/console.c @@ -991,7 +991,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/console/console.c + + return RTEMS_SUCCESSFUL; +} -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/.cvsignore +Index: rtems/c/src/lib/libbsp/m68k/mo376/.cvsignore =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/.cvsignore @@ -1010,7 +1010,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/.cvsignore +Makefile.in +missing +mkinstalldirs -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/start/start.S +Index: rtems/c/src/lib/libbsp/m68k/mo376/start/start.S =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/start/start.S @@ -1165,7 +1165,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/start/start.S +} + +#endif -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/misc/dotests +Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/dotests =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/misc/dotests @@ -1185,7 +1185,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/misc/dotests +( cd MyTests; for f in *nxe; do m68k-elf-gdb ${f} ++ ++ * startup/linkcmds, startup/linkcmds_ROM: Add sections required by ++ newer gcc versions. ++ ++2006-01-11 Ralf Corsepius ++ ++ * Makefile.am: Add preinstall.am. ++ +2005-05-26 Ralf Corsepius + + * include/bsp.h: New header guard. @@ -1867,7 +1876,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/ChangeLog + timer/.cvsignore, timer/Makefile.am, timer/timer.c, times, + wrapup/.cvsignore, wrapup/Makefile.am: Initial files. + -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/bspclean.c +Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/bspclean.c =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/startup/bspclean.c @@ -1899,7 +1908,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/bspclean.c + _CPU_ISR_Set_level( 7 ); + //_UART_flush(); +} -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/timer/timer.c +Index: rtems/c/src/lib/libbsp/m68k/mo376/timer/timer.c =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/timer/timer.c @@ -1985,7 +1994,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/timer/timer.c +{ + Timer_driver_Find_average_overhead = find_flag; +} -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c +Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c @@ -2118,7 +2127,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c +done: + return RTEMS_SUCCESSFUL; +} -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 +Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 @@ -2139,7 +2148,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 +set $dfc=5 +r +q -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/configure.ac +Index: rtems/c/src/lib/libbsp/m68k/mo376/configure.ac =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/configure.ac @@ -2164,7 +2173,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/configure.ac +# Explicitly list all Makefiles here +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/README +Index: rtems/c/src/lib/libbsp/m68k/mo376/README =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/README @@ -2193,13 +2202,13 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/README + the interrupt priority and (2) to prevent it from blocking. +- add a timer driver for the tmtest set. + -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/Makefile.am +Index: rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am -@@ -0,0 +1,124 @@ +@@ -0,0 +1,68 @@ +## -+## $Id: Makefile.am,v 1.21 2005/01/07 06:54:44 ralf Exp $ ++## $Id: Makefile.am,v 1.24 2006/01/12 10:12:30 ralf Exp $ +## + +ACLOCAL_AMFLAGS = -I ../../../../aclocal @@ -2214,7 +2223,6 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/Makefile.am + +nodist_include_HEADERS = include/bspopts.h +DISTCLEANFILES = include/bspopts.h -+ +noinst_PROGRAMS = + +include_HEADERS += include/mrm332.h @@ -2265,64 +2273,9 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/Makefile.am +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel + -+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) -+ -+PREINSTALL_DIRS = -+PREINSTALL_FILES = -+TMPINSTALL_FILES = -+ -+$(PROJECT_INCLUDE)/$(dirstamp): -+ @$(mkdir_p) $(PROJECT_INCLUDE) -+ @: > $(PROJECT_INCLUDE)/$(dirstamp) -+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) -+ -+$(PROJECT_LIB)/$(dirstamp): -+ @$(mkdir_p) $(PROJECT_LIB) -+ @: > $(PROJECT_LIB)/$(dirstamp) -+PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) -+ -+$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -+PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs -+ -+$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h -+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h -+ -+$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h -+PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h -+ -+$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h -+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h -+ -+$(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mrm332.h -+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.h -+ -+$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h -+PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h -+ -+$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) -+TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) -+ -+$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -+PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds -+ -+$(PROJECT_LIB)/linkcmds_ROM: startup/linkcmds_ROM $(PROJECT_LIB)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds_ROM -+PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds_ROM -+ -+CLEANFILES = $(PREINSTALL_FILES) -+DISTCLEANFILES += $(PREINSTALL_DIRS) -+CLEANFILES += $(TMPINSTALL_FILES) -+ ++include $(srcdir)/preinstall.am +include $(top_srcdir)/../../../../automake/local.am -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/console/sci.c +Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c @@ -3947,7 +3900,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/console/sci.c + + return; +} -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/bspstart.c +Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/bspstart.c =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/startup/bspstart.c @@ -4034,7 +3987,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/bspstart.c + + /* Clock_exit is done as an atexit() function */ +} -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/start_c.c +Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c @@ -4164,7 +4117,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/start_c.c + reboot(); + +} -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/tm27.h +Index: rtems/c/src/lib/libbsp/m68k/mo376/include/tm27.h =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/include/tm27.h @@ -4203,7 +4156,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/tm27.h +#define Lower_tm27_intr() /* empty */ + +#endif -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/times +Index: rtems/c/src/lib/libbsp/m68k/mo376/times =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/times @@ -4403,7 +4356,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/times + rtems_rate_monotonic_delete: inactive 18 + rtems_rate_monotonic_delete: active 20 + rtems_rate_monotonic_period: conclude periods -- caller blocks 53 -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/mrm332.h +Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mrm332.h =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/include/mrm332.h @@ -4478,7 +4431,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/mrm332.h +#endif /* ASM */ + +#endif /* _MRM_H_ */ -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/bspopts.h.in +Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bspopts.h.in =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/include/bspopts.h.in @@ -4499,7 +4452,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/bspopts.h.in + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c +Index: rtems/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c @@ -4609,14 +4562,14 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c + } + } +} -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/linkcmds +Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds @@ -0,0 +1,164 @@ +/* linkcmds + * -+ * $Id: linkcmds,v 1.5 2004/11/26 01:54:51 joel Exp $ ++ * $Id: linkcmds,v 1.6 2006/02/08 12:25:24 joel Exp $ + */ + +OUTPUT_ARCH(m68k) @@ -4675,7 +4628,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/linkcmds + * Text, data and bss segments + */ + .text : { -+ *(.text) ++ *(.text*) + + /* + * C++ constructors/destructors @@ -4766,7 +4719,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/linkcmds + .bss : { + _clear_start = .; + *(.dynbss) -+ *(.bss .bss.* .gnu.linkonce.b.*) ++ *(.bss* .gnu.linkonce.b.*) + *(COMMON) + . = ALIGN (16); + PROVIDE (end = .); @@ -4778,7 +4731,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/linkcmds + _WorkspaceBase = .; + } >ram +} -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/bsp_specs +Index: rtems/c/src/lib/libbsp/m68k/mo376/bsp_specs =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/bsp_specs @@ -4799,7 +4752,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/bsp_specs +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} + -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/.cvsignore +Index: rtems/c/src/lib/libbsp/m68k/mo376/include/.cvsignore =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/include/.cvsignore @@ -4809,910 +4762,80 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/.cvsignore +coverhd.h +stamp-h +stamp-h.in -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/aclocal.m4 +Index: rtems/c/src/lib/libbsp/m68k/mo376/wrapup/.keep =================================================================== --- /dev/null -+++ rtems/c/src/lib/libbsp/m68k/mo376/aclocal.m4 -@@ -0,0 +1,896 @@ -+# generated automatically by aclocal 1.9.5 -*- Autoconf -*- -+ -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005 Free Software Foundation, Inc. -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_AUTOMAKE_VERSION(VERSION) -+# ---------------------------- -+# Automake X.Y traces this macro to ensure aclocal.m4 has been -+# generated from the m4 files accompanying Automake X.Y. -+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) -+ -+# AM_SET_CURRENT_AUTOMAKE_VERSION -+# ------------------------------- -+# Call AM_AUTOMAKE_VERSION so it can be traced. -+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -+ [AM_AUTOMAKE_VERSION([1.9.5])]) -+ -+# AM_AUX_DIR_EXPAND -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -+# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -+# -+# Of course, Automake must honor this variable whenever it calls a -+# tool from the auxiliary directory. The problem is that $srcdir (and -+# therefore $ac_aux_dir as well) can be either absolute or relative, -+# depending on how configure is run. This is pretty annoying, since -+# it makes $ac_aux_dir quite unusable in subdirectories: in the top -+# source directory, any form will work fine, but in subdirectories a -+# relative path needs to be adjusted first. -+# -+# $ac_aux_dir/missing -+# fails when called from a subdirectory if $ac_aux_dir is relative -+# $top_srcdir/$ac_aux_dir/missing -+# fails if $ac_aux_dir is absolute, -+# fails when called from a subdirectory in a VPATH build with -+# a relative $ac_aux_dir -+# -+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -+# are both prefixed by $srcdir. In an in-source build this is usually -+# harmless because $srcdir is `.', but things will broke when you -+# start a VPATH build or use an absolute $srcdir. -+# -+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -+# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -+# and then we would define $MISSING as -+# MISSING="\${SHELL} $am_aux_dir/missing" -+# This will work as long as MISSING is not called from configure, because -+# unfortunately $(top_srcdir) has no meaning in configure. -+# However there are other variables, like CC, which are often used in -+# configure, and could therefore not use this "fixed" $ac_aux_dir. -+# -+# Another solution, used here, is to always expand $ac_aux_dir to an -+# absolute PATH. The drawback is that using absolute paths prevent a -+# configured tree to be moved without reconfiguration. -+ -+AC_DEFUN([AM_AUX_DIR_EXPAND], -+[dnl Rely on autoconf to set up CDPATH properly. -+AC_PREREQ([2.50])dnl -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` -+]) ++++ rtems/c/src/lib/libbsp/m68k/mo376/wrapup/.keep +@@ -0,0 +1 @@ + -+# AM_CONDITIONAL -*- Autoconf -*- +Index: rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am +=================================================================== +--- /dev/null ++++ rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am +@@ -0,0 +1,66 @@ ++## Automatically generated by ampolish3 - Do not edit + -+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 7 -+ -+# AM_CONDITIONAL(NAME, SHELL-CONDITION) -+# ------------------------------------- -+# Define a conditional. -+AC_DEFUN([AM_CONDITIONAL], -+[AC_PREREQ(2.52)dnl -+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -+AC_SUBST([$1_TRUE]) -+AC_SUBST([$1_FALSE]) -+if $2; then -+ $1_TRUE= -+ $1_FALSE='#' -+else -+ $1_TRUE='#' -+ $1_FALSE= -+fi -+AC_CONFIG_COMMANDS_PRE( -+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -+ AC_MSG_ERROR([[conditional "$1" was never defined. -+Usually this means the macro was only invoked conditionally.]]) -+fi])]) -+ -+ -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. ++if AMPOLISH3 ++$(srcdir)/preinstall.am: Makefile.am ++ $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am ++endif + -+# serial 8 ++PREINSTALL_DIRS = ++DISTCLEANFILES += $(PREINSTALL_DIRS) + -+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -+# written in clear, in which case automake, when reading aclocal.m4, -+# will think it sees a *use*, and therefore will trigger all it's -+# C support machinery. Also note that it means that autoscan, seeing -+# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++all-local: $(TMPINSTALL_FILES) + ++TMPINSTALL_FILES = ++CLEANFILES = $(TMPINSTALL_FILES) + -+# _AM_DEPENDENCIES(NAME) -+# ---------------------- -+# See how the compiler implements dependency checking. -+# NAME is "CC", "CXX", "GCJ", or "OBJC". -+# We try a few techniques and use that to set a single cache variable. -+# -+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -+# dependency, and given that the user is not expected to run this macro, -+# just rely on AC_PROG_CC. -+AC_DEFUN([_AM_DEPENDENCIES], -+[AC_REQUIRE([AM_SET_DEPDIR])dnl -+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -+AC_REQUIRE([AM_MAKE_INCLUDE])dnl -+AC_REQUIRE([AM_DEP_TRACK])dnl -+ -+ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -+ [$1], CXX, [depcc="$CXX" am_compiler_list=], -+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -+ [depcc="$$1" am_compiler_list=]) -+ -+AC_CACHE_CHECK([dependency style of $depcc], -+ [am_cv_$1_dependencies_compiler_type], -+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_$1_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_$1_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done -+ -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_$1_dependencies_compiler_type=none -+fi -+]) -+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -+AM_CONDITIONAL([am__fastdep$1], [ -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -+]) -+ -+ -+# AM_SET_DEPDIR -+# ------------- -+# Choose a directory name for dependency files. -+# This macro is AC_REQUIREd in _AM_DEPENDENCIES -+AC_DEFUN([AM_SET_DEPDIR], -+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -+]) -+ -+ -+# AM_DEP_TRACK -+# ------------ -+AC_DEFUN([AM_DEP_TRACK], -+[AC_ARG_ENABLE(dependency-tracking, -+[ --disable-dependency-tracking speeds up one-time build -+ --enable-dependency-tracking do not reject slow dependency extractors]) -+if test "x$enable_dependency_tracking" != xno; then -+ am_depcomp="$ac_aux_dir/depcomp" -+ AMDEPBACKSLASH='\' -+fi -+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -+AC_SUBST([AMDEPBACKSLASH]) -+]) -+ -+# Generate code to set up dependency tracking. -*- Autoconf -*- -+ -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+#serial 3 -+ -+# _AM_OUTPUT_DEPENDENCY_COMMANDS -+# ------------------------------ -+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -+[for mf in $CONFIG_FILES; do -+ # Strip MF so we end up with the name of the file. -+ mf=`echo "$mf" | sed -e 's/:.*$//'` -+ # Check whether this is an Automake generated Makefile or not. -+ # We used to match only the files named `Makefile.in', but -+ # some people rename them; so instead we look at the file content. -+ # Grep'ing the first line is not enough: some people post-process -+ # each Makefile.in and add a new line on top of each file to say so. -+ # So let's grep whole file. -+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -+ dirpart=`AS_DIRNAME("$mf")` -+ else -+ continue -+ fi -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -+ test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -+ # When using ansi2knr, U may be empty or an underscore; expand it -+ U=`sed -n 's/^U = //p' < "$mf"` -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ # Make sure the directory exists. -+ test -f "$dirpart/$file" && continue -+ fdir=`AS_DIRNAME(["$file"])` -+ AS_MKDIR_P([$dirpart/$fdir]) -+ # echo "creating $dirpart/$file" -+ echo '# dummy' > "$dirpart/$file" -+ done -+done -+])# _AM_OUTPUT_DEPENDENCY_COMMANDS -+ -+ -+# AM_OUTPUT_DEPENDENCY_COMMANDS -+# ----------------------------- -+# This macro should only be invoked once -- use via AC_REQUIRE. -+# -+# This code is only required when automatic dependency tracking -+# is enabled. FIXME. This creates each `.P' file that we will -+# need in order to bootstrap the dependency handling code. -+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -+[AC_CONFIG_COMMANDS([depfiles], -+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -+]) -+ -+# Do all the work for Automake. -*- Autoconf -*- -+ -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 12 -+ -+# This macro actually does too much. Some checks are only needed if -+# your package does certain things. But this isn't really a big deal. -+ -+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -+# AM_INIT_AUTOMAKE([OPTIONS]) -+# ----------------------------------------------- -+# The call with PACKAGE and VERSION arguments is the old style -+# call (pre autoconf-2.50), which is being phased out. PACKAGE -+# and VERSION should now be passed to AC_INIT and removed from -+# the call to AM_INIT_AUTOMAKE. -+# We support both call styles for the transition. After -+# the next Automake release, Autoconf can make the AC_INIT -+# arguments mandatory, and then we can depend on a new Autoconf -+# release and drop the old call support. -+AC_DEFUN([AM_INIT_AUTOMAKE], -+[AC_PREREQ([2.58])dnl -+dnl Autoconf wants to disallow AM_ names. We explicitly allow -+dnl the ones we care about. -+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -+AC_REQUIRE([AC_PROG_INSTALL])dnl -+# test to see if srcdir already configured -+if test "`cd $srcdir && pwd`" != "`pwd`" && -+ test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+fi -+ -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' -+ else -+ CYGPATH_W=echo -+ fi -+fi -+AC_SUBST([CYGPATH_W]) -+ -+# Define the identity of the package. -+dnl Distinguish between old-style and new-style calls. -+m4_ifval([$2], -+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -+ AC_SUBST([PACKAGE], [$1])dnl -+ AC_SUBST([VERSION], [$2])], -+[_AM_SET_OPTIONS([$1])dnl -+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -+ -+_AM_IF_OPTION([no-define],, -+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -+ -+# Some tools Automake needs. -+AC_REQUIRE([AM_SANITY_CHECK])dnl -+AC_REQUIRE([AC_ARG_PROGRAM])dnl -+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -+AM_MISSING_PROG(AUTOCONF, autoconf) -+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -+AM_MISSING_PROG(AUTOHEADER, autoheader) -+AM_MISSING_PROG(MAKEINFO, makeinfo) -+AM_PROG_INSTALL_SH -+AM_PROG_INSTALL_STRIP -+AC_REQUIRE([AM_PROG_MKDIR_P])dnl -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+AC_REQUIRE([AC_PROG_AWK])dnl -+AC_REQUIRE([AC_PROG_MAKE_SET])dnl -+AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], -+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], -+ [_AM_PROG_TAR([v7])])]) -+_AM_IF_OPTION([no-dependencies],, -+[AC_PROVIDE_IFELSE([AC_PROG_CC], -+ [_AM_DEPENDENCIES(CC)], -+ [define([AC_PROG_CC], -+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [_AM_DEPENDENCIES(CXX)], -+ [define([AC_PROG_CXX], -+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -+]) -+]) -+ -+ -+# When config.status generates a header, we must update the stamp-h file. -+# This file resides in the same directory as the config header -+# that is generated. The stamp files are numbered to have different names. -+ -+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -+# loop where config.status creates the headers, so we can generate -+# our stamp files there. -+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -+[# Compute $1's index in $config_headers. -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $1 | $1:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; -+ esac -+done -+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+ -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_PROG_INSTALL_SH -+# ------------------ -+# Define $install_sh. -+AC_DEFUN([AM_PROG_INSTALL_SH], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+install_sh=${install_sh-"$am_aux_dir/install-sh"} -+AC_SUBST(install_sh)]) -+ -+# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 2 -+ -+# Check whether the underlying file-system supports filenames -+# with a leading dot. For instance MS-DOS doesn't. -+AC_DEFUN([AM_SET_LEADING_DOT], -+[rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. -+else -+ am__leading_dot=_ -+fi -+rmdir .tst 2>/dev/null -+AC_SUBST([am__leading_dot])]) ++all-am: $(PREINSTALL_FILES) + -+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -+# From Jim Meyering ++PREINSTALL_FILES = ++CLEANFILES += $(PREINSTALL_FILES) + -+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 4 -+ -+AC_DEFUN([AM_MAINTAINER_MODE], -+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -+ dnl maintainer-mode is disabled by default -+ AC_ARG_ENABLE(maintainer-mode, -+[ --enable-maintainer-mode enable make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer], -+ USE_MAINTAINER_MODE=$enableval, -+ USE_MAINTAINER_MODE=no) -+ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) -+ MAINT=$MAINTAINER_MODE_TRUE -+ AC_SUBST(MAINT)dnl -+] -+) ++$(PROJECT_LIB)/$(dirstamp): ++ @$(mkdir_p) $(PROJECT_LIB) ++ @: > $(PROJECT_LIB)/$(dirstamp) ++PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) + -+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++$(PROJECT_INCLUDE)/$(dirstamp): ++ @$(mkdir_p) $(PROJECT_INCLUDE) ++ @: > $(PROJECT_INCLUDE)/$(dirstamp) ++PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) + -+# Check to see how 'make' treats includes. -*- Autoconf -*- ++$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs ++PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs + -+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 3 -+ -+# AM_MAKE_INCLUDE() -+# ----------------- -+# Check to see how make treats includes. -+AC_DEFUN([AM_MAKE_INCLUDE], -+[am_make=${MAKE-make} -+cat > confinc << 'END' -+am__doit: -+ @echo done -+.PHONY: am__doit -+END -+# If we don't find an include directive, just comment out the code. -+AC_MSG_CHECKING([for style of include used by $am_make]) -+am__include="#" -+am__quote= -+_am_result=none -+# First try GNU make style include. -+echo "include confinc" > confmf -+# We grep out `Entering directory' and `Leaving directory' -+# messages which can occur if `w' ends up in MAKEFLAGS. -+# In particular we don't look at `^make:' because GNU make might -+# be invoked under some other name (usually "gmake"), in which -+# case it prints its new name instead of `make'. -+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -+ am__include=include -+ am__quote= -+ _am_result=GNU -+fi -+# Now try BSD make style include. -+if test "$am__include" = "#"; then -+ echo '.include "confinc"' > confmf -+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -+ am__include=.include -+ am__quote="\"" -+ _am_result=BSD -+ fi -+fi -+AC_SUBST([am__include]) -+AC_SUBST([am__quote]) -+AC_MSG_RESULT([$_am_result]) -+rm -f confinc confmf -+]) -+ -+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -+ -+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 4 -+ -+# AM_MISSING_PROG(NAME, PROGRAM) -+# ------------------------------ -+AC_DEFUN([AM_MISSING_PROG], -+[AC_REQUIRE([AM_MISSING_HAS_RUN]) -+$1=${$1-"${am_missing_run}$2"} -+AC_SUBST($1)]) -+ -+ -+# AM_MISSING_HAS_RUN -+# ------------------ -+# Define MISSING if not defined so far and test if it supports --run. -+# If it does, set am_missing_run to use it, otherwise, to nothing. -+AC_DEFUN([AM_MISSING_HAS_RUN], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -+# Use eval to expand $SHELL -+if eval "$MISSING --run true"; then -+ am_missing_run="$MISSING --run " -+else -+ am_missing_run= -+ AC_MSG_WARN([`missing' script is too old or missing]) -+fi -+]) ++$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h ++PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h + -+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. ++$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h ++PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h + -+# AM_PROG_MKDIR_P -+# --------------- -+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -+# -+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -+# created by `make install' are always world readable, even if the -+# installer happens to have an overly restrictive umask (e.g. 077). -+# This was a mistake. There are at least two reasons why we must not -+# use `-m 0755': -+# - it causes special bits like SGID to be ignored, -+# - it may be too restrictive (some setups expect 775 directories). -+# -+# Do not use -m 0755 and let people choose whatever they expect by -+# setting umask. -+# -+# We cannot accept any implementation of `mkdir' that recognizes `-p'. -+# Some implementations (such as Solaris 8's) are not thread-safe: if a -+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -+# concurrently, both version can detect that a/ is missing, but only -+# one can create it and the other will error out. Consequently we -+# restrict ourselves to GNU make (using the --version option ensures -+# this.) -+AC_DEFUN([AM_PROG_MKDIR_P], -+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then -+ # We used to keeping the `.' as first argument, in order to -+ # allow $(mkdir_p) to be used without argument. As in -+ # $(mkdir_p) $(somedir) -+ # where $(somedir) is conditionally defined. However this is wrong -+ # for two reasons: -+ # 1. if the package is installed by a user who cannot write `.' -+ # make install will fail, -+ # 2. the above comment should most certainly read -+ # $(mkdir_p) $(DESTDIR)$(somedir) -+ # so it does not work when $(somedir) is undefined and -+ # $(DESTDIR) is not. -+ # To support the latter case, we have to write -+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), -+ # so the `.' trick is pointless. -+ mkdir_p='mkdir -p --' -+else -+ # On NextStep and OpenStep, the `mkdir' command does not -+ # recognize any option. It will interpret all options as -+ # directories to create, and then abort because `.' already -+ # exists. -+ for d in ./-p ./--version; -+ do -+ test -d $d && rmdir $d -+ done -+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. -+ if test -f "$ac_aux_dir/mkinstalldirs"; then -+ mkdir_p='$(mkinstalldirs)' -+ else -+ mkdir_p='$(install_sh) -d' -+ fi -+fi -+AC_SUBST([mkdir_p])]) ++$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h ++PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h + -+# Helper functions for option handling. -*- Autoconf -*- ++$(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mrm332.h ++PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.h + -+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 3 -+ -+# _AM_MANGLE_OPTION(NAME) -+# ----------------------- -+AC_DEFUN([_AM_MANGLE_OPTION], -+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -+ -+# _AM_SET_OPTION(NAME) -+# ------------------------------ -+# Set option NAME. Presently that only means defining a flag for this option. -+AC_DEFUN([_AM_SET_OPTION], -+[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -+ -+# _AM_SET_OPTIONS(OPTIONS) -+# ---------------------------------- -+# OPTIONS is a space-separated list of Automake options. -+AC_DEFUN([_AM_SET_OPTIONS], -+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -+ -+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -+# ------------------------------------------- -+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -+AC_DEFUN([_AM_IF_OPTION], -+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -+ -+# Check to make sure that the build environment is sane. -*- Autoconf -*- -+ -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 4 -+ -+# AM_SANITY_CHECK -+# --------------- -+AC_DEFUN([AM_SANITY_CHECK], -+[AC_MSG_CHECKING([whether build environment is sane]) -+# Just in case -+sleep 1 -+echo timestamp > conftest.file -+# Do `set' in a subshell so we don't clobber the current shell's -+# arguments. Must try -L first in case configure is actually a -+# symlink; some systems play weird games with the mod time of symlinks -+# (eg FreeBSD returns the mod time of the symlink's containing -+# directory). -+if ( -+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -+ if test "$[*]" = "X"; then -+ # -L didn't work. -+ set X `ls -t $srcdir/configure conftest.file` -+ fi -+ rm -f conftest.file -+ if test "$[*]" != "X $srcdir/configure conftest.file" \ -+ && test "$[*]" != "X conftest.file $srcdir/configure"; then -+ -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -+alias in your environment]) -+ fi -+ -+ test "$[2]" = conftest.file -+ ) -+then -+ # Ok. -+ : -+else -+ AC_MSG_ERROR([newly created file is older than distributed files! -+Check your system clock]) -+fi -+AC_MSG_RESULT(yes)]) ++$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h ++PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h + -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# AM_PROG_INSTALL_STRIP -+# --------------------- -+# One issue with vendor `install' (even GNU) is that you can't -+# specify the program used to strip binaries. This is especially -+# annoying in cross-compiling environments, where the build's strip -+# is unlikely to handle the host's binaries. -+# Fortunately install-sh will honor a STRIPPROG variable, so we -+# always use install-sh in `make install-strip', and initialize -+# STRIPPROG with the value of the STRIP variable (set by the user). -+AC_DEFUN([AM_PROG_INSTALL_STRIP], -+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right -+# tool to use in cross-compilation environments, therefore Automake -+# will honor the `STRIP' environment variable to overrule this program. -+dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -+if test "$cross_compiling" != no; then -+ AC_CHECK_TOOL([STRIP], [strip], :) -+fi -+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -+AC_SUBST([INSTALL_STRIP_PROGRAM])]) -+ -+# Check how to create a tarball. -*- Autoconf -*- -+ -+# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. ++$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) ++TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) + -+# serial 2 ++$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds ++PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds + -+# _AM_PROG_TAR(FORMAT) -+# -------------------- -+# Check how to create a tarball in format FORMAT. -+# FORMAT should be one of `v7', `ustar', or `pax'. -+# -+# Substitute a variable $(am__tar) that is a command -+# writing to stdout a FORMAT-tarball containing the directory -+# $tardir. -+# tardir=directory && $(am__tar) > result.tar -+# -+# Substitute a variable $(am__untar) that extract such -+# a tarball read from stdin. -+# $(am__untar) < result.tar -+AC_DEFUN([_AM_PROG_TAR], -+[# Always define AMTAR for backward compatibility. -+AM_MISSING_PROG([AMTAR], [tar]) -+m4_if([$1], [v7], -+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -+ [m4_case([$1], [ustar],, [pax],, -+ [m4_fatal([Unknown tar format])]) -+AC_MSG_CHECKING([how to create a $1 tar archive]) -+# Loop over all known methods to create a tar archive until one works. -+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -+_am_tools=${am_cv_prog_tar_$1-$_am_tools} -+# Do not fold the above two line into one, because Tru64 sh and -+# Solaris sh will not grok spaces in the rhs of `-'. -+for _am_tool in $_am_tools -+do -+ case $_am_tool in -+ gnutar) -+ for _am_tar in tar gnutar gtar; -+ do -+ AM_RUN_LOG([$_am_tar --version]) && break -+ done -+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -+ am__untar="$_am_tar -xf -" -+ ;; -+ plaintar) -+ # Must skip GNU tar: if it does not support --format= it doesn't create -+ # ustar tarball either. -+ (tar --version) >/dev/null 2>&1 && continue -+ am__tar='tar chf - "$$tardir"' -+ am__tar_='tar chf - "$tardir"' -+ am__untar='tar xf -' -+ ;; -+ pax) -+ am__tar='pax -L -x $1 -w "$$tardir"' -+ am__tar_='pax -L -x $1 -w "$tardir"' -+ am__untar='pax -r' -+ ;; -+ cpio) -+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -+ am__untar='cpio -i -H $1 -d' -+ ;; -+ none) -+ am__tar=false -+ am__tar_=false -+ am__untar=false -+ ;; -+ esac -+ -+ # If the value was cached, stop now. We just wanted to have am__tar -+ # and am__untar set. -+ test -n "${am_cv_prog_tar_$1}" && break -+ -+ # tar/untar a dummy directory, and stop if the command works -+ rm -rf conftest.dir -+ mkdir conftest.dir -+ echo GrepMe > conftest.dir/file -+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -+ rm -rf conftest.dir -+ if test -s conftest.tar; then -+ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break -+ fi -+done -+rm -rf conftest.dir -+ -+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -+AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -+AC_SUBST([am__tar]) -+AC_SUBST([am__untar]) -+]) # _AM_PROG_TAR -+ -+m4_include([../../../../aclocal/bsp-configure.m4]) -+m4_include([../../../../aclocal/canonical-target-name.m4]) -+m4_include([../../../../aclocal/canonicalize-tools.m4]) -+m4_include([../../../../aclocal/check-custom-bsp.m4]) -+m4_include([../../../../aclocal/check-multiprocessing.m4]) -+m4_include([../../../../aclocal/check-tool.m4]) -+m4_include([../../../../aclocal/enable-multiprocessing.m4]) -+m4_include([../../../../aclocal/env-rtemsbsp.m4]) -+m4_include([../../../../aclocal/gcc-isystem.m4]) -+m4_include([../../../../aclocal/gcc-pipe.m4]) -+m4_include([../../../../aclocal/gcc-specs.m4]) -+m4_include([../../../../aclocal/multilib.m4]) -+m4_include([../../../../aclocal/prog-cc.m4]) -+m4_include([../../../../aclocal/prog-ccas.m4]) -+m4_include([../../../../aclocal/project-root.m4]) -+m4_include([../../../../aclocal/rtems-top.m4]) -+m4_include([../../../../aclocal/version.m4]) -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/wrapup/.keep -=================================================================== ---- /dev/null -+++ rtems/c/src/lib/libbsp/m68k/mo376/wrapup/.keep -@@ -0,0 +1 @@ ++$(PROJECT_LIB)/linkcmds_ROM: startup/linkcmds_ROM $(PROJECT_LIB)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds_ROM ++PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds_ROM + diff --git a/rtems-patches/rtems-clone-ss555-to-ec555.patch b/rtems-patches/rtems-clone-ss555-to-ec555.patch index 17194c3..313d71c 100644 --- a/rtems-patches/rtems-clone-ss555-to-ec555.patch +++ b/rtems-patches/rtems-clone-ss555-to-ec555.patch @@ -21,7 +21,29 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/ChangeLog =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/powerpc/ec555/ChangeLog -@@ -0,0 +1,97 @@ +@@ -0,0 +1,119 @@ ++2006-03-08 Joel Sherrill ++ ++ * startup/linkcmds: Add .gnu.linkonce.b.* section. ++ ++2006-02-08 Joel Sherrill ++ ++ * startup/linkcmds: Add sections required by newer gcc versions. ++ ++2006-01-11 Ralf Corsepius ++ ++ * configure.ac: Remove explicit ampolish3 support (now in ++ RTEMS_BSP_CONFIGURE). ++ ++2006-01-10 Ralf Corsepius ++ ++ * configure.ac: Add ampolish3 support. ++ * Makefile.am: Add preinstall.am. ++ ++2006-01-09 Ralf Corsepius ++ ++ * Makefile.am: Don't include subdirs.am. ++ +2005-05-26 Ralf Corsepius + + * include/bsp.h: New header guard. @@ -123,9 +145,9 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/Makefile.am =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/powerpc/ec555/Makefile.am -@@ -0,0 +1,116 @@ +@@ -0,0 +1,65 @@ +## -+## $Id: Makefile.am,v 1.6 2005/02/12 03:31:07 ralf Exp $ ++## $Id: Makefile.am,v 1.10 2006/01/12 10:12:30 ralf Exp $ +## + +ACLOCAL_AMFLAGS = -I ../../../../aclocal @@ -187,58 +209,7 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/Makefile.am + ../../../libcpu/@RTEMS_CPU@/mpc5xx/timer.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc5xx/vectors.rel + -+all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) -+ -+PREINSTALL_DIRS = -+PREINSTALL_FILES = -+ -+$(PROJECT_INCLUDE)/$(dirstamp): -+ @$(mkdir_p) $(PROJECT_INCLUDE) -+ @: > $(PROJECT_INCLUDE)/$(dirstamp) -+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) -+ -+$(PROJECT_LIB)/$(dirstamp): -+ @$(mkdir_p) $(PROJECT_LIB) -+ @: > $(PROJECT_LIB)/$(dirstamp) -+PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) -+ -+$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs -+PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs -+ -+$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h -+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h -+ -+$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h -+PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h -+ -+$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h -+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h -+ -+$(PROJECT_INCLUDE)/bsp/$(dirstamp): -+ @$(mkdir_p) $(PROJECT_INCLUDE)/bsp -+ @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) -+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) -+ -+$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h -+PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h -+ -+$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h -+ -+$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds -+PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds -+ -+CLEANFILES = $(PREINSTALL_FILES) -+DISTCLEANFILES += $(PREINSTALL_DIRS) -+ -+include $(top_srcdir)/../../../../automake/subdirs.am ++include $(srcdir)/preinstall.am +include $(top_srcdir)/../../../../automake/local.am Index: rtems/c/src/lib/libbsp/powerpc/ec555/README =================================================================== @@ -613,7 +584,7 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/configure.ac @@ -0,0 +1,52 @@ +## Process this file with autoconf to produce a configure script. +## -+## $Id: configure.ac,v 1.5 2005/02/16 10:13:09 ralf Exp $ ++## $Id: configure.ac,v 1.7 2006/01/11 04:52:39 ralf Exp $ + +AC_PREREQ(2.59) +AC_INIT([rtems-c-src-lib-libbsp-powerpc-mbx5xx],[_RTEMS_VERSION],[rtems-bugs@rtems.com]) @@ -1769,7 +1740,7 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds -@@ -0,0 +1,320 @@ +@@ -0,0 +1,319 @@ +/* + * Linker command file for Intec SS555 board + * @@ -1789,7 +1760,7 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds + * RTEMS_DEBUG symbol is defined in the bsp_specs file whenever make(1) is + * invoked with VARIANT=DEBUG. + * -+ * $Id: linkcmds,v 1.1 2004/04/12 21:52:13 joel Exp $ ++ * $Id: linkcmds,v 1.3 2006/03/08 18:50:12 joel Exp $ + */ + +OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc") @@ -1823,9 +1794,8 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds + *(.entry2) + + /* Actual code */ -+ *(.text) -+ *(.text.*) -+ ++ *(.text*) ++ + /* C++ constructors/destructors */ + *(.gnu.linkonce.t*) + @@ -1930,7 +1900,7 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds + *(.data1) + + PROVIDE (__SDATA_START__ = .); -+ *(.sdata) ++ *(.sdata*) + *(.gnu.linkonce.d*) + *(.gnu.linkonce.s.*) + PROVIDE (__SDATA_END__ = .); @@ -1979,10 +1949,10 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds + PROVIDE (__SBSS2_END__ = .); + + PROVIDE (__SBSS_START__ = .); -+ *(.sbss) ++ *(.sbss*) + PROVIDE (__SBSS_END__ = .); + -+ *(.bss) ++ *(.bss .bss* .gnu.linkonce.b*) + *(COMMON) + + . = ALIGN(4); @@ -2788,3 +2758,66 @@ Index: rtems/make/custom/ec555.cfg +# Override default start file +START_BASE= + +Index: rtems/c/src/lib/libbsp/powerpc/ec555/preinstall.am +=================================================================== +--- /dev/null ++++ rtems/c/src/lib/libbsp/powerpc/ec555/preinstall.am +@@ -0,0 +1,58 @@ ++## Automatically generated by ampolish3 - Do not edit ++ ++if AMPOLISH3 ++$(srcdir)/preinstall.am: Makefile.am ++ $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am ++endif ++ ++PREINSTALL_DIRS = ++DISTCLEANFILES += $(PREINSTALL_DIRS) ++ ++all-am: $(PREINSTALL_FILES) ++ ++PREINSTALL_FILES = ++CLEANFILES = $(PREINSTALL_FILES) ++ ++$(PROJECT_LIB)/$(dirstamp): ++ @$(mkdir_p) $(PROJECT_LIB) ++ @: > $(PROJECT_LIB)/$(dirstamp) ++PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) ++ ++$(PROJECT_INCLUDE)/$(dirstamp): ++ @$(mkdir_p) $(PROJECT_INCLUDE) ++ @: > $(PROJECT_INCLUDE)/$(dirstamp) ++PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) ++ ++$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs ++PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs ++ ++$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h ++PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h ++ ++$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h ++PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h ++ ++$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h ++PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h ++ ++$(PROJECT_INCLUDE)/bsp/$(dirstamp): ++ @$(mkdir_p) $(PROJECT_INCLUDE)/bsp ++ @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) ++PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) ++ ++$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h ++PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h ++ ++$(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h ++PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h ++ ++$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds ++PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds ++ diff --git a/rtems-patches/rtems-m9328-pimx1-uart1to3.patch b/rtems-patches/rtems-m9328-pimx1-uart1to3.patch index 963ed36..81c72d7 100644 --- a/rtems-patches/rtems-m9328-pimx1-uart1to3.patch +++ b/rtems-patches/rtems-m9328-pimx1-uart1to3.patch @@ -1,7 +1,7 @@ -Index: rtems-060602/c/src/lib/libbsp/arm/csb336/console/uart.c +Index: rtems/c/src/lib/libbsp/arm/csb336/console/uart.c =================================================================== ---- rtems-060602.orig/c/src/lib/libbsp/arm/csb336/console/uart.c -+++ rtems-060602/c/src/lib/libbsp/arm/csb336/console/uart.c +--- rtems.orig/c/src/lib/libbsp/arm/csb336/console/uart.c ++++ rtems/c/src/lib/libbsp/arm/csb336/console/uart.c @@ -24,6 +24,13 @@ /* Define this to use interrupt driver UART driver */ #define USE_INTERRUPTS 1 @@ -58,10 +58,10 @@ Index: rtems-060602/c/src/lib/libbsp/arm/csb336/console/uart.c if (minor == 0) { #if defined(USE_INTERRUPTS) imx_uart_tx_isr_data[minor].name = BSP_INT_UART1_TX; -Index: rtems-060602/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h +Index: rtems/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h =================================================================== ---- rtems-060602.orig/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h -+++ rtems-060602/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h +--- rtems.orig/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h ++++ rtems/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h @@ -31,6 +31,7 @@ #define MC9328MXL_LCDC_BASE 0x00205000 #define MC9328MXL_UART1_BASE 0x00206000 diff --git a/rtems-patches/rtems-update-mrm332-to-mo376.patch b/rtems-patches/rtems-update-mrm332-to-mo376.patch index 9ca710e..330d95b 100644 --- a/rtems-patches/rtems-update-mrm332-to-mo376.patch +++ b/rtems-patches/rtems-update-mrm332-to-mo376.patch @@ -1,4 +1,4 @@ -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/start/start.S +Index: rtems/c/src/lib/libbsp/m68k/mo376/start/start.S =================================================================== --- rtems.orig/c/src/lib/libbsp/m68k/mo376/start/start.S +++ rtems/c/src/lib/libbsp/m68k/mo376/start/start.S @@ -11,7 +11,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/start/start.S #include #include -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/bsp.h +Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h =================================================================== --- rtems.orig/c/src/lib/libbsp/m68k/mo376/include/bsp.h +++ rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h @@ -24,11 +24,11 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/bsp.h #include #include -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/ChangeLog +Index: rtems/c/src/lib/libbsp/m68k/mo376/ChangeLog =================================================================== --- rtems.orig/c/src/lib/libbsp/m68k/mo376/ChangeLog +++ rtems/c/src/lib/libbsp/m68k/mo376/ChangeLog -@@ -2,6 +2,11 @@ +@@ -11,6 +11,11 @@ * include/bsp.h: New header guard. @@ -40,7 +40,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/ChangeLog 2005-01-07 Ralf Corsepius * Makefile.am: Eliminate CFLAGS_OPTIMIZE_V. -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c +Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c =================================================================== --- rtems.orig/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c +++ rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c @@ -53,7 +53,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c #define CLOCK_VECTOR MRM_PIV -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/configure.ac +Index: rtems/c/src/lib/libbsp/m68k/mo376/configure.ac =================================================================== --- rtems.orig/c/src/lib/libbsp/m68k/mo376/configure.ac +++ rtems/c/src/lib/libbsp/m68k/mo376/configure.ac @@ -66,7 +66,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/configure.ac AC_CONFIG_SRCDIR([bsp_specs]) RTEMS_TOP(../../../../../..) -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/README +Index: rtems/c/src/lib/libbsp/m68k/mo376/README =================================================================== --- rtems.orig/c/src/lib/libbsp/m68k/mo376/README +++ rtems/c/src/lib/libbsp/m68k/mo376/README @@ -107,12 +107,12 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/README - the interrupt priority and (2) to prevent it from blocking. -- add a timer driver for the tmtest set. -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/Makefile.am +Index: rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am =================================================================== --- rtems.orig/c/src/lib/libbsp/m68k/mo376/Makefile.am +++ rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am -@@ -17,7 +17,7 @@ DISTCLEANFILES = include/bspopts.h - +@@ -16,7 +16,7 @@ nodist_include_HEADERS = include/bspopts + DISTCLEANFILES = include/bspopts.h noinst_PROGRAMS = -include_HEADERS += include/mrm332.h @@ -120,20 +120,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/Makefile.am nodist_include_HEADERS += ../../shared/include/coverhd.h EXTRA_DIST = times -@@ -97,9 +97,9 @@ $(PROJECT_INCLUDE)/bspopts.h: include/bs - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h - PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h - --$(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp) -- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mrm332.h --PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.h -+$(PROJECT_INCLUDE)/mo376.h: include/mo376.h $(PROJECT_INCLUDE)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mo376.h -+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mo376.h - - $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/console/sci.c +Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c =================================================================== --- rtems.orig/c/src/lib/libbsp/m68k/mo376/console/sci.c +++ rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c @@ -155,7 +142,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/console/sci.c value = ( (uint16_t) ( SYS_CLOCK / rate / 32.0 + 0.5 ) & 0x1fff ); -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/start_c.c +Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c =================================================================== --- rtems.orig/c/src/lib/libbsp/m68k/mo376/startup/start_c.c +++ rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c @@ -168,7 +155,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/startup/start_c.c #include #define __START_C__ #include "bsp.h" -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/times +Index: rtems/c/src/lib/libbsp/m68k/mo376/times =================================================================== --- rtems.orig/c/src/lib/libbsp/m68k/mo376/times +++ rtems/c/src/lib/libbsp/m68k/mo376/times @@ -191,7 +178,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/times Memory Configuration: SRAM, DRAM, cache, etc Wait States: -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/mo376.h +Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h =================================================================== --- /dev/null +++ rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h @@ -266,7 +253,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/mo376.h +#endif /* ASM */ + +#endif /* _MRM_H_ */ -Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/mrm332.h +Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mrm332.h =================================================================== --- rtems.orig/c/src/lib/libbsp/m68k/mo376/include/mrm332.h +++ /dev/null @@ -341,7 +328,7 @@ Index: rtems-051009/c/src/lib/libbsp/m68k/mo376/include/mrm332.h -#endif /* ASM */ - -#endif /* _MRM_H_ */ -Index: rtems-051009/make/custom/mo376.cfg +Index: rtems/make/custom/mo376.cfg =================================================================== --- rtems.orig/make/custom/mo376.cfg +++ rtems/make/custom/mo376.cfg @@ -373,3 +360,20 @@ Index: rtems-051009/make/custom/mo376.cfg # This is a good way to get debug information. The output file is large # though and greatly slows the build process so only do this if needed. +Index: rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am +=================================================================== +--- rtems.orig/c/src/lib/libbsp/m68k/mo376/preinstall.am ++++ rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am +@@ -44,9 +44,9 @@ $(PROJECT_INCLUDE)/bspopts.h: include/bs + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h + PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h + +-$(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp) +- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mrm332.h +-PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.h ++$(PROJECT_INCLUDE)/mo376.h: include/mo376.h $(PROJECT_INCLUDE)/$(dirstamp) ++ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mo376.h ++PREINSTALL_FILES += $(PROJECT_INCLUDE)/mo376.h + + $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h diff --git a/rtems-patches/rtems-update-ss555-to-ec555-cpld-remove.patch b/rtems-patches/rtems-update-ss555-to-ec555-cpld-remove.patch index ddaf132..b63ef48 100644 --- a/rtems-patches/rtems-update-ss555-to-ec555-cpld-remove.patch +++ b/rtems-patches/rtems-update-ss555-to-ec555-cpld-remove.patch @@ -1,7 +1,7 @@ -Index: rtems-051009/c/src/lib/libbsp/powerpc/ec555/include/bsp.h +Index: rtems/c/src/lib/libbsp/powerpc/ec555/include/bsp.h =================================================================== ---- rtems-051009.orig/c/src/lib/libbsp/powerpc/ec555/include/bsp.h -+++ rtems-051009/c/src/lib/libbsp/powerpc/ec555/include/bsp.h +--- rtems/c/src/lib/libbsp/powerpc/ec555/include/bsp.h ++++ rtems/c/src/lib/libbsp/powerpc/ec555/include/bsp.h @@ -44,37 +44,6 @@ extern "C" { #define BSP_CRYSTAL_HZ 4000000 /* crystal frequency, Hz */ #define BSP_CLOCK_HZ 40000000 /* CPU clock frequency, Hz @@ -40,10 +40,10 @@ Index: rtems-051009/c/src/lib/libbsp/powerpc/ec555/include/bsp.h /* miscellaneous stuff assumed to exist */ extern rtems_configuration_table BSP_Configuration; -Index: rtems-051009/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c +Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c =================================================================== ---- rtems-051009.orig/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c -+++ rtems-051009/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c +--- rtems/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c ++++ rtems/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c @@ -96,6 +96,8 @@ void _InitSS555 (void) */ extern char int_ram_top[]; /* top of internal ram */ @@ -63,11 +63,11 @@ Index: rtems-051009/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c /* * Disable show cycles and serialization so that burst accesses will work * properly. A different value, such as 0x0, may be more appropriate for -Index: rtems-051009/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds +Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds =================================================================== ---- rtems-051009.orig/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds -+++ rtems-051009/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds -@@ -269,14 +269,6 @@ SECTIONS +--- rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds ++++ rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds +@@ -268,14 +268,6 @@ SECTIONS sram = .; } diff --git a/rtems-patches/rtems-update-ss555-to-ec555.patch b/rtems-patches/rtems-update-ss555-to-ec555.patch index 806de81..258809c 100644 --- a/rtems-patches/rtems-update-ss555-to-ec555.patch +++ b/rtems-patches/rtems-update-ss555-to-ec555.patch @@ -1,19 +1,19 @@ -Index: rtems-051009/c/src/lib/libbsp/powerpc/ec555/ChangeLog +Index: rtems/c/src/lib/libbsp/powerpc/ec555/ChangeLog =================================================================== ---- rtems.orig/c/src/lib/libbsp/powerpc/ec555/ChangeLog +--- rtems/c/src/lib/libbsp/powerpc/ec555/ChangeLog +++ rtems/c/src/lib/libbsp/powerpc/ec555/ChangeLog @@ -1,3 +1,8 @@ -+2005-10-30 Pavel Pisa ++2006-06-02 Pavel Pisa + + * EC555 BSP for Wuerz-elektronik EC555 board started -+ as clone of SS555 BSP. ++ as clone of SS555 BSP. + - 2005-05-26 Ralf Corsepius + 2006-03-08 Joel Sherrill - * include/bsp.h: New header guard. -Index: rtems-051009/c/src/lib/libbsp/powerpc/ec555/README + * startup/linkcmds: Add .gnu.linkonce.b.* section. +Index: rtems/c/src/lib/libbsp/powerpc/ec555/README =================================================================== ---- rtems.orig/c/src/lib/libbsp/powerpc/ec555/README +--- rtems/c/src/lib/libbsp/powerpc/ec555/README +++ rtems/c/src/lib/libbsp/powerpc/ec555/README @@ -2,9 +2,9 @@ # $Id: README,v 1.1 2004/04/12 21:52:13 joel Exp $ @@ -83,12 +83,12 @@ Index: rtems-051009/c/src/lib/libbsp/powerpc/ec555/README All tests run cleanly, except for tm26, which gives a "PANIC 12" after it exits. This doesn't seem to cause a problem otherwise. -Index: rtems-051009/c/src/lib/libbsp/powerpc/ec555/configure.ac +Index: rtems/c/src/lib/libbsp/powerpc/ec555/configure.ac =================================================================== ---- rtems.orig/c/src/lib/libbsp/powerpc/ec555/configure.ac +--- rtems/c/src/lib/libbsp/powerpc/ec555/configure.ac +++ rtems/c/src/lib/libbsp/powerpc/ec555/configure.ac @@ -3,7 +3,7 @@ - ## $Id: configure.ac,v 1.5 2005/02/16 10:13:09 ralf Exp $ + ## $Id: configure.ac,v 1.7 2006/01/11 04:52:39 ralf Exp $ AC_PREREQ(2.59) -AC_INIT([rtems-c-src-lib-libbsp-powerpc-mbx5xx],[_RTEMS_VERSION],[rtems-bugs@rtems.com]) @@ -96,9 +96,9 @@ Index: rtems-051009/c/src/lib/libbsp/powerpc/ec555/configure.ac AC_CONFIG_SRCDIR([bsp_specs]) RTEMS_TOP(../../../../../..) -Index: rtems-051009/make/custom/ec555.cfg +Index: rtems/make/custom/ec555.cfg =================================================================== ---- rtems.orig/make/custom/ec555.cfg +--- rtems/make/custom/ec555.cfg +++ rtems/make/custom/ec555.cfg @@ -1,5 +1,5 @@ # -- 2.39.2