Stack checker extension now accounted for in confdefs.h

27 files changed, 3 insertions, 201 deletions

diff --git a/c/src/lib/libbsp/a29k/portsw/startup/bspstart.c b/c/src/lib/libbsp/a29k/portsw/startup/bspstart.c
index 8f16c87e53..fea377e66d 100644
--- a/c/src/lib/libbsp/a29k/portsw/startup/bspstart.c
+++ b/c/src/lib/libbsp/a29k/portsw/startup/bspstart.c
@@ -169,14 +169,6 @@ int bsp_start(
 
   BSP_Configuration = Configuration;
 
-#ifdef STACK_CHECKER_ON
-    /*
-     * Add 1 extension for stack checker
-     */
- 
-    BSP_Configuration.maximum_extensions++;
-#endif
-
   /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c b/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c
index 193a91b03b..ff9c0e26fa 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/bspstart.c
@@ -346,14 +346,6 @@ void bsp_start(void)
     }
 #endif
 
-#ifdef STACK_CHECKER_ON
-    /*
-     * Add 1 extension for stack checker
-     */
-
-    BSP_Configuration.maximum_extensions++;
-#endif
-
 #if SIMHPPA_FAST_IDLE
     /*
      * Add 1 extension for fast idle
diff --git a/c/src/lib/libbsp/i386/force386/startup/bspstart.c b/c/src/lib/libbsp/i386/force386/startup/bspstart.c
index 95e54e259d..98d8d2ba32 100644
--- a/c/src/lib/libbsp/i386/force386/startup/bspstart.c
+++ b/c/src/lib/libbsp/i386/force386/startup/bspstart.c
@@ -157,14 +157,6 @@ void bsp_start( void )
      RAM_END - BSP_Configuration.work_space_size;
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/i386/go32/startup/bspstart.c b/c/src/lib/libbsp/i386/go32/startup/bspstart.c
index 6232ea0a03..cdf2ac4079 100644
--- a/c/src/lib/libbsp/i386/go32/startup/bspstart.c
+++ b/c/src/lib/libbsp/i386/go32/startup/bspstart.c
@@ -167,14 +167,6 @@ int main(
   }
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-  BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
index b908504516..4b666781f0 100644
--- a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
+++ b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
@@ -172,11 +172,9 @@ void bsp_start( void )
 
 
   /*
-   * Add another extension if using the stack checker
+   * Tell libio how many fd's we want and allow it to tweak config
    */
 
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
+  rtems_libio_config(&BSP_Configuration, BSP_LIBIO_MAX_FDS);
 
 }
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c
index 8a663b5102..46df06836c 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c
+++ b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c
@@ -172,12 +172,6 @@ void bsp_start( void )
   BSP_Configuration.work_space_start =
                           (void *)(RAM_END - BSP_Configuration.work_space_size);
 
-  /* Add another extension if using the stack checker.              */
-
-#ifdef STACK_CHECKER_ON
-  BSP_Configuration.maximum_extensions++;
-#endif
-
   /* Tell libio how many fd's we want and allow it to tweak config. */
 
   rtems_libio_config(&BSP_Configuration, BSP_LIBIO_MAX_FDS);
diff --git a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c
index cafb9d3e64..725817ae79 100644
--- a/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c
+++ b/c/src/lib/libbsp/i960/cvme961/startup/bspstart.c
@@ -172,14 +172,6 @@ void bsp_start( void )
   BSP_Configuration = Configuration;
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c
index 2ae0703873..000f0b0004 100644
--- a/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/dmv152/startup/bspstart.c
@@ -186,14 +186,6 @@ void bsp_start( void )
   console_reserve_resources( &BSP_Configuration );
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c b/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c
index ad3afcd7f4..ada1700cc1 100644
--- a/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/efi332/startup/bspstart.c
@@ -158,14 +158,6 @@ void bsp_start( void )
     (((unsigned int)_end + STACK_SIZE + 0x100) & 0xffffff00);
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/m68k/efi68k/startup/bspstart.c b/c/src/lib/libbsp/m68k/efi68k/startup/bspstart.c
index c1eb7b47b3..ed4ffd8712 100644
--- a/c/src/lib/libbsp/m68k/efi68k/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/efi68k/startup/bspstart.c
@@ -167,14 +167,6 @@ void bsp_start( void )
     (((unsigned int)_end + STACK_SIZE + 0x100) & 0xffffff00);
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c
index 53dc90eb3b..4c027b7f38 100644
--- a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c
@@ -146,14 +146,6 @@ void bsp_start( void )
   BSP_Configuration = Configuration;
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c
index c9d7847a54..8546370ee1 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/gen68360/startup/bspstart.c
@@ -142,14 +142,6 @@ void bsp_start( void )
   BSP_Configuration = Configuration;
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c
index fb34077c3a..d75d223af3 100644
--- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c
@@ -187,14 +187,6 @@ void bsp_start( void )
      (RAM_END - BSP_Configuration.work_space_size);
  
   /*
-   * Add another extension if using the stack checker
-   */
- 
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
- 
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
index 80fed12d14..41ea519cd1 100644
--- a/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
@@ -168,14 +168,6 @@ void bsp_start( void )
      (RAM_END - BSP_Configuration.work_space_size);
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c
index 280657c8ea..adf5fa48c0 100644
--- a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c
@@ -176,14 +176,6 @@ void bsp_start( void )
      (RAM_END - BSP_Configuration.work_space_size);
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c
index 42874bc84f..8137e1e9f0 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c
@@ -236,14 +236,6 @@ void bsp_start( void )
      (RAM_END - BSP_Configuration.work_space_size);
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c
index dfc969a0a4..f0af7dca97 100644
--- a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c
@@ -191,14 +191,6 @@ void bsp_start( void )
   BSP_Configuration = Configuration;
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c
index 721aa58c82..03caa34253 100644
--- a/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c
@@ -145,14 +145,6 @@ void bsp_start( void )
   BSP_Configuration = Configuration;
 
   /*
-   * Add another extension if using the stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/mips/p4000/startup/bspstart.c b/c/src/lib/libbsp/mips/p4000/startup/bspstart.c
index 6d97ec7528..b57ad9136a 100644
--- a/c/src/lib/libbsp/mips/p4000/startup/bspstart.c
+++ b/c/src/lib/libbsp/mips/p4000/startup/bspstart.c
@@ -151,14 +151,6 @@ void bsp_start( void )
 
   BSP_Configuration = Configuration;
 
-#ifdef STACK_CHECKER_ON
-    /*
-     * Add 1 extension for stack checker
-     */
- 
-    BSP_Configuration.maximum_extensions++;
-#endif
-
   /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
diff --git a/c/src/lib/libbsp/mips64orion/p4000/startup/bspstart.c b/c/src/lib/libbsp/mips64orion/p4000/startup/bspstart.c
index 6d97ec7528..b57ad9136a 100644
--- a/c/src/lib/libbsp/mips64orion/p4000/startup/bspstart.c
+++ b/c/src/lib/libbsp/mips64orion/p4000/startup/bspstart.c
@@ -151,14 +151,6 @@ void bsp_start( void )
 
   BSP_Configuration = Configuration;
 
-#ifdef STACK_CHECKER_ON
-    /*
-     * Add 1 extension for stack checker
-     */
- 
-    BSP_Configuration.maximum_extensions++;
-#endif
-
   /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c
index ed6db0f908..b1e3588fa4 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c
@@ -149,14 +149,6 @@ int bsp_start(
 
   BSP_Configuration = Configuration;
 
-#ifdef STACK_CHECKER_ON
-    /*
-     * Add 1 extension for stack checker
-     */
- 
-    BSP_Configuration.maximum_extensions++;
-#endif
-
   /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c b/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c
index 15941b1433..7905d1258f 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c
@@ -160,14 +160,6 @@ void bsp_start( void )
   BSP_Configuration = Configuration;
 
   /*
-   * Add 1 extension for stack checker
-   */
-
-#ifdef STACK_CHECKER_ON
-    BSP_Configuration.maximum_extensions++;
-#endif
-
-  /*
    * Tell libio how many fd's we want and allow it to tweak config
    */
 
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
index 9262d95461..f1f407ddef 100644
--- a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
@@ -310,13 +310,6 @@ void bsp_start( void )
 #endif
 
   /*
-   * Add 1 extension for MPCI_fatal
-   */
-
-  if (BSP_Configuration.User_multiprocessing_table)
-    BSP_Configuration.maximum_extensions++;
-
-  /*
    * Set the "clicks per tick" for the simulator
    *  used by XXX/clock/clock.c to schedule interrupts
    *
diff --git a/c/src/lib/libbsp/powerpc/psim/tools/Makefile.in b/c/src/lib/libbsp/powerpc/psim/tools/Makefile.in
index 5d3472ea44..5e5b785fc9 100644
--- a/c/src/lib/libbsp/powerpc/psim/tools/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/psim/tools/Makefile.in
@@ -20,6 +20,7 @@ INSTALLED=$(PGMS:%=$(DESTDIR)/%)
 all:	$(DESTDIR) $(PGMS) install
 
 install:  $(INSTALLED)
+	rm -f $(DESTDIR)/psim-gdb
 	cp $(DESTDIR)/psim $(DESTDIR)/psim-gdb
 
 # Install the program
diff --git a/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c
index 51fb274b83..74431d0f7b 100644
--- a/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c
+++ b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c
@@ -151,14 +151,6 @@ void bsp_start(void)
 
   BSP_Configuration = Configuration;
 
-#ifdef STACK_CHECKER_ON
-    /*
-     * Add 1 extension for stack checker
-     */
- 
-    BSP_Configuration.maximum_extensions++;
-#endif
-
   /*
    *  Need to "allocate" the memory for the RTEMS Workspace and
    *  tell the RTEMS configuration where it is.  This memory is
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/bspstart.c b/c/src/lib/libbsp/sparc/erc32/startup/bspstart.c
index a7c343d47b..e58369b362 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/bspstart.c
+++ b/c/src/lib/libbsp/sparc/erc32/startup/bspstart.c
@@ -298,14 +298,6 @@ void bsp_start( void )
 
   console_reserve_resources( &BSP_Configuration );
 
-#ifdef STACK_CHECKER_ON
-  /*
-   * Add 1 extension for stack checker
-   */
-
-  BSP_Configuration.maximum_extensions++;
-#endif
-
 #if SIMSPARC_FAST_IDLE
   /*
    * Add 1 extension for fast idle
diff --git a/c/src/lib/libbsp/unix/posix/startup/bspstart.c b/c/src/lib/libbsp/unix/posix/startup/bspstart.c
index 85a0b3ddde..5a86555b63 100644
--- a/c/src/lib/libbsp/unix/posix/startup/bspstart.c
+++ b/c/src/lib/libbsp/unix/posix/startup/bspstart.c
@@ -302,14 +302,6 @@ bsp_start(void)
 
     Cpu_table.extra_mpci_receive_server_stack = 0;
 
-#ifdef STACK_CHECKER_ON
-  /*
-   * Add 1 extension for stack checker
-   */
-
-    BSP_Configuration.maximum_extensions++;
-#endif
-
   /*
    * Tell libio how many fd's we want and allow it to tweak config
    */