Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

  Removed all go32 configuration tests.

  This patch also comments out some special treatment for Cygwin from
  *.m4 macros. According to reports from David Fiddes. these should
  not be necessary anymore.

6 files changed, 18 insertions, 34 deletions

diff --git a/aclocal/bsp-alias.m4 b/aclocal/bsp-alias.m4
index 8c726387d0..595b0d852c 100644
--- a/aclocal/bsp-alias.m4
+++ b/aclocal/bsp-alias.m4
@@ -10,7 +10,6 @@ AC_DEFUN(RTEMS_BSP_ALIAS,
     case $1 in
       mvme162lx)    $2=mvme162  ;;  # mvme162 board variant
       gen68360_040) $2=gen68360 ;;  # 68360 in companion mode
-      go32_p5)      $2=go32     ;;  # go32 on Pentium class CPU
       p4600)        $2=p4000    ;;  # p4000 board with IDT 4600
       p4650)        $2=p4000    ;;  # p4000 board with IDT 4650
       *)            $2=$1;;
diff --git a/aclocal/canonical-target-name.m4 b/aclocal/canonical-target-name.m4
index cf6890a4f2..ae4ea25caf 100644
--- a/aclocal/canonical-target-name.m4
+++ b/aclocal/canonical-target-name.m4
@@ -15,9 +15,6 @@ AC_MSG_CHECKING(rtems target cpu)
 changequote(,)dnl
 case "${target}" in
   # hpux unix port should go here
-  i[3456]86-go32-rtems*)
-	RTEMS_CPU=i386
-	;;
   i[3456]86-pc-linux*)		# unix "simulator" port
 	RTEMS_CPU=unix
 	;;
diff --git a/aclocal/canonicalize-tools.m4 b/aclocal/canonicalize-tools.m4
index ef9d241539..149e14ca66 100644
--- a/aclocal/canonicalize-tools.m4
+++ b/aclocal/canonicalize-tools.m4
@@ -12,16 +12,17 @@ dnl 98/02/12 Ralf Corsepius	(corsepiu@faw.uni-ulm.de)
 dnl
 
 AC_DEFUN(RTEMS_GCC_PRINT,
-[ case $host_os in
-  *cygwin*)
-    dnl FIXME: Hack for cygwin/egcs reporting mixed '\\' and '/'
-    dnl        Should be removed once cygwin/egcs reports '/' only
-    $1=`$CC_FOR_TARGET --print-prog-name=$2 | sed -e 's%\\\\%/%g' `
-    ;;
-  *)
+[
+dnl case $host_os in
+dnl  *cygwin*)
+dnl    dnl FIXME: Hack for cygwin/egcs reporting mixed '\\' and '/'
+dnl    dnl        Should be removed once cygwin/egcs reports '/' only
+dnl    $1=`$CC_FOR_TARGET --print-prog-name=$2 | sed -e 's%\\\\%/%g' `
+dnl    ;;
+dnl  *)
     $1=`$CC_FOR_TARGET --print-prog-name=$2`
-    ;;
-  esac
+dnl    ;;
+dnl  esac
 ])
 
 AC_DEFUN(RTEMS_PATH_TOOL,
diff --git a/aclocal/check-bsps.m4 b/aclocal/check-bsps.m4
index 673061c69a..0a2c74e0a3 100644
--- a/aclocal/check-bsps.m4
+++ b/aclocal/check-bsps.m4
@@ -9,13 +9,6 @@ AC_DEFUN(RTEMS_CHECK_BSPS,
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl sets RTEMS_CPU, target
 AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
 AC_MSG_CHECKING([for bsps])
-case "${target}" in
-changequote(,)dnl
-  i[3456]86-go32-rtems*)
-changequote([,])dnl
-    $1="go32 go32_p5"
-    ;;
-  *)
     files=`ls $srcdir/$RTEMS_TOPdir/c/src/lib/libbsp/$RTEMS_CPU`
     for file in $files; do
       case $file in
@@ -24,7 +17,6 @@ changequote([,])dnl
         READ*);;
         CVS*);;
         pxfl*);;
-        go32*);;       # so the i386 port can pick up the other Makefiles
         # Now account for BSPs with build variants
         gen68360)      rtems_bsp="$rtems_bsp gen68360 gen68360_040";;
         p4000)         rtems_bsp="$rtems_bsp p4600 p4650";;
@@ -32,8 +24,8 @@ changequote([,])dnl
         *) $1="[$]$1 $file";;
       esac;
     done
-    ;;
-esac
+dnl    ;;
+dnl esac
 AC_MSG_RESULT([[$]$1 .. done])
 ])dnl
 
diff --git a/aclocal/enable-posix.m4 b/aclocal/enable-posix.m4
index d19c9b41a6..ee2d9fd37f 100644
--- a/aclocal/enable-posix.m4
+++ b/aclocal/enable-posix.m4
@@ -16,9 +16,6 @@ AC_SUBST(RTEMS_HAS_POSIX_API)
 changequote(,)dnl
 case "${target}" in
   # hpux unix port should go here
-  i[3456]86-go32-rtems*)
-	RTEMS_HAS_POSIX_API=no
-	;;
   i[3456]86-pc-linux*)         # unix "simulator" port
 	RTEMS_HAS_POSIX_API=no
 	;;
diff --git a/aclocal/gcc-pipe.m4 b/aclocal/gcc-pipe.m4
index 3bee3e5e92..0550b60d9e 100644
--- a/aclocal/gcc-pipe.m4
+++ b/aclocal/gcc-pipe.m4
@@ -3,8 +3,6 @@ dnl $Id$
 dnl
 dnl Check whether the target compiler accepts -pipe
 dnl
-dnl 98/02/11 Ralf Corsepius     corsepiu@faw.uni-ulm.de
-dnl
 
 AC_DEFUN(RTEMS_GCC_PIPE,
 [AC_REQUIRE([RTEMS_PROG_CC]) 
@@ -13,17 +11,17 @@ AC_CACHE_CHECK(whether $CC_FOR_TARGET accepts --pipe,rtems_cv_gcc_pipe,
 [
 rtems_cv_gcc_pipe=no
 if test "$rtems_cv_prog_gcc" = "yes"; then
-case "$host_os" in
-  cygwin*)
-    ;;
-  *)
+dnl case "$host_os" in
+dnl   cygwin*)
+dnl    ;;
+dnl  *)
     echo 'void f(){}' >conftest.c
     if test -z "`${CC_FOR_TARGET} --pipe -c conftest.c 2>&1`";then
       rtems_cv_gcc_pipe=yes
     fi
     rm -f conftest*
-    ;;
-esac
+dnl    ;;
+dnl esac
 fi
 ])
 ])