Add support for h8300hn and h8300sn

4 files changed, 17 insertions, 40 deletions

diff --git a/libgloss/libnosys/sbrk.c b/libgloss/libnosys/sbrk.c
index 8091d7083..8c1c971aa 100644
--- a/libgloss/libnosys/sbrk.c
+++ b/libgloss/libnosys/sbrk.c
@@ -1,27 +1,18 @@
-/*
- * Version of sbrk for no operating system.
- */
+/* Version of sbrk for no operating system.  */
 
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <sys/types.h>
-#include <errno.h>
-#undef errno
-extern int errno;
-
-caddr_t 
-_DEFUN (_sbrk, (incr),
-        int incr)
+void *
+_sbrk (incr)
+     int incr;
 { 
-   extern char end; /* set by linker */
-   static char *heap_end; 
-   char *prev_heap_end; 
+   extern char   end; /* Set by linker.  */
+   static char * heap_end; 
+   char *        prev_heap_end; 
+
+   if (heap_end == 0)
+     heap_end = & end; 
 
-   if (heap_end == 0) { 
-      heap_end = &end; 
-   } 
    prev_heap_end = heap_end; 
    heap_end += incr; 
-   return (caddr_t) prev_heap_end; 
+
+   return (void *) prev_heap_end; 
 } 
diff --git a/libgloss/m32r/Makefile.in b/libgloss/m32r/Makefile.in
index ae20c1705..2dd3be0db 100644
--- a/libgloss/m32r/Makefile.in
+++ b/libgloss/m32r/Makefile.in
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-VPATH = @srcdir@
+VPATH = @srcdir@ @srcdir@/..
 srcdir = @srcdir@
 objdir = .
 srcroot = $(srcdir)/../..
diff --git a/libgloss/m32r/configure b/libgloss/m32r/configure
index 08285ab20..b4a5c1174 100755
--- a/libgloss/m32r/configure
+++ b/libgloss/m32r/configure
@@ -1067,8 +1067,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile
-. ${srcdir}/../../config-ml.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1134,7 +1133,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
@@ -1167,8 +1166,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile
-. ${srcdir}/../../config-ml.in"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -1232,11 +1230,6 @@ cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${srcdir}/../..
 
 exit 0
 EOF
diff --git a/libgloss/m32r/configure.in b/libgloss/m32r/configure.in
index cdc118bf4..c78c77953 100644
--- a/libgloss/m32r/configure.in
+++ b/libgloss/m32r/configure.in
@@ -72,11 +72,4 @@ host_makefile_frag_path=$host_makefile_frag
 AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
-AC_OUTPUT(Makefile
-. ${srcdir}/../../config-ml.in,
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${srcdir}/../..
-)
+AC_OUTPUT(Makefile)