Patch rtems-rc-20000104-15.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

that fixes the following problems:

  1. Removing bogus ';' in some configure.in (cosmetical fix)
  2. Moves GAS_CODE16 checks to libbsp/i386/*/configure.in (essential fix)

  #2 was responsible for the gcc/binutils-2.9.5 choking while building for
  the pc386.

7 files changed, 14 insertions, 10 deletions

diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in
index f251f13663..2128e569a7 100644
--- a/c/src/lib/configure.in
+++ b/c/src/lib/configure.in
@@ -28,10 +28,6 @@ dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
 
-dnl if this is an i386, does gas have good code16 support?
-RTEMS_I386_GAS_CODE16
-AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");
-
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/configure.in b/c/src/lib/libbsp/configure.in
index d237d7d990..20b70cfe04 100644
--- a/c/src/lib/libbsp/configure.in
+++ b/c/src/lib/libbsp/configure.in
@@ -28,10 +28,6 @@ dnl check target cc
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
 
-dnl if this is an i386, does gas have good code16 support?
-RTEMS_I386_GAS_CODE16
-AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");
-
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/i386/i386ex/configure.in b/c/src/lib/libbsp/i386/i386ex/configure.in
index 91d3b6d81c..db4a1f64e0 100644
--- a/c/src/lib/libbsp/i386/i386ex/configure.in
+++ b/c/src/lib/libbsp/i386/i386ex/configure.in
@@ -19,6 +19,10 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST
 
+dnl if this is an i386, does gas have good code16 support?
+RTEMS_I386_GAS_CODE16
+AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");
+
 RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
diff --git a/c/src/lib/libbsp/i386/pc386/configure.in b/c/src/lib/libbsp/i386/pc386/configure.in
index 7fadd4dcaf..de69062104 100644
--- a/c/src/lib/libbsp/i386/pc386/configure.in
+++ b/c/src/lib/libbsp/i386/pc386/configure.in
@@ -19,6 +19,10 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST
 
+dnl if this is an i386, does gas have good code16 support?
+RTEMS_I386_GAS_CODE16
+AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");
+
 RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
diff --git a/c/src/lib/libbsp/i386/ts_386ex/configure.in b/c/src/lib/libbsp/i386/ts_386ex/configure.in
index 3bf08ccc7d..68ffccec5b 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/configure.in
+++ b/c/src/lib/libbsp/i386/ts_386ex/configure.in
@@ -19,6 +19,10 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST
 
+dnl if this is an i386, does gas have good code16 support?
+RTEMS_I386_GAS_CODE16
+AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");
+
 RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
diff --git a/c/src/lib/libbsp/m68k/mvme136/configure.in b/c/src/lib/libbsp/m68k/mvme136/configure.in
index 816548cab2..6e59adc2b4 100644
--- a/c/src/lib/libbsp/m68k/mvme136/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme136/configure.in
@@ -19,7 +19,7 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CANONICAL_HOST
 
-AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes");
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
 RTEMS_PROJECT_ROOT
 
diff --git a/c/src/lib/libbsp/m68k/mvme147s/configure.in b/c/src/lib/libbsp/m68k/mvme147s/configure.in
index 3185756beb..6278fedb18 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/configure.in
+++ b/c/src/lib/libbsp/m68k/mvme147s/configure.in
@@ -19,7 +19,7 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CANONICAL_HOST
 
-AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes");
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
 RTEMS_PROJECT_ROOT