Ada getting started is gone.

* setup.def, common/cpright.texi: Update dates.

ChangeLog

@@ -1,3 +1,7 @@
+2010-12-16	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	* SUPPORT: Update address.
+
 2008-10-01	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	PR 1324/bsps

Makefile.maint

@@ -61,8 +61,8 @@ rtems-$(rtems_version)$(TAG_SUFFIX).tar.bz2: rtems-$(rtems_version)/stamp.autofi
 	    doc/itron3.0/itron.texi doc/networking/networking.texi \
 	    doc/new_chapters/new_chapters.texi doc/porting/porting.texi \
 	    doc/posix1003.1/posix1003_1.texi doc/posix_users/posix_users.texi \
-	    doc/relnotes/relnotes.texi doc/started_ada/started_ada.texi \
-	    doc/started/started.texi doc/user/c_user.texi
+	    doc/relnotes/relnotes.texi doc/started/started.texi \
+	    doc/user/c_user.texi
 	tar -cj -X rtems-$(rtems_version)/excludes \
 	  -f rtems-$(rtems_version)$(TAG_SUFFIX).tar.bz2 rtems-$(rtems_version)
 

SUPPORT

@@ -8,12 +8,12 @@ includes porting RTEMS to new processors and the development of custom board
 support packages and device drivers.   In addition, OAR is available
 to assist in the development of your real-time embedded application.
 
-For more information, email Mark Johannes at mark.johannes@OARcorp.com 
+For more information, email Joel Sherrill joel.sherrill@OARcorp.com 
 or contact OAR at:
 
 On-Line Applications Research Corporation
-4910-L Corporate Drive
-Huntsville AL 35805
+7047 Old Madison Pike Suite 320
+Huntsville AL 35806
 Voice: (205) 722-9985
 Fax:   (205 722-0985
 

VERSION

@@ -4,4 +4,4 @@
 #  $Id$
 #
 
-RTEMS Version 4.9.3
+RTEMS Version 4.9.5

aclocal/version.m4

@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.9.3]))
+m4_define([_RTEMS_VERSION],[4.9.5]))
 
 m4_define([RTEMS_API],[4.9])

c/src/aclocal/version.m4

@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.9.3]))
+m4_define([_RTEMS_VERSION],[4.9.5]))
 
 m4_define([RTEMS_API],[4.9])

c/src/lib/libbsp/i386/pc386/ChangeLog

@@ -1,3 +1,14 @@
+2010-11-23	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	* Makefile.am, preinstall.am: Add <bsp/tty_drv.h> to the set of
+	installed .h files.
+
+2010-03-10	Gedare Bloom <gedare@gwu.edu>
+
+	PR 1495/bsp
+	* clock/ckinit.c: Calling rtems_clock_get_uptime() in a tight loop
+	sometimes showed time moving backwards.
+
 2009-09-15	Till Straumann <strauman@slac.stanford.edu>
 
 	PR 1344/bsps:

c/src/lib/libbsp/i386/pc386/Makefile.am

@@ -26,7 +26,7 @@ SUBDIRS = . tools
 
 include_bspdir = $(includedir)/bsp
 include_bsp_HEADERS = ../../i386/shared/irq/irq.h \
-    ../../i386/shared/irq/irq_asm.h
+    ../../i386/shared/irq/irq_asm.h ../../i386/shared/comm/tty_drv.h
 
 include_HEADERS += include/crt.h
 nodist_include_HEADERS += ../../shared/include/coverhd.h

c/src/lib/libbsp/i386/pc386/clock/ckinit.c

@@ -47,6 +47,11 @@ uint64_t pc586_tsc_at_tick;
 /* this driver may need to count ISRs per tick */
 #define CLOCK_DRIVER_ISRS_PER_TICK pc386_isrs_per_tick
 
+/* if so, the driver may use the count in Clock_driver_support_at_tick */
+#ifdef CLOCK_DRIVER_ISRS_PER_TICK
+extern volatile uint32_t Clock_driver_isrs;
+#endif
+
 #define READ_8254( _lsb, _msb )                               \
   do { outport_byte(TIMER_MODE, TIMER_SEL0|TIMER_LATCH);      \
      inport_byte(TIMER_CNTR0, _lsb);                          \
@@ -66,7 +71,18 @@ uint32_t (*Clock_driver_nanoseconds_since_last_tick)(void) = NULL;
  */
 void Clock_driver_support_at_tick_tsc(void)
 {
+#ifdef CLOCK_DRIVER_ISRS_PER_TICK
+  /*
+   *  The driver is multiple ISRs per clock tick.
+  */
+  if (!Clock_driver_isrs)
+    pc586_tsc_at_tick = rdtsc();
+#else
+  /*
+   *  The driver is one ISR per clock tick.
+   */
   pc586_tsc_at_tick = rdtsc();
+#endif
 }
 
 void Clock_driver_support_at_tick_empty(void)

c/src/lib/libbsp/i386/pc386/preinstall.am

@@ -57,6 +57,10 @@ $(PROJECT_INCLUDE)/bsp/irq_asm.h: ../../i386/shared/irq/irq_asm.h $(PROJECT_INCL
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_asm.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_asm.h
 
+$(PROJECT_INCLUDE)/bsp/tty_drv.h: ../../i386/shared/comm/tty_drv.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tty_drv.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tty_drv.h
+
 $(PROJECT_INCLUDE)/crt.h: include/crt.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/crt.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/crt.h

c/src/lib/libbsp/powerpc/ChangeLog

@@ -1,3 +1,16 @@
+2010-08-25	Till Straumann <strauman@slac.stanford.edu>
+
+	PR 1689/bsps
+	* shared/flash/intelFlash.c: Scale erase timeout by actual
+	system clock rate rather than assuming a fixed value.
+
+2010-02-01	Till Straumann <strauman@slac.stanford.edu>
+
+	PR 1492/bsps
+	* shared/startup/sbrk.c: When BSP_sbrk_policy had the value (-1)
+	(-> give all memory to the heap initially) then the computation
+	of the remaining heap size was wrong.
+
 2009-03-12	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	PR 1385/cpukit

c/src/lib/libbsp/powerpc/gen5200/ChangeLog

@@ -1,3 +1,9 @@
+2010-03-10	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	PR 1497/bsps
+	* startup/bspclean.c: Do not enable interrupts while waiting for board
+	to reset.
+
 2008-12-08	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* bsp_specs: Backport from CVS-HEAD.

c/src/lib/libbsp/powerpc/gen5200/startup/bspclean.c

@@ -45,9 +45,9 @@ void bsp_cleanup( void )
     /*
      * Now reset the CPU
      */
-    _ISR_Set_level( 0 );
-
     mpc5200.gpt[0].count_in = 0xf;
     mpc5200.gpt[0].emsel = 0x9004;
+
+    while(1) ;
   #endif 
 }

c/src/lib/libbsp/powerpc/shared/flash/intelFlash.c

@@ -56,16 +56,20 @@
  */ 
 #ifdef TESTING
 
-#define TIMEOUT_US	100000
-#define rtems_task_wake_after(args...) do {} while (0)
+#define TIMEOUT_US       100000
+#define rtems_task_wake_after(t) sleep(t)
+#define CLOCKRATE_GET(p) (*(p)=1)
 
 #else
 
 #include <rtems.h>
-#define TIMEOUT_US			1000
+#define TIMEOUT_US       1000
+#define CLOCKRATE_GET(p) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, p )
 
 #endif
 
+#define ERASE_TIMEOUT_S 2
+
 #include <stdio.h>
 #include <inttypes.h>
 #include <stdlib.h>
@@ -321,14 +325,19 @@ uint32_t sta;
 STATIC int
 flash_erase_block_intel(struct bankdesc *b, uint32_t addr)
 {
-uint32_t sta;
-int i;
+uint32_t       sta;
+int            i;
+rtems_interval p;
+
 	if ( (sta = flash_check_ready_intel(b, addr)) )
 		return sta;
 
 	(void)BSP_flashReadRaw(F_CMD_WR_ERA, addr);
 	(void)BSP_flashReadRaw(F_CMD_WR_CMD, addr);
-	i = 50;
+
+	CLOCKRATE_GET( &p );
+	i = p * ERASE_TIMEOUT_S;
+
 	while ( STA_RDYRDY != (STA_RDYRDY & (sta = BSP_flashReadRaw(F_CMD_RD_STA, addr))) && --i > 0 ) {
 		rtems_task_wake_after(1);
 	}

c/src/lib/libbsp/powerpc/shared/startup/sbrk.c

@@ -89,9 +89,10 @@ uint32_t
 _bsp_sbrk_init(uint32_t         heap_start, uint32_t         *heap_size_p)
 {
   uint32_t         rval=0;
+  uint32_t         orig_size;
 
   remaining_start =  heap_start;
-  remaining_size  = *heap_size_p;
+  orig_size = remaining_size  = *heap_size_p;
 
   if (remaining_start < LIMIT_32M &&
       remaining_start + remaining_size > LIMIT_32M) {
@@ -105,7 +106,8 @@ _bsp_sbrk_init(uint32_t         heap_start, uint32_t         *heap_size_p)
   if ( 0 != &BSP_sbrk_policy ) {
   	switch ( BSP_sbrk_policy ) {
 		case (uint32_t)(-1):
-			remaining_start  = heap_start + *heap_size_p;
+			remaining_start  = heap_start + orig_size;
+			*heap_size_p     = orig_size;
 			remaining_size   = 0;
 			/* return a nonzero sbrk_amount because the libsupport code
 			 * at some point divides by this number prior to trying an

c/src/lib/libcpu/ChangeLog

@@ -1,3 +1,8 @@
+2010-06-03	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
+
+	* m68k/mcf5282/include/mcf5282.h: backport from V1.5 of
+	corrections for indexing multiple identical resources
+
 2008-08-31	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* arm/at91rm9200/timer/timer.c, arm/lpc22xx/timer/timer.c,

c/src/lib/libcpu/m68k/ChangeLog

@@ -1,3 +1,7 @@
+2010-03-16      Eric Norum <wenorum@lbl.gov>
+
+	* mcf5282/include/mcf5282.h: Fix hex constants.
+
 2009-09-10	Till Straumann <strauman@slac.stanford.edu>
 
 	PR 1438/bsps

c/src/lib/libcpu/m68k/mcf5282/include/mcf5282.h

@@ -277,9 +277,9 @@ extern uint8 __IPSBAR[];
 #define MCF5282_SCM_MPR_MPR(x)				(((x)&0x0F))
 
 #define MCF5282_SCM_PACR_LOCK1				(0x80)
-#define MCF5282_SCM_PACR_ACCESSCTRL1		(((x)&0x07)<<4)
+#define MCF5282_SCM_PACR_ACCESSCTRL1(x)		(((x)&0x07)<<4)
 #define MCF5282_SCM_PACR_LOCK0				(0x08)
-#define MCF5282_SCM_PACR_ACCESSCTRL0		(((x)&0x07))
+#define MCF5282_SCM_PACR_ACCESSCTRL0(x)		(((x)&0x07))
 #define MCF5282_SCM_PACR_RW_NA				(0x0)
 #define MCF5282_SCM_PACR_R_NA				(0x1)
 #define MCF5282_SCM_PACR_R_R				(0x2)
@@ -288,7 +288,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_SCM_PACR_NA_NA				(0x7)
 
 #define MCF5282_SCM_GPACR_LOCK				(0x80)
-#define MCF5282_SCM_GPACR_ACCESSCTRL		(((x)&0x0F))
+#define MCF5282_SCM_GPACR_ACCESSCTRL(x)		(((x)&0x0F))
 #define MCF5282_SCM_GPACR_ACCESSCTRL_RW_NA		(0x0)
 #define MCF5282_SCM_GPACR_ACCESSCTRL_R_NA		(0x1)
 #define MCF5282_SCM_GPACR_ACCESSCTRL_R_R		(0x2)
@@ -396,9 +396,9 @@ extern uint8 __IPSBAR[];
 #define MCF5282_CS6_CSMR	(*(vuint32 *)(&__IPSBAR[0x00CC]))
 #define MCF5282_CS6_CSCR	(*(vuint16 *)(&__IPSBAR[0x00D2]))
 
-#define MCF5282_CS_CSAR(x)	(*(vuint16 *)(&__IPSBAR[0x0080+(x*0x0C)]))
-#define MCF5282_CS_CSMR(x)	(*(vuint32 *)(&__IPSBAR[0x0084+(x*0x0C)]))
-#define MCF5282_CS_CSCR(x)	(*(vuint16 *)(&__IPSBAR[0x008A+(x*0x0C)]))
+#define MCF5282_CS_CSAR(x)	(*(vuint16 *)(&__IPSBAR[0x0080+((x)*0x0C)]))
+#define MCF5282_CS_CSMR(x)	(*(vuint32 *)(&__IPSBAR[0x0084+((x)*0x0C)]))
+#define MCF5282_CS_CSCR(x)	(*(vuint16 *)(&__IPSBAR[0x008A+((x)*0x0C)]))
 
 /* Bit level definitions and macros */
 #define MCF5282_CS_CSAR_BA(a)				(uint16)(((a)&0xFFFF0000)>>16)
@@ -471,11 +471,11 @@ extern uint8 __IPSBAR[];
 #define MCF5282_DMA3_BCR		(*(vuint32  *)(&__IPSBAR[0x01CC]))
 #define MCF5282_DMA3_DSR		(*(vuint8   *)(&__IPSBAR[0x01D0]))
 
-#define MCF5282_DMA_SAR(x)		(*(vuint32  *)(&__IPSBAR[0x0100+(x*0x40)]))		
-#define MCF5282_DMA_DAR(x)		(*(vuint32  *)(&__IPSBAR[0x0104+(x*0x40)]))		
-#define MCF5282_DMA_DCR(x)		(*(vuint32  *)(&__IPSBAR[0x0108+(x*0x40)]))		
-#define MCF5282_DMA_BCR(x)		(*(vuint32  *)(&__IPSBAR[0x010C+(x*0x40)]))		
-#define MCF5282_DMA_DSR(x)		(*(vuint8   *)(&__IPSBAR[0x0110+(x*0x40)]))		
+#define MCF5282_DMA_SAR(x)		(*(vuint32  *)(&__IPSBAR[0x0100+((x)*0x40)]))		
+#define MCF5282_DMA_DAR(x)		(*(vuint32  *)(&__IPSBAR[0x0104+((x)*0x40)]))		
+#define MCF5282_DMA_DCR(x)		(*(vuint32  *)(&__IPSBAR[0x0108+((x)*0x40)]))		
+#define MCF5282_DMA_BCR(x)		(*(vuint32  *)(&__IPSBAR[0x010C+((x)*0x40)]))		
+#define MCF5282_DMA_DSR(x)		(*(vuint8   *)(&__IPSBAR[0x0110+((x)*0x40)]))		
 
 /* Bit level definitions and macros */
 #define MCF5282_DMA_DCR_INT					(0x80000000)
@@ -564,21 +564,21 @@ extern uint8 __IPSBAR[];
 #define MCF5282_UART2_UOP1		(*(vuint8  *)(&__IPSBAR[0x02B8]))
 #define MCF5282_UART2_UOP0		(*(vuint8  *)(&__IPSBAR[0x02BC]))
 
-#define MCF5282_UART_UMR(x)		(*(vuint8  *)(&__IPSBAR[0x0200+(x*0x40)]))
-#define MCF5282_UART_USR(x)		(*(vuint8  *)(&__IPSBAR[0x0204+(x*0x40)]))
-#define MCF5282_UART_UCSR(x)	(*(vuint8  *)(&__IPSBAR[0x0204+(x*0x40)]))
-#define MCF5282_UART_UCR(x)		(*(vuint8  *)(&__IPSBAR[0x0208+(x*0x40)]))
-#define MCF5282_UART_URB(x)		(*(vuint8  *)(&__IPSBAR[0x20C+(x*0x40)]))
-#define MCF5282_UART_UTB(x)		(*(vuint8  *)(&__IPSBAR[0x020C+(x*0x40)]))
-#define MCF5282_UART_UIPCR(x)	(*(vuint8  *)(&__IPSBAR[0x0210+(x*0x40)]))
-#define MCF5282_UART_UACR(x)	(*(vuint8  *)(&__IPSBAR[0x0210+(x*0x40)]))
-#define MCF5282_UART_UISR(x)	(*(vuint8  *)(&__IPSBAR[0x0214+(x*0x40)]))
-#define MCF5282_UART_UIMR(x)	(*(vuint8  *)(&__IPSBAR[0x0214+(x*0x40)]))
-#define MCF5282_UART_UBG1(x)	(*(vuint8  *)(&__IPSBAR[0x0218+(x*0x40)]))
-#define MCF5282_UART_UBG2(x)	(*(vuint8  *)(&__IPSBAR[0x021C+(x*0x40)]))
-#define MCF5282_UART_UIP(x)		(*(vuint8  *)(&__IPSBAR[0x0234+(x*0x40)]))
-#define MCF5282_UART_UOP1(x)	(*(vuint8  *)(&__IPSBAR[0x0238+(x*0x40)]))
-#define MCF5282_UART_UOP0(x)	(*(vuint8  *)(&__IPSBAR[0x023C+(x*0x40)]))
+#define MCF5282_UART_UMR(x)		(*(vuint8  *)(&__IPSBAR[0x0200+((x)*0x40)]))
+#define MCF5282_UART_USR(x)		(*(vuint8  *)(&__IPSBAR[0x0204+((x)*0x40)]))
+#define MCF5282_UART_UCSR(x)	(*(vuint8  *)(&__IPSBAR[0x0204+((x)*0x40)]))
+#define MCF5282_UART_UCR(x)		(*(vuint8  *)(&__IPSBAR[0x0208+((x)*0x40)]))
+#define MCF5282_UART_URB(x)		(*(vuint8  *)(&__IPSBAR[0x020C+((x)*0x40)]))
+#define MCF5282_UART_UTB(x)		(*(vuint8  *)(&__IPSBAR[0x020C+((x)*0x40)]))
+#define MCF5282_UART_UIPCR(x)	(*(vuint8  *)(&__IPSBAR[0x0210+((x)*0x40)]))
+#define MCF5282_UART_UACR(x)	(*(vuint8  *)(&__IPSBAR[0x0210+((x)*0x40)]))
+#define MCF5282_UART_UISR(x)	(*(vuint8  *)(&__IPSBAR[0x0214+((x)*0x40)]))
+#define MCF5282_UART_UIMR(x)	(*(vuint8  *)(&__IPSBAR[0x0214+((x)*0x40)]))
+#define MCF5282_UART_UBG1(x)	(*(vuint8  *)(&__IPSBAR[0x0218+((x)*0x40)]))
+#define MCF5282_UART_UBG2(x)	(*(vuint8  *)(&__IPSBAR[0x021C+((x)*0x40)]))
+#define MCF5282_UART_UIP(x)		(*(vuint8  *)(&__IPSBAR[0x0234+((x)*0x40)]))
+#define MCF5282_UART_UOP1(x)	(*(vuint8  *)(&__IPSBAR[0x0238+((x)*0x40)]))
+#define MCF5282_UART_UOP0(x)	(*(vuint8  *)(&__IPSBAR[0x023C+((x)*0x40)]))
 
 /* Bit level definitions and macros */
 #define MCF5282_UART_UMR1_RXRTS				(0x80)
@@ -754,7 +754,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_QSPI_QCR_BITSE				(0x4000)
 #define MCF5282_QSPI_QCR_DT					(0x2000)
 #define MCF5282_QSPI_QCR_DSCK				(0x1000)
-#define MCF5282_QSPI_QCR_CS					(((x)&0x000F)<<8)
+#define MCF5282_QSPI_QCR_CS(x)				(((x)&0x000F)<<8)
 
 /*********************************************************************
 *
@@ -791,12 +791,12 @@ extern uint8 __IPSBAR[];
 #define MCF5282_TIMER3_DTCR		(*(vuint32 *)(&__IPSBAR[0x04C8]))
 #define MCF5282_TIMER3_DTCN		(*(vuint32 *)(&__IPSBAR[0x04CC]))
 
-#define MCF5282_TIMER_DTMR(x)	(*(vuint16 *)(&__IPSBAR[0x0400+(x*0x40)]))
-#define MCF5282_TIMER_DTXMR(x)	(*(vuint8  *)(&__IPSBAR[0x0402+(x*0x40)])) 
-#define MCF5282_TIMER_DTER(x)	(*(vuint8  *)(&__IPSBAR[0x0403+(x*0x40)]))
-#define MCF5282_TIMER_DTRR(x)	(*(vuint32 *)(&__IPSBAR[0x0404+(x*0x40)]))
-#define MCF5282_TIMER_DTCR(x)	(*(vuint32 *)(&__IPSBAR[0x0408+(x*0x40)]))
-#define MCF5282_TIMER_DTCN(x)	(*(vuint32 *)(&__IPSBAR[0x040C+(x*0x40)]))
+#define MCF5282_TIMER_DTMR(x)	(*(vuint16 *)(&__IPSBAR[0x0400+((x)*0x40)]))
+#define MCF5282_TIMER_DTXMR(x)	(*(vuint8  *)(&__IPSBAR[0x0402+((x)*0x40)])) 
+#define MCF5282_TIMER_DTER(x)	(*(vuint8  *)(&__IPSBAR[0x0403+((x)*0x40)]))
+#define MCF5282_TIMER_DTRR(x)	(*(vuint32 *)(&__IPSBAR[0x0404+((x)*0x40)]))
+#define MCF5282_TIMER_DTCR(x)	(*(vuint32 *)(&__IPSBAR[0x0408+((x)*0x40)]))
+#define MCF5282_TIMER_DTCN(x)	(*(vuint32 *)(&__IPSBAR[0x040C+((x)*0x40)]))
 
 /* Bit level definitions and macros */
 #define MCF5282_TIMER_DTMR_PS(a)			(((a)&0x00FF)<<8)
@@ -1487,7 +1487,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_GPIO_PORTx2					(0x04)
 #define MCF5282_GPIO_PORTx1					(0x02)
 #define MCF5282_GPIO_PORTx0					(0x01)
-#define MCF5282_GPIO_PORTx(x)				(0x01<<x)
+#define MCF5282_GPIO_PORTx(x)				(0x01<<(x))
 
 #define MCF5282_GPIO_DDRx7					(0x80)
 #define MCF5282_GPIO_DDRx6					(0x40)
@@ -1497,7 +1497,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_GPIO_DDRx2					(0x04)
 #define MCF5282_GPIO_DDRx1					(0x02)
 #define MCF5282_GPIO_DDRx0					(0x01)
-#define MCF5282_GPIO_DDRx(x)				(0x01<<x)
+#define MCF5282_GPIO_DDRx(x)				(0x01<<(x))
 
 #define MCF5282_GPIO_PORTxP7				(0x80)
 #define MCF5282_GPIO_PORTxP6				(0x40)
@@ -1507,7 +1507,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_GPIO_PORTxP2				(0x04)
 #define MCF5282_GPIO_PORTxP1				(0x02)
 #define MCF5282_GPIO_PORTxP0				(0x01)
-#define MCF5282_GPIO_PORTxP(x)				(0x01<<x)
+#define MCF5282_GPIO_PORTxP(x)				(0x01<<(x))
 
 #define MCF5282_GPIO_SETx7					(0x80)
 #define MCF5282_GPIO_SETx6					(0x40)
@@ -1517,7 +1517,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_GPIO_SETx2					(0x04)
 #define MCF5282_GPIO_SETx1					(0x02)
 #define MCF5282_GPIO_SETx0					(0x01)
-#define MCF5282_GPIO_SETx(x)				(0x01<<x)
+#define MCF5282_GPIO_SETx(x)				(0x01<<(x))
 
 #define MCF5282_GPIO_CLRx7					(0x80)
 #define MCF5282_GPIO_CLRx6					(0x40)
@@ -1527,7 +1527,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_GPIO_CLRx2					(0x04)
 #define MCF5282_GPIO_CLRx1					(0x02)
 #define MCF5282_GPIO_CLRx0					(0x01)
-#define MCF5282_GPIO_CLRx(x)				(0x01<<x)
+#define MCF5282_GPIO_CLRx(x)				(0x01<<(x))
 
 #define MCF5282_GPIO_PBCDPAR_PBPA			(0x80)
 #define MCF5282_GPIO_PBCDPAR_PCDPA			(0x40)
@@ -1553,7 +1553,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_GPIO_PJPAR_PJPA2			(0x04)
 #define MCF5282_GPIO_PJPAR_PJPA1			(0x02)
 #define MCF5282_GPIO_PJPAR_PJPA0			(0x01)
-#define MCF5282_GPIO_PJPAR_PJPA(x)			(0x01<<x)
+#define MCF5282_GPIO_PJPAR_PJPA(x)			(0x01<<(x))
 
 #define MCF5282_GPIO_PSDPAR_PSDPA			(0x80)
 
@@ -1574,7 +1574,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_GPIO_PQSPAR_PQSPA2			(0x04)
 #define MCF5282_GPIO_PQSPAR_PQSPA1			(0x02)
 #define MCF5282_GPIO_PQSPAR_PQSPA0			(0x01)
-#define MCF5282_GPIO_PQSPAR_PQSPA(x)		(0x01<<x)
+#define MCF5282_GPIO_PQSPAR_PQSPA(x)		(0x01<<(x))
 
 #define MCF5282_GPIO_PTCPAR_PTCPA3(x)		(((x)&0x3)<<6)
 #define MCF5282_GPIO_PTCPAR_PTCPA2(x)		(((x)&0x3)<<4)
@@ -1736,7 +1736,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_EPORT_EPDDR_EPDD3			(0x08)
 #define MCF5282_EPORT_EPDDR_EPDD2			(0x04)
 #define MCF5282_EPORT_EPDDR_EPDD1			(0x02)
-#define MCF5282_EPORT_EPDDR_EPDD(x)			(0x01<<x)
+#define MCF5282_EPORT_EPDDR_EPDD(x)			(0x01<<(x))
 
 #define MCF5282_EPORT_EPIER_EPIE7			(0x80)
 #define MCF5282_EPORT_EPIER_EPIE6			(0x40)
@@ -1745,7 +1745,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_EPORT_EPIER_EPIE3			(0x08)
 #define MCF5282_EPORT_EPIER_EPIE2			(0x04)
 #define MCF5282_EPORT_EPIER_EPIE1			(0x02)
-#define MCF5282_EPORT_EPIER_EPIE(x)			(0x01<<x)
+#define MCF5282_EPORT_EPIER_EPIE(x)			(0x01<<(x))
 
 #define MCF5282_EPORT_EPDR_EPD7				(0x80)
 #define MCF5282_EPORT_EPDR_EPD6				(0x40)
@@ -1754,7 +1754,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_EPORT_EPDR_EPD3				(0x08)
 #define MCF5282_EPORT_EPDR_EPD2				(0x04)
 #define MCF5282_EPORT_EPDR_EPD1				(0x02)
-#define MCF5282_EPORT_EPDR_EPD(x)			(0x01<<x)
+#define MCF5282_EPORT_EPDR_EPD(x)			(0x01<<(x))
 
 #define MCF5282_EPORT_EPPDR_EPPD7			(0x80)
 #define MCF5282_EPORT_EPPDR_EPPD6			(0x40)
@@ -1763,7 +1763,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_EPORT_EPPDR_EPPD3			(0x08)
 #define MCF5282_EPORT_EPPDR_EPPD2			(0x04)
 #define MCF5282_EPORT_EPPDR_EPPD1			(0x02)
-#define MCF5282_EPORT_EPPDR_EPPD(x)			(0x01<<x)
+#define MCF5282_EPORT_EPPDR_EPPD(x)			(0x01<<(x))
 
 #define MCF5282_EPORT_EPFR_EPF7				(0x80)
 #define MCF5282_EPORT_EPFR_EPF6				(0x40)
@@ -1772,7 +1772,7 @@ extern uint8 __IPSBAR[];
 #define MCF5282_EPORT_EPFR_EPF3				(0x08)
 #define MCF5282_EPORT_EPFR_EPF2				(0x04)
 #define MCF5282_EPORT_EPFR_EPF1				(0x02)
-#define MCF5282_EPORT_EPFR_EPF(x)			(0x01<<x)
+#define MCF5282_EPORT_EPFR_EPF(x)			(0x01<<(x))
 
 /*********************************************************************
 *
@@ -1818,9 +1818,9 @@ extern uint8 __IPSBAR[];
 #define MCF5282_PIT3_PMR		(*(vuint16 *)(&__IPSBAR[0x180002]))
 #define MCF5282_PIT3_PCNTR		(*(vuint16 *)(&__IPSBAR[0x180004]))
 
-#define MCF5282_PIT_PCSR(x)		(*(vuint16 *)(&__IPSBAR[0x150000+(0x1000*x)]))
-#define MCF5282_PIT_PMR(x)		(*(vuint16 *)(&__IPSBAR[0x150002+(0x1000*x)]))
-#define MCF5282_PIT_PCNTR(x)	(*(vuint16 *)(&__IPSBAR[0x150004+(0x1000*x)]))
+#define MCF5282_PIT_PCSR(x)		(*(vuint16 *)(&__IPSBAR[0x150000+(0x1000*(x))]))
+#define MCF5282_PIT_PMR(x)		(*(vuint16 *)(&__IPSBAR[0x150002+(0x1000*(x))]))
+#define MCF5282_PIT_PCNTR(x)	(*(vuint16 *)(&__IPSBAR[0x150004+(0x1000*(x))]))
 
 /* Bit level definitions and macros */
 #define MCF5282_PIT_PCSR_PRE(x)				(((x)&0x000F)<<8)
@@ -1849,10 +1849,10 @@ extern uint8 __IPSBAR[];
 #define MCF5282_QADC_QACR2		(*(vuint16 *)(&__IPSBAR[0x19000E]))
 #define MCF5282_QADC_QASR0		(*(vuint16 *)(&__IPSBAR[0x190010]))
 #define MCF5282_QADC_QASR1		(*(vuint16 *)(&__IPSBAR[0x190012]))
-#define MCF5282_QADC_CCW(x)		(*(vuint16 *)(&__IPSBAR[0x190200+(x*2)]))
-#define MCF5282_QADC_RJURR(x)	(*(vuint16 *)(&__IPSBAR[0x190280+(x*2)]))
-#define MCF5282_QADC_LJSRR(x)	(*(vuint16 *)(&__IPSBAR[0x190300+(x*2)]))
-#define MCF5282_QADC_LJURR(x)	(*(vuint16 *)(&__IPSBAR[0x190380+(x*2)]))
+#define MCF5282_QADC_CCW(x)		(*(vuint16 *)(&__IPSBAR[0x190200+((x)*2)]))
+#define MCF5282_QADC_RJURR(x)	(*(vuint16 *)(&__IPSBAR[0x190280+((x)*2)]))
+#define MCF5282_QADC_LJSRR(x)	(*(vuint16 *)(&__IPSBAR[0x190300+((x)*2)]))
+#define MCF5282_QADC_LJURR(x)	(*(vuint16 *)(&__IPSBAR[0x190380+((x)*2)]))
 
 /* Bit level definitions and macros */
 #define MCF5282_QADC_QADCMCR_QSTOP			(0x8000)
@@ -2250,24 +2250,24 @@ extern uint8 __IPSBAR[];
 #define MCF5282_FLEXCAN_MBUF15_BYTE6	(*(vuint8  *)(&__IPSBAR[0x1C017C]))
 #define MCF5282_FLEXCAN_MBUF15_BYTE7	(*(vuint8  *)(&__IPSBAR[0x1C017D]))
 
-#define MCF5282_FLEXCAN_MBUF0_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0086+x)]))
-#define MCF5282_FLEXCAN_MBUF1_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0096+x)]))
-#define MCF5282_FLEXCAN_MBUF2_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C00A6+x)]))
-#define MCF5282_FLEXCAN_MBUF3_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C00B6+x)]))
-#define MCF5282_FLEXCAN_MBUF4_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C00C6+x)]))
-#define MCF5282_FLEXCAN_MBUF5_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C00D6+x)]))
-#define MCF5282_FLEXCAN_MBUF6_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C00E6+x)]))
-#define MCF5282_FLEXCAN_MBUF7_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C00F6+x)]))
-#define MCF5282_FLEXCAN_MBUF8_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0106+x)]))
-#define MCF5282_FLEXCAN_MBUF9_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0116+x)]))
-#define MCF5282_FLEXCAN_MBUF10_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0126+x)]))
-#define MCF5282_FLEXCAN_MBUF11_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0136+x)]))
-#define MCF5282_FLEXCAN_MBUF12_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0146+x)]))
-#define MCF5282_FLEXCAN_MBUF13_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0156+x)]))
-#define MCF5282_FLEXCAN_MBUF14_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0166+x)]))
-#define MCF5282_FLEXCAN_MBUF15_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0176+x)]))
+#define MCF5282_FLEXCAN_MBUF0_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0086+(x))]))
+#define MCF5282_FLEXCAN_MBUF1_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0096+(x))]))
+#define MCF5282_FLEXCAN_MBUF2_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C00A6+(x))]))
+#define MCF5282_FLEXCAN_MBUF3_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C00B6+(x))]))
+#define MCF5282_FLEXCAN_MBUF4_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C00C6+(x))]))
+#define MCF5282_FLEXCAN_MBUF5_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C00D6+(x))]))
+#define MCF5282_FLEXCAN_MBUF6_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C00E6+(x))]))
+#define MCF5282_FLEXCAN_MBUF7_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C00F6+(x))]))
+#define MCF5282_FLEXCAN_MBUF8_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0106+(x))]))
+#define MCF5282_FLEXCAN_MBUF9_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0116+(x))]))
+#define MCF5282_FLEXCAN_MBUF10_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0126+(x))]))
+#define MCF5282_FLEXCAN_MBUF11_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0136+(x))]))
+#define MCF5282_FLEXCAN_MBUF12_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0146+(x))]))
+#define MCF5282_FLEXCAN_MBUF13_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0156+(x))]))
+#define MCF5282_FLEXCAN_MBUF14_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0166+(x))]))
+#define MCF5282_FLEXCAN_MBUF15_BYTE(x)	(*(vuint8  *)(&__IPSBAR[(0x1C0176+(x))]))
 
-#define MCF5282_FLEXCAN_MBUF_BYTE(x,y)	(*(vuint8  *)(&__IPSBAR[((0x1C0086+(0x10*x)+y)]))
+#define MCF5282_FLEXCAN_MBUF_BYTE(x,y)	(*(vuint8  *)(&__IPSBAR[((0x1C0086+(0x10*(x))+(y))]))
 
 /* Bit level definitions and macros */
 #define MCF5282_FLEXCAN_CANMCR_STOP			(0x8000)

contrib/crossrpms/autotools/Makefile.am

@@ -8,6 +8,6 @@ AUTOCONF_VERS = 2.62
 AUTOCONF_RPMREL = 4
 include ./autoconf.am
 
-AUTOMAKE_VERS = 1.10.1
-AUTOMAKE_RPMREL = 4
+AUTOMAKE_VERS = 1.10.3
+AUTOMAKE_RPMREL = 1
 include ./automake.am

contrib/crossrpms/autotools/rtems-4.9-automake.spec

@@ -45,8 +45,8 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define rpmvers 1.10.1
-%define srcvers	1.10.1
+%define rpmvers 1.10.3
+%define srcvers	1.10.3
 %define amvers  1.10
 
 %define name			rtems-4.9-automake
@@ -57,7 +57,7 @@ URL:		http://sources.redhat.com/automake
 License:	GPL
 Group:		Development/Tools
 Version:	%{rpmvers}
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	Tool for automatically generating GNU style Makefile.in's
 
 Obsoletes:	rtems-4.9-automake-rtems < %{version}-%{release}

contrib/crossrpms/gcc/base-g77.add

@@ -1,35 +0,0 @@
-%if %build_infos
-%if %build_g77
-# ==============================================================
-# @rpmprefix@gcc-g77-common
-# ==============================================================
-%package -n @rpmprefix@gcc-g77-common
-Summary:        Base package for RTEMS gcc/g77 compiler
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-
-Requires(post): 	/sbin/install-info
-Requires(preun): 	/sbin/install-info
-
-%description -n @rpmprefix@gcc-g77-common
-RTEMS is an open source operating system for embedded systems.
-
-This is the files for gcc/g77 that are shared by all targets.
-
-%files -n @rpmprefix@gcc-g77-common
-%defattr(-,root,root)
-%sysdir %{_infodir}
-%ghost %{_infodir}/dir
-%{_infodir}/g77.info*.gz
-
-%post -n @rpmprefix@gcc-g77-common
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/g77.info.gz || :
-
-%preun -n @rpmprefix@gcc-g77-common
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/g77.info.gz || :
-fi
-
-%endif
-%endif

contrib/crossrpms/gcc/base-gfortran.add

@@ -1,5 +1,5 @@
 %if %build_infos
-%if %build_f95
+%if %build_fortran
 # ==============================================================
 # @rpmprefix@gcc-gfortran-common
 # ==============================================================

contrib/crossrpms/gcc/build.add

@@ -7,11 +7,8 @@
 %if %build_cxx
   languages="$languages,c++"
 %endif
-%if %build_g77
-  languages="$languages,g77"
-%endif
-%if %build_f95
-  languages="$languages,f95"
+%if %build_fortran
+  languages="$languages,fortran"
 %endif
 %if %build_gcj
   languages="$languages,java"

contrib/crossrpms/gcc/gccnewlib.add

@@ -47,7 +47,7 @@ BuildRequires:  @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}
 
 %if "%{gcc_version}" >= "4.2.0"
 BuildRequires:	flex bison
-%if %build_f95
+%if %build_fortran
 BuildRequires:	gmp-devel >= 4.1
 %if 0%{?fedora} >= 8
 BuildRequires:  mpfr-devel >= 2.2.1
@@ -84,7 +84,7 @@ BuildRequires:	zlib-devel
 BuildRequires:	gcc-gnat
 BuildRequires:	@rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMREL@
 %endif
-%if %build_f95
+%if %build_fortran
 BuildRequires: gmp-devel
 %endif
 

contrib/crossrpms/gcc/install.add

@@ -46,7 +46,7 @@
   rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
 %endif
 
-%if %build_f95
+%if %build_fortran
 #  # Bug in gcc-4.0.0pre
 #  mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/@tool_target@-gfortran
 %endif
@@ -108,7 +108,6 @@
 
   # Collect files to go into different packages
   cp dirs build/files.gcc
-  cp dirs build/files.g77
   cp dirs build/files.gfortran
   cp dirs build/files.objc
   cp dirs build/files.gcj

contrib/crossrpms/gcc/prep.add

@@ -9,7 +9,7 @@
 %{?PATCH1:%patch1 -p0}
 %endif
 
-%if %build_f95
+%if %build_fortran
 %setup -q -T -D -n %{name}-%{version} -a2
 %{?PATCH2:%patch2 -p0}
 %endif

contrib/crossrpms/gcc/target-g77.add

@@ -1,32 +0,0 @@
-%if %build_g77
-# ==============================================================
-# @rpmprefix@@tool_target@-gcc-g77
-# ==============================================================
-%package -n @rpmprefix@@tool_target@-gcc-g77
-Summary:        Fortran 77 support for @tool_target@-gcc
-Group:          Development/Tools
-Version:        %{gcc_rpmvers}
-License:	GPL
-Provides:	@rpmprefix@@tool_target@-g77 = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@@tool_target@-g77 < %{gcc_rpmvers}-%{release}
-
-%if %build_infos
-Requires:       @rpmprefix@gcc-g77-common
-%endif
-Requires:       @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
-
-%description -n @rpmprefix@@tool_target@-gcc-g77
-GCC Fortran 77 compiler for @tool_target@.
-
-%files -n @rpmprefix@@tool_target@-gcc-g77 -f build/files.g77
-%defattr(-,root,root)
-%{_bindir}/@tool_target@-g77%{_exeext}
-
-%{_mandir}/man1/@tool_target@-g77.1*
-
-%dir %{gccexec}
-%dir %{gccexec}/@tool_target@
-%dir %{gccexec}/@tool_target@/%{gcc_version}
-%{gccexec}/@tool_target@/%{gcc_version}/f771%{_exeext}
-%endif
-

contrib/crossrpms/gcc/target-gfortran.add

@@ -1,4 +1,4 @@
-%if %build_f95
+%if %build_fortran
 # ==============================================================
 # @rpmprefix@@tool_target@-gcc-gfortran
 # ==============================================================

contrib/crossrpms/rtems4.9/arm/Makefile.am

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 22
+GCC_RPMREL = 24
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

contrib/crossrpms/rtems4.9/arm/gcc-sources.add

@@ -1,6 +1,6 @@
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -14,7 +14,7 @@ Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve
 %{?_without_sources:NoSource:	1}
 
 %endif
-%if %build_f95
+%if %build_fortran
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	2}
 

contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec

@@ -60,7 +60,7 @@ Summary:      	arm-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	22%{?dist}
+Release:      	24%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,7 +100,7 @@ BuildRequires:	rtems-4.9-arm-rtems4.9-binutils
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-arm-rtems4.9-binutils
-Requires:	rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+Requires:	rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 
 
 %if "%{gcc_version}" >= "3.4"
@@ -113,7 +113,7 @@ Requires:	rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -165,14 +165,7 @@ cd ..
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-%if "%{gcc_version}" < "4.1.0"
-  sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
-  gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%else
-  sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \
-    gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%endif
-  mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c
+echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -314,7 +307,6 @@ cd ..
 
   # Collect files to go into different packages
   cp dirs build/files.gcc
-  cp dirs build/files.g77
   cp dirs build/files.gfortran
   cp dirs build/files.objc
   cp dirs build/files.gcj
@@ -437,7 +429,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-arm-rtems4.9-binutils
-# Requires:       rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+# Requires:       rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -589,7 +581,7 @@ Summary:      	C Library (newlib) for arm-rtems4.9
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -609,7 +601,7 @@ Newlib C Library for arm-rtems4.9.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info

contrib/crossrpms/rtems4.9/avr/Makefile.am

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 23
+GCC_RPMREL = 24
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

contrib/crossrpms/rtems4.9/avr/gcc-sources.add

@@ -14,7 +14,7 @@ Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve
 %{?_without_sources:NoSource:	1}
 
 %endif
-%if %build_f95
+%if %build_fortran
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	2}
 

contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec

@@ -60,7 +60,7 @@ Summary:      	avr-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	23%{?dist}
+Release:      	24%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,7 +100,7 @@ BuildRequires:	rtems-4.9-avr-rtems4.9-binutils
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-avr-rtems4.9-binutils
-Requires:	rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-23%{?dist}
+Requires:	rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 
 
 %if "%{gcc_version}" >= "3.4"
@@ -155,14 +155,7 @@ cd ..
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-%if "%{gcc_version}" < "4.1.0"
-  sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
-  gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%else
-  sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \
-    gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%endif
-  mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c
+echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -303,7 +296,6 @@ cd ..
 
   # Collect files to go into different packages
   cp dirs build/files.gcc
-  cp dirs build/files.g77
   cp dirs build/files.gfortran
   cp dirs build/files.objc
   cp dirs build/files.gcj
@@ -426,7 +418,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-avr-rtems4.9-binutils
-# Requires:       rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-23%{?dist}
+# Requires:       rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -543,7 +535,7 @@ Summary:      	C Library (newlib) for avr-rtems4.9
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        23%{?dist}
+Release:        24%{?dist}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -563,7 +555,7 @@ Newlib C Library for avr-rtems4.9.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        23%{?dist}
+Release:        24%{?dist}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info

contrib/crossrpms/rtems4.9/bfin/Makefile.am

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 22
+GCC_RPMREL = 24
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

contrib/crossrpms/rtems4.9/bfin/gcc-sources.add

@@ -1,6 +1,6 @@
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -14,7 +14,7 @@ Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve
 %{?_without_sources:NoSource:	1}
 
 %endif
-%if %build_f95
+%if %build_fortran
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	2}
 

contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec

@@ -60,7 +60,7 @@ Summary:      	bfin-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	22%{?dist}
+Release:      	24%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,7 +100,7 @@ BuildRequires:	rtems-4.9-bfin-rtems4.9-binutils
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-bfin-rtems4.9-binutils
-Requires:	rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+Requires:	rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 
 
 %if "%{gcc_version}" >= "3.4"
@@ -113,7 +113,7 @@ Requires:	rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -165,14 +165,7 @@ cd ..
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-%if "%{gcc_version}" < "4.1.0"
-  sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
-  gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%else
-  sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \
-    gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%endif
-  mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c
+echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -314,7 +307,6 @@ cd ..
 
   # Collect files to go into different packages
   cp dirs build/files.gcc
-  cp dirs build/files.g77
   cp dirs build/files.gfortran
   cp dirs build/files.objc
   cp dirs build/files.gcj
@@ -437,7 +429,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-bfin-rtems4.9-binutils
-# Requires:       rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+# Requires:       rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -589,7 +581,7 @@ Summary:      	C Library (newlib) for bfin-rtems4.9
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -609,7 +601,7 @@ Newlib C Library for bfin-rtems4.9.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info

contrib/crossrpms/rtems4.9/gcc-prep.add

@@ -1,9 +1,2 @@
-%if "%{gcc_version}" < "4.1.0"
-  sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
-  gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%else
-  sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \
-    gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%endif
-  mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c
+echo "RTEMS gcc-%{gcc_version}-@GCC_RPMREL@\/newlib-%{newlib_version}-@NEWLIB_RPMREL@" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 

contrib/crossrpms/rtems4.9/gcc.am

@@ -19,12 +19,14 @@ GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
 GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-newlib.add
 GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-newlib.add
 
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add
-	cat $(GCC_SUBPACKAGES) | sed \
+$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
+	cat $(GCC_SUBPACKAGES) \
+	  | sed \
 	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
 	  -e "/[@]PREP[@]/d" \
+	  | sed \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \

contrib/crossrpms/rtems4.9/h8300/Makefile.am

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 22
+GCC_RPMREL = 24
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

contrib/crossrpms/rtems4.9/h8300/gcc-sources.add

@@ -1,6 +1,6 @@
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -14,7 +14,7 @@ Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve
 %{?_without_sources:NoSource:	1}
 
 %endif
-%if %build_f95
+%if %build_fortran
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	2}
 

contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec

@@ -60,7 +60,7 @@ Summary:      	h8300-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	22%{?dist}
+Release:      	24%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,7 +100,7 @@ BuildRequires:	rtems-4.9-h8300-rtems4.9-binutils
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-h8300-rtems4.9-binutils
-Requires:	rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+Requires:	rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 
 
 %if "%{gcc_version}" >= "3.4"
@@ -113,7 +113,7 @@ Requires:	rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -165,14 +165,7 @@ cd ..
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-%if "%{gcc_version}" < "4.1.0"
-  sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
-  gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%else
-  sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \
-    gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%endif
-  mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c
+echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -314,7 +307,6 @@ cd ..
 
   # Collect files to go into different packages
   cp dirs build/files.gcc
-  cp dirs build/files.g77
   cp dirs build/files.gfortran
   cp dirs build/files.objc
   cp dirs build/files.gcj
@@ -437,7 +429,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-h8300-rtems4.9-binutils
-# Requires:       rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+# Requires:       rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -589,7 +581,7 @@ Summary:      	C Library (newlib) for h8300-rtems4.9
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -609,7 +601,7 @@ Newlib C Library for h8300-rtems4.9.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info

contrib/crossrpms/rtems4.9/i386/Makefile.am

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 22
+GCC_RPMREL = 24
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

contrib/crossrpms/rtems4.9/i386/gcc-sources.add

@@ -1,6 +1,6 @@
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -14,7 +14,7 @@ Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve
 %{?_without_sources:NoSource:	1}
 
 %endif
-%if %build_f95
+%if %build_fortran
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	2}
 

contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec

@@ -60,7 +60,7 @@ Summary:      	i386-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	22%{?dist}
+Release:      	24%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,7 +100,7 @@ BuildRequires:	rtems-4.9-i386-rtems4.9-binutils
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-i386-rtems4.9-binutils
-Requires:	rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+Requires:	rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 
 
 %if "%{gcc_version}" >= "3.4"
@@ -113,7 +113,7 @@ Requires:	rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -165,14 +165,7 @@ cd ..
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-%if "%{gcc_version}" < "4.1.0"
-  sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
-  gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%else
-  sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \
-    gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%endif
-  mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c
+echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -314,7 +307,6 @@ cd ..
 
   # Collect files to go into different packages
   cp dirs build/files.gcc
-  cp dirs build/files.g77
   cp dirs build/files.gfortran
   cp dirs build/files.objc
   cp dirs build/files.gcj
@@ -437,7 +429,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-i386-rtems4.9-binutils
-# Requires:       rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+# Requires:       rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -589,7 +581,7 @@ Summary:      	C Library (newlib) for i386-rtems4.9
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -609,7 +601,7 @@ Newlib C Library for i386-rtems4.9.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info

contrib/crossrpms/rtems4.9/m68k/Makefile.am

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 22
+GCC_RPMREL = 24
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

contrib/crossrpms/rtems4.9/m68k/gcc-sources.add

@@ -1,6 +1,6 @@
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -14,7 +14,7 @@ Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve
 %{?_without_sources:NoSource:	1}
 
 %endif
-%if %build_f95
+%if %build_fortran
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	2}
 

contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec

@@ -60,7 +60,7 @@ Summary:      	m68k-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	22%{?dist}
+Release:      	24%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,7 +100,7 @@ BuildRequires:	rtems-4.9-m68k-rtems4.9-binutils
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-m68k-rtems4.9-binutils
-Requires:	rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+Requires:	rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 
 
 %if "%{gcc_version}" >= "3.4"
@@ -113,7 +113,7 @@ Requires:	rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -165,14 +165,7 @@ cd ..
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-%if "%{gcc_version}" < "4.1.0"
-  sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
-  gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%else
-  sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \
-    gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%endif
-  mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c
+echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -314,7 +307,6 @@ cd ..
 
   # Collect files to go into different packages
   cp dirs build/files.gcc
-  cp dirs build/files.g77
   cp dirs build/files.gfortran
   cp dirs build/files.objc
   cp dirs build/files.gcj
@@ -437,7 +429,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-m68k-rtems4.9-binutils
-# Requires:       rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+# Requires:       rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -589,7 +581,7 @@ Summary:      	C Library (newlib) for m68k-rtems4.9
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -609,7 +601,7 @@ Newlib C Library for m68k-rtems4.9.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info

contrib/crossrpms/rtems4.9/mips/Makefile.am

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 22
+GCC_RPMREL = 24
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

contrib/crossrpms/rtems4.9/mips/gcc-sources.add

@@ -1,6 +1,6 @@
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -14,7 +14,7 @@ Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve
 %{?_without_sources:NoSource:	1}
 
 %endif
-%if %build_f95
+%if %build_fortran
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	2}
 

contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec

@@ -60,7 +60,7 @@ Summary:      	mips-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	22%{?dist}
+Release:      	24%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,7 +100,7 @@ BuildRequires:	rtems-4.9-mips-rtems4.9-binutils
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-mips-rtems4.9-binutils
-Requires:	rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+Requires:	rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 
 
 %if "%{gcc_version}" >= "3.4"
@@ -113,7 +113,7 @@ Requires:	rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -165,14 +165,7 @@ cd ..
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-%if "%{gcc_version}" < "4.1.0"
-  sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
-  gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%else
-  sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \
-    gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%endif
-  mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c
+echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -314,7 +307,6 @@ cd ..
 
   # Collect files to go into different packages
   cp dirs build/files.gcc
-  cp dirs build/files.g77
   cp dirs build/files.gfortran
   cp dirs build/files.objc
   cp dirs build/files.gcj
@@ -437,7 +429,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-mips-rtems4.9-binutils
-# Requires:       rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+# Requires:       rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -589,7 +581,7 @@ Summary:      	C Library (newlib) for mips-rtems4.9
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -609,7 +601,7 @@ Newlib C Library for mips-rtems4.9.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info

contrib/crossrpms/rtems4.9/powerpc/Makefile.am

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 22
+GCC_RPMREL = 24
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

contrib/crossrpms/rtems4.9/powerpc/gcc-sources.add

@@ -1,6 +1,6 @@
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -14,7 +14,7 @@ Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve
 %{?_without_sources:NoSource:	1}
 
 %endif
-%if %build_f95
+%if %build_fortran
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	2}
 

contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec

@@ -60,7 +60,7 @@ Summary:      	powerpc-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	22%{?dist}
+Release:      	24%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,7 +100,7 @@ BuildRequires:	rtems-4.9-powerpc-rtems4.9-binutils
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-powerpc-rtems4.9-binutils
-Requires:	rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+Requires:	rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 
 
 %if "%{gcc_version}" >= "3.4"
@@ -113,7 +113,7 @@ Requires:	rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -165,14 +165,7 @@ cd ..
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-%if "%{gcc_version}" < "4.1.0"
-  sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
-  gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%else
-  sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \
-    gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%endif
-  mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c
+echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -314,7 +307,6 @@ cd ..
 
   # Collect files to go into different packages
   cp dirs build/files.gcc
-  cp dirs build/files.g77
   cp dirs build/files.gfortran
   cp dirs build/files.objc
   cp dirs build/files.gcj
@@ -437,7 +429,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-powerpc-rtems4.9-binutils
-# Requires:       rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+# Requires:       rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -589,7 +581,7 @@ Summary:      	C Library (newlib) for powerpc-rtems4.9
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -609,7 +601,7 @@ Newlib C Library for powerpc-rtems4.9.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info

contrib/crossrpms/rtems4.9/sh/Makefile.am

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 22
+GCC_RPMREL = 24
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

contrib/crossrpms/rtems4.9/sh/gcc-sources.add

@@ -1,6 +1,6 @@
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -14,7 +14,7 @@ Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve
 %{?_without_sources:NoSource:	1}
 
 %endif
-%if %build_f95
+%if %build_fortran
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	2}
 

contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec

@@ -60,7 +60,7 @@ Summary:      	sh-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	22%{?dist}
+Release:      	24%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,7 +100,7 @@ BuildRequires:	rtems-4.9-sh-rtems4.9-binutils
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-sh-rtems4.9-binutils
-Requires:	rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+Requires:	rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 
 
 %if "%{gcc_version}" >= "3.4"
@@ -113,7 +113,7 @@ Requires:	rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -165,14 +165,7 @@ cd ..
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-%if "%{gcc_version}" < "4.1.0"
-  sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
-  gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%else
-  sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \
-    gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%endif
-  mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c
+echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -314,7 +307,6 @@ cd ..
 
   # Collect files to go into different packages
   cp dirs build/files.gcc
-  cp dirs build/files.g77
   cp dirs build/files.gfortran
   cp dirs build/files.objc
   cp dirs build/files.gcj
@@ -437,7 +429,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-sh-rtems4.9-binutils
-# Requires:       rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+# Requires:       rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -589,7 +581,7 @@ Summary:      	C Library (newlib) for sh-rtems4.9
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -609,7 +601,7 @@ Newlib C Library for sh-rtems4.9.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info

contrib/crossrpms/rtems4.9/sparc/Makefile.am

@@ -12,7 +12,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.3.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 22
+GCC_RPMREL = 24
 NEWLIB_VERS = 1.16.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = $(GCC_RPMREL)

contrib/crossrpms/rtems4.9/sparc/gcc-sources.add

@@ -1,6 +1,6 @@
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -14,7 +14,7 @@ Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve
 %{?_without_sources:NoSource:	1}
 
 %endif
-%if %build_f95
+%if %build_fortran
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:	2}
 

contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec

@@ -60,7 +60,7 @@ Summary:      	sparc-rtems4.9 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	22%{?dist}
+Release:      	24%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,7 +100,7 @@ BuildRequires:	rtems-4.9-sparc-rtems4.9-binutils
 
 Requires:	rtems-4.9-gcc-common
 Requires:	rtems-4.9-sparc-rtems4.9-binutils
-Requires:	rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+Requires:	rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 
 
 %if "%{gcc_version}" >= "3.4"
@@ -113,7 +113,7 @@ Requires:	rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" == "4.3.2"
 Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081214.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff
 %endif
 %{?_without_sources:NoSource:	0}
 
@@ -165,14 +165,7 @@ cd ..
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-%if "%{gcc_version}" < "4.1.0"
-  sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
-  gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%else
-  sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \
-    gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~
-%endif
-  mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c
+echo "RTEMS gcc-%{gcc_version}-24%{?dist}\/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -314,7 +307,6 @@ cd ..
 
   # Collect files to go into different packages
   cp dirs build/files.gcc
-  cp dirs build/files.g77
   cp dirs build/files.gfortran
   cp dirs build/files.objc
   cp dirs build/files.gcj
@@ -437,7 +429,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.9-sparc-rtems4.9-binutils
-# Requires:       rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-22%{?dist}
+# Requires:       rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-24%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -589,7 +581,7 @@ Summary:      	C Library (newlib) for sparc-rtems4.9
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 
 Requires:	rtems-4.9-newlib-common
 
@@ -609,7 +601,7 @@ Newlib C Library for sparc-rtems4.9.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        22%{?dist}
+Release:        24%{?dist}
 License:	Distributable
 
 Requires(post): 	/sbin/install-info

contrib/crossrpms/specstrip

@@ -90,8 +90,7 @@ my @npatterns = (
   "(%build_objc)",
   "(%build_gcj)",
   "(%build_libgcj)",
-  "(%build_f95)",
-  "(%build_g77)",
+  "(%build_fortran)",
   "(%build_newlib)",
   "(%build_infos)"
 );
@@ -106,8 +105,7 @@ push @ppatterns, "(%build_cxx "    . ( ($langs{cxx}) ? "==" : "!=" ) . " 0)";
 push @ppatterns, "(%build_objc "   . ( ($langs{objc}) ? "==" : "!=" ) . " 0)";
 push @ppatterns, "(%build_gcj "    . ( ($langs{gcj}) ? "==" : "!=" ) . " 0)";
 push @ppatterns, "(%build_libgcj " . ( ($langs{libgcj}) ? "==" : "!=" ) . " 0)";
-push @ppatterns, "(%build_f95 "    . ( ($langs{f95}) ? "==" : "!=" ) . " 0)";
-push @ppatterns, "(%build_g77 "    . ( ($langs{g77}) ? "==" : "!=" ) . " 0)";
+push @ppatterns, "(%build_fortran "    . ( ($langs{fortran}) ? "==" : "!=" ) . " 0)";
 
 push @ppatterns, "(%build_newlib " . ( ($newlib) ? "==" : "!=" ) . " 0)";
 push @ppatterns, "(%build_infos " . ( ($infos) ? "==" : "!=" ) . " 0)";

contrib/repo-conf/.cvsignore

@@ -1,12 +0,0 @@
-aclocal.m4
-autom4te*
-config.log
-config.status
-configure
-install-sh
-Makefile
-Makefile.in
-missing
-*.spec
-*.tar.bz2
-*.tar.xz

contrib/repo-conf/AUTHORS

@@ -1 +0,0 @@
-Ralf Corsépius <ralf.corsepius@rtems.org>

contrib/repo-conf/COPYING

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

contrib/repo-conf/ChangeLog

@@ -1,14 +0,0 @@
-2008-10-01	Joel Sherrill <joel.sherrill@oarcorp.com>
-
-	* aclocal/version.m4: Bump API to 4.10.
-
-2007-02-18	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* configure.ac: Bump version to 0.5.
-	* apt/sources.list.d/rtems.list.in,
-	  yum.repos.d/rtems.repo.in: Add rtems/testing repos.
-
-2006-12-02	Ralf Corsépius <ralf.corsepius@rtems.org>
-
-	* configure.ac: New BUG-REPORT address.
-

contrib/repo-conf/INSTALL

@@ -1,237 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-

contrib/repo-conf/Makefile.am

@@ -1,67 +0,0 @@
-ACLOCAL_AMFLAGS = -I aclocal
-CLEANFILES =
-
-aptconfdir = $(sysconfdir)
-
-nobase_aptconf_DATA =
-
-nobase_aptconf_DATA += apt/sources.list.d/rtems-@RTEMS_API@.list
-nobase_aptconf_DATA += apt/vendors.list.d/rtems.list
-apt/sources.list.d/rtems-@RTEMS_API@.list: apt/sources.list.d/rtems.list.in
-	@$(mkdir_p) apt/sources.list.d
-	sed -e 's,[@]RTEMS_API[@],@RTEMS_API@,' \
-	  -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
-	  -e 's,[@]OS_NAME[@],@OS_NAME@,' \
-	  -e 's,[@]APT_VERDIR[@],@APT_VERDIR@,' \
-	  < $(srcdir)/apt/sources.list.d/rtems.list.in \
-	  > apt/sources.list.d/rtems-@RTEMS_API@.list
-CLEANFILES += apt/sources.list.d/rtems-@RTEMS_API@.list
-EXTRA_DIST = $(srcdir)/apt/sources.list.d/*.list.in
-EXTRA_DIST += $(srcdir)/apt/vendors.list.d/*.list
-
-yumconfdir = $(sysconfdir)
-nobase_yumconf_DATA =
-
-nobase_yumconf_DATA += yum.repos.d/rtems-@RTEMS_API@.repo
-yum.repos.d/rtems-@RTEMS_API@.repo: yum.repos.d/rtems.repo.in
-	@$(mkdir_p) yum.repos.d
-	sed -e 's,[@]sysconfdir[@],$(sysconfdir),' \
-	  -e 's,[@]RTEMS_API[@],@RTEMS_API@,' \
-	  -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
-	  -e 's,[@]OS_NAME[@],@OS_NAME@,' \
-	  -e 's,[@]OS_VERS[@],@OS_VERS@,' \
-	  -e 's,[@]YUM_VERDIR[@],@YUM_VERDIR@,' \
-	  < $(srcdir)/yum.repos.d/rtems.repo.in \
-	  > yum.repos.d/rtems-@RTEMS_API@.repo
-CLEANFILES += yum.repos.d/rtems-@RTEMS_API@.repo
-EXTRA_DIST += $(srcdir)/yum.repos.d/*repo.in
-
-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@: gpg/gpg-pubkey-69ce4a83-44cc2b30
-	@$(mkdir_p) gpg
-	cat $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30 \
-	  > gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
-CLEANFILES += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
-EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30
-
-
-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@: gpg/gpg-pubkey-eac29b6f-3fe1f458
-	@$(mkdir_p) gpg
-	cat $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458 \
-	  > gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
-CLEANFILES += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
-EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458
-
-yum_gpgdir = $(sysconfdir)/pki/rpm-gpg
-yum_gpg_DATA =
-yum_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
-yum_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
-
-apt_gpgdir = $(sysconfdir)/apt/gpg
-apt_gpg_DATA =
-apt_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
-apt_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
-
-noinst_HEADERS = rtems-@RTEMS_API@-repo-conf.spec
-rtems-@RTEMS_API@-repo-conf.spec: rtems-repo-conf.spec.in config.status
-	./config.status --file=rtems-@RTEMS_API@-repo-conf.spec:rtems-repo-conf.spec.in
-EXTRA_DIST += rtems-repo-conf.spec.in

contrib/repo-conf/aclocal/version.m4

@@ -1,4 +0,0 @@
-AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.8.99.0]))
-
-m4_define([_RTEMS_API],[4.9])

contrib/repo-conf/apt/sources.list.d/.cvsignore

@@ -1 +0,0 @@
-*.list

contrib/repo-conf/apt/sources.list.d/rtems.list.in

@@ -1,10 +0,0 @@
-## rtems-@RTEMS_API@ sources.list entries for apt-rpm with repomd support,
-## http://apt-rpm.laiskiainen.org/
-
-repomd ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@/@APT_VERDIR@/$(ARCH)
-
-## uncomment the line below if you want to access the *.src.rpms
-# repomd-src ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@/@APT_VERDIR@/SRPMS
-
-## uncomment the line below if you want to access the *-debuginfo*.rpms
-# repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@/@APT_VERDIR@/$(ARCH)/debug

contrib/repo-conf/apt/vendors.list.d/rtems.list

@@ -1,4 +0,0 @@
-simple-key "rtems" { 
-	Fingerprint "CD738F4967B9B2F95EEA2FE846A926C2EAC29B6F";
-	Name "RTEMS Packager (RTEMS Packager) <rtems.packager@rtems.com>";
-}

contrib/repo-conf/configure.ac

@@ -1,52 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.61)
-AC_INIT([rtems-]_RTEMS_API[-repo-conf],[0.20],[http://www.rtems.org/bugzilla],
-  [rtems-]_RTEMS_API[-repo-conf])
-RTEMS_VERSIONING
-
-AC_CONFIG_SRCDIR([gpg])
-AC_CONFIG_AUX_DIR([.])
-AC_SUBST([RTEMS_API],[_RTEMS_API])
-AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip 1.10])
-
-AC_ARG_ENABLE(osname,AS_HELP_STRING(
-[--enable-osname=<dir> ... os name]),
-[osname="$enable_osname"],
-[osname="fedora-11"])
-
-case $osname in
-fedora-10* | fedora-11* | fedora-12* )
-  os_name="Fedora"
-  os_subdir="fedora"
-  os_vers=`echo $osname| sed -e 's,^.*-,,'`
-  yum_verdir="\$\$releasever"
-  apt_verdir="\$\$(VERSION)"
-  ;;
-centos-5* | redhat-el5* | fedora-7* | fedora-8* | fedora-9* )
-  os_name="CentOS"
-  os_subdir="centos"
-  os_vers=`echo $osname| sed -e 's,^.*-,,'`
-  yum_verdir="5"
-  apt_verdir="5"
-  ;;
-suse-*)
-  os_name="openSUSE"
-  os_subdir="suse"
-  os_vers=`echo $osname| sed -e 's,^.*-,,'`
-  yum_verdir="\$\$releasever"
-  apt_verdir="\$\$(VERSION)"
-  ;;
-*)
-  AC_MSG_ERROR([Unsupported OS])
-esac
-
-AC_SUBST([OS_NAME],[$os_name])
-AC_SUBST([OS_SUBDIR],[$os_subdir])
-AC_SUBST([OS_VERS],[$os_vers])
-AC_SUBST([YUM_VERDIR],[$yum_verdir])
-AC_SUBST([APT_VERDIR],[$apt_verdir])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT

contrib/repo-conf/gpg/gpg-pubkey-69ce4a83-44cc2b30

@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-mQGiBETMKzARBADSjTeuznDREJbwzDdqW3mE1wAGkm8RL1Q8qeNZvBCk/vAduHNz
-22/hvHihdJ8itOdCy/s3PEah4cknosCFuFARZ++dsSG/gCuS3W+O65tUCDHRTnbg
-R5Cfs7sOpiJq+mtX6pjWj0nm77hw4ItfjLP/AJy/hQjNcTlhKygQANHO1wCg0Ccf
-MUfZ1btNc4t6TU6NEsbOuIkD+wdXuwgiZfp5uCTm1k4pgLoTO+nunP9GH5M7ZfHD
-oCG42gBJQvRikD75TfNBQdoLaEHoDErXZOAeY21fl1BcafNtheXF9Xtyx7kTpn93
-Ha8MHvR81tabLZj5unRotpiRjBdGGV4CM4HBdLIJiYipaDZynSYygu7VbiEegp4T
-3yA2A/99l3WU0TWLqVd0JJf6Mj3A8lX4My9Z+KDdpS9P6ucMsqVrcMmkYiKs+34P
-nhiyuKLkkWTfpc+LDLRqBuMxXIf8qF9CPy2jqubQZLKOqNlTNCxEYA1bZRioB+S0
-8nqu7M8mdBtuuuhvqLGDZ9JZhozFrlE2/yFut18Xxtl8w/gilrQqUmFsZiBDb3Jz
-w6lwaXVzIDxyYWxmLmNvcnNlcGl1c0BydGVtcy5vcmc+iGAEExECACAFAkTMKzAC
-GyMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRBnTIjLac5Kg1rlAKCFhwXib+5M
-CE4GOI87cFxjUVucAQCfVsukiRgKQN5G4UHFQJrIPsmbEni5AQ0ERMwrMhAEAJA5
-1T41pkhXlqenJa1VfuuRicVUe0+a7gRjRzgJWWdaSMZZl3k6q0cyzx1aEyRhKWcb
-cxpyBLlq9XY7Dv7kBJVv2iHh62yAUfmKduVBC+yctWf9eVzM2xvZda2xgLsvWNXA
-jh/qmRby9Zdt/SmK+S+ttDCav9fQJj7DuEZyaqFnAAMFA/9l5wz6NiMbBsAmvrJi
-c3UEfaum6RE7ETINNz0/tKaH6qDB3HFN0D1tEzGqygjNDAKtgRPBWYYGpAA2NsOz
-g7wBNIdxNMi95g9Fge7S6pKL5uj+nr2l2V+oC7NPZlTtF/V4AnkAKwojLn6OlrVB
-8h40yqmDGqaU706UJcheWPu7WohJBBgRAgAJBQJEzCsyAhsMAAoJEGdMiMtpzkqD
-B1YAoLzLT1gSi7prI2DeoF97fNtc3TDbAKCIYgxosZ3VniuipY2gPaD/QhI5Lg==
-=yX9X
------END PGP PUBLIC KEY BLOCK-----

contrib/repo-conf/gpg/gpg-pubkey-eac29b6f-3fe1f458

@@ -1,25 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.3 (GNU/Linux)
-
-mQGiBD/h9FgRBACIvWgCQP+mXUroVHIYCjPegO2RnTAW5Czpbi97eBcR/mb4U+5K
-hgHscM7Q3AGMgHh21gqf8Pcrx2zkf0q3p3EFiBH6u59ZXoZg1riaaQHnHO2zNtWg
-AeTja8kh96WpHtkMTvnq4J6OKJ6Aaj3W00W5V67AZbAvBf02VZePCWB1wwCgudqd
-IqeyYyyOwQIiX4O9H+mhX48D/RfummZ3j9iBeq9vIhSpLiN7yzAdD7KynFV0Z32u
-e8ulc+xs6BZsT/NtUij5JP022jJ1f5qQv3uGSqDt9BlAN75UFIjuAZChK38vWDNQ
-KIaZIHXk2y0l2vd7R8P1lRh9ryZK98VbjqVrQUmsfR0hpPVyWI8lCPD+1TwQLV6h
-HYyJA/9KXK32S9pMOSwY3qDbrATQYg5VIYa8O5xnIV14CWv2ucUQxqj/pm9sllYO
-HtSd/1/FYyZbtqF5tFVxNLFH9wr8WtzvkcddBYFrycamt9dScAe+DIXbsrQ3DVI2
-PKmypKfMPlGkCCiOFkdBlCCVpcl0OU7v1O0rFtC9fE2ZbgFvabQ6UlRFTVMgUGFj
-a2FnZXIgKFJURU1TIFBhY2thZ2VyKSA8cnRlbXMucGFja2FnZXJAcnRlbXMuY29t
-PohXBBMRAgAXBQI/4fRYBQsHCgMEAxUDAgMWAgECF4AACgkQRqkmwurCm29gWQCg
-gU07Fcv6dj6j7NCHpzZHGiEdOisAnj6XXw/nNC3pw9lquNqST5TjgbhzuQENBD/h
-9FsQBADIsSYrCsRefX22akbsXrDft4b1jCn+Z7snK506kb7tlkhpiQAKcYHdz8jy
-gdG3pqsnBcvuBuWFy5rTh0PMaoLeNAQDLbD2Pl4a9109ja2Ot/3R4w8jvXoUs+Bn
-QwhvulSsad1jxyx4DEqkx3dCOZtKEUa0p0YDOx7DBk4u6MaWZwADBwP/Wrxtj7qk
-7qCEAT/+2vkWkGXNkHzJI/sfkiVuA8xEzjQC0ZZYUn7zUzOQHYSly1kxZZUsIP3k
-UuNXT7/9XbPkhytjz+qS8iODzQnsG2etoROYxg+OR1BjaS8zfWfZs83nCITwSXdP
-76JCCA8ssR43Xpc4zFtNkPlycRoPCDIWhU6IRgQYEQIABgUCP+H0WwAKCRBGqSbC
-6sKbb6lmAKCa9k/S3V/nWjOc05xXgZJ1lnLCTwCgsSDmdeef3bs5mSmIm4zmKAwJ
-G4A=
-=jt7V
------END PGP PUBLIC KEY BLOCK-----

contrib/repo-conf/rtems-repo-conf.spec.in

@@ -1,58 +0,0 @@
-Name:           @PACKAGE_NAME@
-Version:        @VERSION@
-Release:        1%{?dist}
-Epoch:          0
-Group:		Development/Tools
-License:        GPL
-Source0:        @PACKAGE_TARNAME@-@VERSION@.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
-
-Summary: 	Apt/yum configurations for RTEMS
-%description
-Apt/yum configuration files to access the apt/yum repositories at ftp://ftp.rtems.com
-
-%prep
-%setup -q
-
-%build
-case "%{?dist}" in
-.el*) extra_arg=--enable-osname="centos-%{rhel}";;
-.fc*) extra_arg=--enable-osname="fedora-%{fedora}";;
-.suse*) extra_arg=--enable-osname="suse-%{suse}";;
-esac
-%configure $extra_arg
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%package -n rtems-@RTEMS_API@-apt-conf
-Summary:        Apt-repomd configuration for RTEMS/@RTEMS_API@
-Group:          RTEMS/@RTEMS_API@
-Requires:       apt >= 0.5.15lorg3
-
-%description -n rtems-@RTEMS_API@-apt-conf
-Apt-repomd configuration for RTEMS/@RTEMS_API@
-
-%files -n rtems-@RTEMS_API@-apt-conf
-%defattr(-,root,root,-)
-%{_sysconfdir}/apt/gpg
-%config(noreplace) %{_sysconfdir}/apt/sources.list.d/rtems-@RTEMS_API@.list
-%{_sysconfdir}/apt/vendors.list.d/rtems.list
-
-%package -n rtems-@RTEMS_API@-yum-conf
-Summary:        yum configuration for RTEMS/@RTEMS_API@
-Group:          RTEMS/@RTEMS_API@
-Requires:       yum > 2.0
-
-%description -n rtems-@RTEMS_API@-yum-conf
-Yum configuration for RTEMS/@RTEMS_API@
-
-%files -n rtems-@RTEMS_API@-yum-conf
-%defattr(-,root,root,-)
-%{_sysconfdir}/pki/rpm-gpg/gpg-pubkey*
-%config(noreplace) %{_sysconfdir}/yum.repos.d/*.repo

contrib/repo-conf/yum.repos.d/.cvsignore

@@ -1 +0,0 @@
-*.repo

contrib/repo-conf/yum.repos.d/rtems.repo.in

@@ -1,29 +0,0 @@
-[rtems-@RTEMS_API@]
-name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch
-# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/$basearch
-mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/mirrorlist
-# metadata_expire=0
-enabled=1
-gpgcheck=1
-gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
-	file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
-
-[rtems-@RTEMS_API@-source]
-name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch - source
-# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/SRPMS
-mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/mirrorlist-source
-# metadata_expire=0
-enabled=0
-gpgcheck=1
-gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
-	file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
-
-[rtems-@RTEMS_API@-debuginfo]
-name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch - debuginfo
-# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/$basearch/debug
-mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/mirrorlist-debuginfo
-# metadata_expire=0
-enabled=0
-gpgcheck=1
-gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
-	file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@

cpukit/ChangeLog

@@ -1,3 +1,72 @@
+2011-01-21	Eric Norum <wenorum@lbl.gov>
+
+	* libmisc/capture/capture.c: Avoid using TCB of task just deleted.
+
+2010-11-16	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1718/cpukit
+	* sapi/include/confdefs.h: POSIX threads are allocated twice the
+	minimum stack space by default. confdefs.h only accounts for one
+	minimum -- not the 2x factor.
+
+2010-11-16	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1717/cpukit
+	* libcsupport/src/gxx_wrappers.c: Free memory on error.
+
+2010-08-27	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1693/filesystem
+	* libfs/src/imfs/memfile.c: IMFS_memfile_get_block_pointer() was
+	checking incorrect pointer and thus had dead code.
+
+2010-08-27	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1692/filesystem
+	* libcsupport/include/rtems/libio.h, libfs/src/imfs/imfs_eval.c: Fix
+	implementation and use of rtems_libio_is_valid_perms().
+
+2010-06-21	Peter Dufault <dufault@hda.com>
+
+	PR 1570/cpukit
+	* posix/src/semtimedwait.c: This routine is supposed to return -1/errno
+	NOT the status directly.
+
+2010-06-21	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1554/cpukit
+	Coverity Id 17
+	* libi2c/libi2c.c: Fix memory leak on error.
+
+2010-03-17	Chris Johns <chrisj@rtems.org>
+
+	* libfs/src/dosfs/msdos_create.c: Fix the date/time call order to
+	'msdos_date_unix2dos'.
+
+2009-12-11	Glenn Humphrey <glenn.humphrey@OARcorp.com>
+
+	PR 1481/cpukit
+	* rtems/src/ratemonperiod.c: Moved check for cpu usage being smaller
+	than when period initiated.
+
+2009-12-10	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	PR 1482
+	* posix/src/timersettime.c: Exit dispatching critical section.
+
+2009-12-10	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	PR 1480/cpukit
+	* rtems/src/ratemonperiod.c: Use _Rate_monotonic_Update_statistics()
+	when period is expired, not _Rate_monotonic_Initiate_statistics().
+	The cound of missed periods was never updated.
+
+2009-12-07	Cindy Cicalese <cicalese@mitre.org>
+
+	PR 1477/cpukit
+	* score/src/objectsetname.c: Ensure destination is NULL terminated.
+	String copy was not getting the NULL.
+
 2009-11-11	Jennifer Averett <jennifer.averett@OARcorp.com>
 
 	PR 1471/cpukit

cpukit/aclocal/version.m4

@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.9.3]))
+m4_define([_RTEMS_VERSION],[4.9.5]))
 
 m4_define([RTEMS_API],[4.9])

cpukit/libcsupport/include/rtems/libio.h

@@ -530,7 +530,7 @@ static inline rtems_device_minor_number rtems_filesystem_dev_minor_t(
  * Verifies that the permission flag is valid.
  */
 #define rtems_libio_is_valid_perms( _perm )     \
- (~ ((~RTEMS_LIBIO_PERMS_RWX) & _perm ))
+ (((~RTEMS_LIBIO_PERMS_RWX) & _perm ) == 0)
 
 
 /*

cpukit/libcsupport/src/gxx_wrappers.c

@@ -106,6 +106,7 @@ int rtems_gxx_key_create (__gthread_key_t *key, void (*dtor) (void *))
   /* register with RTEMS the buffer that will hold the key values */
   if( rtems_task_variable_add( RTEMS_SELF, (void **)new_key, dtor ) == RTEMS_SUCCESSFUL )
        return 0;
+  free( new_key );
   return -1;
 }
 

cpukit/libfs/src/dosfs/msdos_create.c

@@ -85,7 +85,7 @@ msdos_creat_node(
     if ( time_ret == -1 )
         return -1;
 
-    msdos_date_unix2dos(time_ret, &time_val, &date);
+    msdos_date_unix2dos(time_ret, &date, &time_val);
     *MSDOS_DIR_WRITE_TIME(new_node) = CT_LE_W(time_val);
     *MSDOS_DIR_WRITE_DATE(new_node) = CT_LE_W(date);
 

cpukit/libfs/src/imfs/imfs_eval.c

@@ -79,10 +79,8 @@ int IMFS_evaluate_permission(
   IMFS_jnode_t *jnode;
   int           flags_to_test;
 
-  if ( !rtems_libio_is_valid_perms( flags ) ) {
-    assert( 0 );
-    rtems_set_errno_and_return_minus_one( EIO );
-  }
+  if ( !rtems_libio_is_valid_perms( flags ) )
+    rtems_set_errno_and_return_minus_one( EPERM );
 
   jnode = node->node_access;
 

cpukit/libfs/src/imfs/memfile.c

@@ -1046,7 +1046,7 @@ fflush(stdout);
       return 0;
 
     p2 = (block_p *)p1[ doubly ];
-    if ( !p )
+    if ( !p2 )
       return 0;
 
     return (block_p *)&p2[ singly ];

cpukit/libi2c/libi2c.c

@@ -395,11 +395,13 @@ rtems_libi2c_register_bus (const char *name, rtems_libi2c_bus_t * bus)
   /* check */
   if ('/' != *nmcpy) {
     safe_printf ( DRVNM "Bad name: must be an absolute path starting with '/'\n");
+    free( nmcpy );
     return -RTEMS_INVALID_NAME;
   }
   /* file must not exist */
   if (!stat (nmcpy, &sbuf)) {
     safe_printf ( DRVNM "Bad name: file exists already\n");
+    free( nmcpy );
     return -RTEMS_INVALID_NAME;
   }
 
@@ -412,6 +414,7 @@ rtems_libi2c_register_bus (const char *name, rtems_libi2c_bus_t * bus)
   if (i) {
     safe_printf ( DRVNM "Get %s status failed: %s\n",
              nmcpy, strerror(errno));
+    free( nmcpy );
     return -RTEMS_INVALID_NAME;
   }
   /* should be a directory since name terminates in '/' */
@@ -419,11 +422,13 @@ rtems_libi2c_register_bus (const char *name, rtems_libi2c_bus_t * bus)
 
   if (!libmutex) {
     safe_printf ( DRVNM "Library not initialized\n");
+    free( nmcpy );
     return -RTEMS_NOT_DEFINED;
   }
 
   if (bus == NULL || bus->size < sizeof (*bus)) {
     safe_printf ( DRVNM "No bus-ops or size too small -- misconfiguration?\n");
+    free( nmcpy );
     return -RTEMS_NOT_CONFIGURED;
   }
 

cpukit/libmisc/capture/capture.c

@@ -916,7 +916,9 @@ rtems_capture_switch_task (rtems_tcb* current_task,
     rtems_capture_task_t* ct;
     rtems_capture_task_t* ht;
 
-    if (_States_Is_transient (current_task->current_state))
+
+    if (_States_Is_transient (current_task->current_state)
+     || _States_Is_dormant (current_task->current_state))
     {
       rtems_id ct_id = current_task->Object.id;
 

cpukit/posix/src/semtimedwait.c

@@ -76,10 +76,10 @@ int sem_timedwait(
   if ( !do_wait && (lock_status == EBUSY) ) {
     switch (lock_status) {
       case POSIX_ABSOLUTE_TIMEOUT_INVALID:
-        return EINVAL;
+        rtems_set_errno_and_return_minus_one( EINVAL );
       case POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST:
       case POSIX_ABSOLUTE_TIMEOUT_IS_NOW:
-        return ETIMEDOUT;
+        rtems_set_errno_and_return_minus_one( ETIMEDOUT );
       case POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE:
         break;
     }

cpukit/posix/src/timersettime.c

@@ -102,11 +102,15 @@ int timer_settime(
          _POSIX_Timer_TSR,
          ptimer
        );
-       if ( !activated )
+       if ( !activated ) {
+         _Thread_Enable_dispatch();
          return 0;
+       }
 
-       /* The timer has been started and is running */
-       /* return the old ones in "ovalue" */
+       /*
+        * The timer has been started and is running.  So we return the
+        * old ones in "ovalue"
+        */
        if ( ovalue )
          *ovalue = ptimer->timer_data;
        ptimer->timer_data = normalize;
@@ -114,7 +118,7 @@ int timer_settime(
        /* Indicate that the time is running */
        ptimer->state = POSIX_TIMER_STATE_CREATE_RUN;
        _TOD_Get( &ptimer->time );
-        _Thread_Enable_dispatch();
+       _Thread_Enable_dispatch();
        return 0;
 
 #if defined(RTEMS_MULTIPROCESSING)

cpukit/rtems/src/ratemonperiod.c

@@ -135,16 +135,16 @@ void _Rate_monotonic_Update_statistics(
       /* Grab CPU usage when the thread got switched in */
       used = _Thread_Executing->cpu_time_used;
 
-      /* partial period, cpu usage info reset while executing.  Throw away */
-      if (_Timespec_Less_than( &used, &the_period->owner_executed_at_period))
-        return;
-
       /* How much time time since last context switch */
       _Timespec_Subtract(&_Thread_Time_of_last_context_switch, &uptime, &ran);
 
       /* executed += ran */
       _Timespec_Add_to( &used, &ran );
 
+      /* partial period, cpu usage info reset while executing.  Throw away */
+      if (_Timespec_Less_than( &used, &the_period->owner_executed_at_period))
+        return;
+
        /* executed = current cpu usage - value at start of period */
       _Timespec_Subtract( 
          &the_period->owner_executed_at_period, &used, &executed
@@ -334,7 +334,7 @@ rtems_status_code rtems_rate_monotonic_period(
           /*
            *  Update statistics from the concluding period
            */
-          _Rate_monotonic_Initiate_statistics( the_period );
+          _Rate_monotonic_Update_statistics( the_period );
 
           _ISR_Enable( level );
 

cpukit/sapi/include/confdefs.h

@@ -938,6 +938,7 @@ extern rtems_configuration_table        Configuration;
 
   #define CONFIGURE_MEMORY_PER_TASK_FOR_POSIX_API \
     _Configure_From_workspace( \
+      CONFIGURE_MINIMUM_TASK_STACK_SIZE + \
       sizeof (POSIX_API_Control) + \
      (sizeof (void *) * (CONFIGURE_MAXIMUM_POSIX_KEYS)) \
     )

cpukit/score/src/objectsetname.c

@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2008.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -53,6 +53,7 @@ bool _Objects_Set_name(
     }
 
     strncpy( d, name, length );
+    d[ length ] = '\0';
     the_object->name.name_p = d;
   } else {
     the_object->name.name_u32 =  _Objects_Build_name(

doc/ChangeLog

@@ -1,3 +1,54 @@
+2011-02-09	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	* setup.def, common/cpright.texi: Update dates.
+
+2010-12-16	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	* Makefile.am, configure.ac, common/cpright.texi, common/rtems.texi.in,
+	cpu_supplement/.cvsignore, started/Makefile.am, started/binaries.t,
+	started/buildc.t, started/buildrt.t, started/intro.t,
+	started/nextstep.t, started/nt.t, started/require.t,
+	started/sample.t, started/started.texi: Major update which includes
+	removal of references to specific tool versions and patches.
+	* started/tversions.texi.in: Removed.
+
+2010-12-16	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	* Makefile.am, configure.ac, develenv/direct.t: Remove Getting Started
+	with GNAT/RTEMS.
+	* started_ada/.cvsignore, started_ada/Makefile.am,
+	started_ada/buildada.t, started_ada/gdb.t, started_ada/intro.t,
+	started_ada/require.t, started_ada/sample.t,
+	started_ada/started_ada.texi, started_ada/tversions.texi: Removed.
+
+2010-11-11	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1716/doc
+	* user/concepts.t: print_name example used a variable which did not
+	match the name of the passed in parameter.
+
+2010-11-01	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1714/doc
+	* user/datatypes.t: Add missing description of rtems_status_codes.
+
+2010-06-16	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1568/doc
+	* user/intr.t: Fix list of services callable from ISR.
+
+2010-05-18	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1520/doc
+	* user/part.t: Partition create discussion said it returned the number
+	of buffers created but it does not.
+
+2010-01-11	Marc Pignat <marc.pignat@hevs.ch>
+
+	PR 1490/doc
+	* user/clock.t: Fix typo. rtems_clock_get_ticks_per_second not
+	rtems_clock_get_ticks_per_seconds.
+
 2009-07-02	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* user/region.t: Fix typos where semaphore referenced instead of region

doc/Makefile.am

@@ -8,7 +8,7 @@ ACLOCAL_AMFLAGS = -I ../aclocal
 #       + tools, common and images are shared across many documents
 
 SUBDIRS = tools started user bsp_howto porting develenv posix_users \
-    posix1003.1 filesystem itron3.0 networking ada_user started_ada \
+    posix1003.1 filesystem networking ada_user \
     new_chapters relnotes cpu_supplement shell
 
 if USE_HTML
@@ -20,7 +20,9 @@ EXTRA_DIST = HELP.html rtems_header.html.in rtems_footer.html.in
 EXTRA_DIST += common/cpright.texi common/setup.texi \
     common/treedef.tex common/rtems.texi.in
 
+if USE_HTML
 html_imagesdir = $(htmldir)/images
+endif
 
 HTML_IMAGES = images/dir-arrow.gif images/dvi.gif images/missing-arrow.gif \
     images/next-arrow.gif images/oaronly.jpg images/pdf.gif images/pdf1.gif \

doc/common/cpright.texi

@@ -1,5 +1,5 @@
 @c
-@c  COPYRIGHT (c) 1988-2008.
+@c  COPYRIGHT (c) 1988-2011.
 @c  On-Line Applications Research Corporation (OAR).
 @c  All rights reserved.
 @c
@@ -17,7 +17,7 @@
 @end tex
 
 @vskip 0pt plus 1filll
-COPYRIGHT @copyright{} 1988 - 2008.@*
+COPYRIGHT @copyright{} 1988 - 2011.@*
 On-Line Applications Research Corporation (OAR).@*
 
 The authors have used their best efforts in preparing
@@ -36,5 +36,5 @@ Any inquiries concerning RTEMS, its related support
 components, its documentation, or any custom services
 for RTEMS should be directed to the contacts listed on
 that site.  A current list of RTEMS Support Providers
-is at @uref{http://www.rtems.com/support.html}.
+is at @uref{http://www.rtems.com/oarsupport}.
 

doc/common/rtems.texi.in

@@ -11,4 +11,3 @@
 @set RTEMSPREFIX		@RTEMSPREFIX@
 @set RTEMSAPI			@RTEMSAPI@
 @set RTEMSRPMPREFIX		@RTEMSRPMPREFIX@
-@set RTEMSRPMGROUP		@RTEMSRPMGROUP@

doc/configure.ac

@@ -137,30 +137,6 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 
 dnl Checks for library functions.
 
-AC_MSG_CHECKING([for ./setup.def])
-AS_IF([test -f ${srcdir}/setup.def],[
-. ${srcdir}/setup.def
-AC_MSG_RESULT([done])
-],[
-AC_MSG_ERROR([missing])
-])
-
-AS_IF([test -z "$binutils_patch_version"],
-[set_binutils_patch="@clear BINUTILSPATCHVERSION"],
-[set_binutils_patch="@set BINUTILSPATCHVERSION $binutils_patch_version"])
-
-AS_IF([test -z "$newlib_patch_version"],
-[set_newlib_patch="@clear NEWLIBPATCHVERSION"],
-[set_newlib_patch="@set NEWLIBPATCHVERSION $newlib_patch_version"])
-
-AS_IF([test -z "$gcc_patch_version"],
-[set_gcc_patch="@clear GCCPATCHVERSION"],
-[set_gcc_patch="@set GCCPATCHVERSION $gcc_patch_version"])
-
-AS_IF([test -z "$gdb_patch_version"],
-[set_gdb_patch="@clear GDBPATCHVERSION"],
-[set_gdb_patch="@set GDBPATCHVERSION $gdb_patch_version"])
-
 AC_CONFIG_SUBDIRS(tools)
 
 AC_CONFIG_FILES([Makefile],[],[
@@ -170,7 +146,6 @@ cat << EOF > common/rtems.sed~
 s/@RTEMSAPI@/RTEMS_API/;t t
 s,@RTEMSPREFIX@,$prefix,;t t
 s,@RTEMSRPMPREFIX@,$rpmprefix,;t t
-s,@RTEMSRPMGROUP@,RTEMS/]RTEMS_API[,;t t
 EOF
 _RTEMS_UPDATE_CONDITIONAL([common/rtems.sed],[common/rtems.sed~])
 ])
@@ -181,34 +156,14 @@ develenv/Makefile
 user/Makefile
 bsp_howto/Makefile])
 
-AC_CONFIG_FILES([started/Makefile],[],[
-test -d started || mkdir started
-cat << EOF > started/tversions.sed~
-:t
-s/@GCCVERSION@/$gcc_version/;t t
-s/@BINUTILSVERSION@/$binutils_version/;t t
-s/@NEWLIBVERSION@/$newlib_version/;t t
-s/@GDBVERSION@/$gdb_version/;t t
-s/@SETBINUTILSPATCHVERSION@/$set_binutils_patch/;t t
-s/@SETGCCPATCHVERSION@/$set_gcc_patch/;t t
-s/@SETNEWLIBPATCHVERSION@/$set_newlib_patch/;t t
-s/@SETGDBPATCHVERSION@/$set_gdb_patch/;t t
-s/@GCCRPMRELEASE@/$gccnewlib_rpm_release/;t t
-s/@BINUTILSRPMRELEASE@/$binutils_rpm_release/;t t
-s/@GDBRPMRELEASE@/$gdb_rpm_release/;t t
-EOF
-_RTEMS_UPDATE_CONDITIONAL([started/tversions.sed],[started/tversions.sed~])
-])
-
 AC_CONFIG_FILES([
 porting/Makefile
 networking/Makefile
 posix_users/Makefile
 posix1003.1/Makefile
 filesystem/Makefile
-itron3.0/Makefile
 ada_user/Makefile
-started_ada/Makefile
+started/Makefile
 relnotes/Makefile
 new_chapters/Makefile
 cpu_supplement/Makefile

doc/cpu_supplement/.cvsignore

@@ -1,4 +1,5 @@
 arm.texi
+avr.texi
 bfin.texi
 cpu_supplement
 cpu_supplement-?
@@ -24,6 +25,7 @@ cpu_supplement.vr
 general.texi
 i386.texi
 index.html
+lm32.texi
 m68k.texi
 Makefile
 Makefile.in
@@ -35,6 +37,8 @@ rtems_header.html
 rtemspie.pdf
 sh.texi
 sparc.texi
+sparc64.texi
 stamp-vti
 states.pdf
+tic4x.texi
 version.texi

doc/develenv/direct.t

@@ -1,5 +1,5 @@
 @c
-@c  COPYRIGHT (c) 1989-2007.
+@c  COPYRIGHT (c) 1989-2010.
 @c  On-Line Applications Research Corporation (OAR).
 @c  All rights reserved.
 @c
@@ -690,10 +690,6 @@ recent RTEMS releases.
 This directory contains the source code for the 
 @cite{Getting Started with RTEMS for C/C++ Users} manual.
 
-@item $@{RTEMS_ROOT@}/doc/started_ada/
-This directory contains the source code for the 
-@cite{Getting Started with RTEMS for Ada Users} manual.
-
 @item $@{RTEMS_ROOT@}/doc/tools/
 This directory contains the source code for the tools
 used on the development host to assist in producing the