Amiga ISO Collection/AmigaUtilCD2.iso/Programming/GCC/GCC258_1.LHA/gcc/src-patches/gcc-2.5.8-amiga.diffs

Text File | 1994-02-10 | 102.6 KB | 3,243 lines

diff -rc --new-file gcc-2.5.8/Makefile.in gcc-2.5.8-amiga/Makefile.in
*** gcc-2.5.8/Makefile.in    Thu Nov 25 23:08:52 1993
--- gcc-2.5.8-amiga/Makefile.in    Sun Dec 12 17:25:01 1993
***************
*** 58,68 ****
  AR_FLAGS = rc
  SHELL = /bin/sh
  # on sysV, define this as cp.
! INSTALL = install -c
  # These permit overriding just for certain files.
  INSTALL_PROGRAM = $(INSTALL)
  INSTALL_DATA = $(INSTALL)
  SYMLINK = ln -s
  MAKEINFO = makeinfo
  TEXI2DVI = texi2dvi

--- 58,71 ----
  AR_FLAGS = rc
  SHELL = /bin/sh
  # on sysV, define this as cp.
! INSTALL = cp
  # These permit overriding just for certain files.
  INSTALL_PROGRAM = $(INSTALL)
  INSTALL_DATA = $(INSTALL)
  SYMLINK = ln -s
+ # Some systems don't support hardlinks.  For this case, a simple copy
+ # will achieve the same results for our purposes.
+ HARDLINK = ln
  MAKEINFO = makeinfo
  TEXI2DVI = texi2dvi

***************
*** 90,102 ****
  OLDAR = ar

  # Target to use when installing include directory.  Either
! # install-headers-tar or install-headers-cpio.
  INSTALL_HEADERS_DIR = install-headers-tar

  # The GCC to use for compiling libgcc2.a, enquire, and cross-test.
  # Usually the one we just built.
  # Don't use this as a dependency--use $(GCC_PASSES) or $(GCC_PARTS).
! GCC_FOR_TARGET = ./xgcc -B./

  # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET.
  # It omits XCFLAGS, and specifies -B./.
--- 93,106 ----
  OLDAR = ar

  # Target to use when installing include directory.  Either
! # install-headers-tar install-headers-cpio, or install-headers-cp.
  INSTALL_HEADERS_DIR = install-headers-tar

  # The GCC to use for compiling libgcc2.a, enquire, and cross-test.
  # Usually the one we just built.
  # Don't use this as a dependency--use $(GCC_PASSES) or $(GCC_PARTS).
! XGCC = xgcc
! GCC_FOR_TARGET = ./$(XGCC) -B./

  # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET.
  # It omits XCFLAGS, and specifies -B./.
***************
*** 145,150 ****
--- 149,157 ----
  # Directory in which to put localized header files. On the systems with
  # gcc as the native cc, `local_prefix' may not be `prefix' which is
  # `/usr'.
+ # Similar considerations apply for toolkits located on non-writable storage,
+ # such as CD-ROM, where we need a completely separate place to put local
+ # include files.
  # NOTE: local_prefix *should not* default from prefix.
  local_prefix = /usr/local
  # Directory in which to put host dependent programs and libraries
***************
*** 549,555 ****
      $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o xgcc gcc.o version.o $(LIBS)

  # Dump a specs file to make -B./ read these specs over installed ones.
! specs: xgcc
      $(GCC_FOR_TARGET) -dumpspecs > specs

  # Create the compiler driver for g++.
--- 556,562 ----
      $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o xgcc gcc.o version.o $(LIBS)

  # Dump a specs file to make -B./ read these specs over installed ones.
! specs: xgcc xgccv
      $(GCC_FOR_TARGET) -dumpspecs > specs

  # Create the compiler driver for g++.
***************
*** 752,759 ****
  # the second ar command tries to overwrite this file.  To avoid the error
  # message from ar, we make sure all files are writable.
      -(cd tmpcopy; chmod +w * > /dev/null 2>&1)
!     (cd tmpcopy; $(AR) x ../$(LIBGCC2))
!     (cd tmpcopy; $(AR) $(AR_FLAGS) ../tmplibgcc.a *.o)
      rm -rf tmpcopy
      -if $(RANLIB_TEST) ; then $(RANLIB) tmplibgcc.a; else true; fi
  # Actually build it in tmplibgcc.a, then rename at end,
--- 759,767 ----
  # the second ar command tries to overwrite this file.  To avoid the error
  # message from ar, we make sure all files are writable.
      -(cd tmpcopy; chmod +w * > /dev/null 2>&1)
! # The "cd..; wait" makes sure that the lock on tmpcopy has time to disappear.
!     (cd tmpcopy; $(AR) x ../$(LIBGCC2); cd ..; /c/wait 2)
!     (cd tmpcopy; $(AR) $(AR_FLAGS) ../tmplibgcc.a *.o; cd ..; /c/wait 2)
      rm -rf tmpcopy
      -if $(RANLIB_TEST) ; then $(RANLIB) tmplibgcc.a; else true; fi
  # Actually build it in tmplibgcc.a, then rename at end,
***************
*** 770,779 ****
      cd objc; \
      $(MAKE) -f $${srcdir1}/objc/Makefile libobjc.a \
        srcdir=$${srcdir1} tooldir=$(tooldir) AR="$(AR)" AR_FLAGS="$(AR_FLAGS)" \
!       GCC_FOR_TARGET="$${thisdir1}/xgcc -B$${thisdir1}/" \
        GCC_CFLAGS="$(GCC_CFLAGS)"
      -rm -f libobjc.a
!     ln objc/libobjc.a . >/dev/null 2>&1 || cp objc/libobjc.a .
      -if $(RANLIB_TEST) ; then $(RANLIB) libobjc.a; else true; fi

  # This is used by objc/Makefile if the user runs that directly.
--- 778,787 ----
      cd objc; \
      $(MAKE) -f $${srcdir1}/objc/Makefile libobjc.a \
        srcdir=$${srcdir1} tooldir=$(tooldir) AR="$(AR)" AR_FLAGS="$(AR_FLAGS)" \
!       GCC_FOR_TARGET="$${thisdir1}/$(XGCC) -B$${thisdir1}/" \
        GCC_CFLAGS="$(GCC_CFLAGS)"
      -rm -f libobjc.a
!     cp objc/libobjc.a . >/dev/null 2>&1 || cp objc/libobjc.a .
      -if $(RANLIB_TEST) ; then $(RANLIB) libobjc.a; else true; fi

  # This is used by objc/Makefile if the user runs that directly.
***************
*** 783,789 ****
      cd objc; \
      $(MAKE) -f $$srcdir1/objc/Makefile libobjc.a \
        srcdir=$$srcdir1 tooldir=$(tooldir) AR="$(AR)" AR_FLAGS="$(AR_FLAGS)" \
!       GCC_FOR_TARGET="$$thisdir1/xgcc -B$$thisdir1/" \
        GCC_CFLAGS="$(GCC_CFLAGS)"

  # Compile two additional files that are linked with every program
--- 791,797 ----
      cd objc; \
      $(MAKE) -f $$srcdir1/objc/Makefile libobjc.a \
        srcdir=$$srcdir1 tooldir=$(tooldir) AR="$(AR)" AR_FLAGS="$(AR_FLAGS)" \
!       GCC_FOR_TARGET="$$thisdir1/$(XGCC) -B$$thisdir1/" \
        GCC_CFLAGS="$(GCC_CFLAGS)"

  # Compile two additional files that are linked with every program
***************
*** 872,878 ****
  # To make a configuration always use collect2, set USE_COLLECT2 to ld.
  ld: collect2
      rm -f ld
!     ln collect2 ld

  collect2 : collect2.o version.o $(LIBDEPS)
  # Don't try modifying collect2 (aka ld) in place--it might be linking this.
--- 880,886 ----
  # To make a configuration always use collect2, set USE_COLLECT2 to ld.
  ld: collect2
      rm -f ld
!     cp collect2 ld

  collect2 : collect2.o version.o $(LIBDEPS)
  # Don't try modifying collect2 (aka ld) in place--it might be linking this.
***************
*** 1383,1389 ****
  # Making the preprocessor
  cpp: cccp
      -rm -f cpp
!     ln cccp cpp
  cccp: cccp.o cexp.o version.o $(LIBDEPS)
      $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o cccp cccp.o cexp.o version.o $(LIBS)
  cexp.o: $(srcdir)/cexp.c $(CONFIG_H)
--- 1391,1397 ----
  # Making the preprocessor
  cpp: cccp
      -rm -f cpp
!     cp cccp cpp
  cccp: cccp.o cexp.o version.o $(LIBDEPS)
      $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o cccp cccp.o cexp.o version.o $(LIBS)
  cexp.o: $(srcdir)/cexp.c $(CONFIG_H)
***************
*** 1541,1547 ****
        for dir in $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS); do \
          if [ -d $$dir ]; \
          then \
!           $(srcdir)/$(FIXINCLUDES) include $$dir $(srcdir) "`pwd`/xgcc -B`pwd`/"; \
          else true; fi; \
        done; \
      else true; \
--- 1549,1555 ----
        for dir in $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS); do \
          if [ -d $$dir ]; \
          then \
!           $(srcdir)/$(FIXINCLUDES) include $$dir $(srcdir) "`pwd`/$(XGCC) -B`pwd`/"; \
          else true; fi; \
        done; \
      else true; \
***************
*** 1563,1569 ****
      cd objc; \
      $(MAKE) -f $${srcdir1}/objc/Makefile copy-headers \
      srcdir=$${srcdir1} tooldir=$(tooldir) AR="$(AR)" AR_FLAGS="$(AR_FLAGS)" \
!     GCC_FOR_TARGET="$${thisdir1}/xgcc -B$${thisdir1}/" \
      GCC_CFLAGS="$(GCC_CFLAGS)" incinstalldir=$${thisdir1}/include
      touch objc-headers

--- 1571,1577 ----
      cd objc; \
      $(MAKE) -f $${srcdir1}/objc/Makefile copy-headers \
      srcdir=$${srcdir1} tooldir=$(tooldir) AR="$(AR)" AR_FLAGS="$(AR_FLAGS)" \
!     GCC_FOR_TARGET="$${thisdir1}/$(XGCC) -B$${thisdir1}/" \
      GCC_CFLAGS="$(GCC_CFLAGS)" incinstalldir=$${thisdir1}/include
      touch objc-headers

***************
*** 1845,1864 ****
          $(INSTALL_PROGRAM) g++-cross $(bindir)/$(target)-g++; \
          chmod a+x $(bindir)/$(target)-g++; \
          rm -f $(bindir)/$(target)-c++; \
!         ln $(bindir)/$(target)-g++ $(bindir)/$(target)-c++; \
        fi ; \
      else \
        rm -f $(bindir)/gcc; \
        $(INSTALL_PROGRAM) xgcc $(bindir)/gcc; \
        rm -f $(bindir)/$(target)-gcc-1; \
!       ln $(bindir)/gcc $(bindir)/$(target)-gcc-1; \
        mv $(bindir)/$(target)-gcc-1 $(bindir)/$(target)-gcc; \
        if [ -f cc1plus ] ; then \
          rm -f $(bindir)/g++; \
          $(INSTALL_PROGRAM) g++ $(bindir)/g++; \
          chmod a+x $(bindir)/g++; \
          rm -f $(bindir)/c++; \
!         ln $(bindir)/g++ $(bindir)/c++; \
        fi ; \
      fi
  # Install protoize if it was compiled.
--- 1853,1872 ----
          $(INSTALL_PROGRAM) g++-cross $(bindir)/$(target)-g++; \
          chmod a+x $(bindir)/$(target)-g++; \
          rm -f $(bindir)/$(target)-c++; \
!         $(HARDLINK) $(bindir)/$(target)-g++ $(bindir)/$(target)-c++; \
        fi ; \
      else \
        rm -f $(bindir)/gcc; \
        $(INSTALL_PROGRAM) xgcc $(bindir)/gcc; \
        rm -f $(bindir)/$(target)-gcc-1; \
!       $(HARDLINK) $(bindir)/gcc $(bindir)/$(target)-gcc-1; \
        mv $(bindir)/$(target)-gcc-1 $(bindir)/$(target)-gcc; \
        if [ -f cc1plus ] ; then \
          rm -f $(bindir)/g++; \
          $(INSTALL_PROGRAM) g++ $(bindir)/g++; \
          chmod a+x $(bindir)/g++; \
          rm -f $(bindir)/c++; \
!         $(HARDLINK) $(bindir)/g++ $(bindir)/c++; \
        fi ; \
      fi
  # Install protoize if it was compiled.
***************
*** 1924,1930 ****
          dest=`ls -ld $(libsubdir)/include/$$i | sed -n 's/.*-> //p'`; \
          if expr "$$dest" : "$$dir.*" > /dev/null; then \
            rm -f $(libsubdir)/include/$$i; \
!           ln -s `echo $$i | sed "s|/[^/]*|/..|g" | sed 's|/..$$||'``echo "$$dest" | sed "s|$$dir||"` $(libsubdir)/include/$$i; \
          fi; \
        done; \
      fi
--- 1932,1938 ----
          dest=`ls -ld $(libsubdir)/include/$$i | sed -n 's/.*-> //p'`; \
          if expr "$$dest" : "$$dir.*" > /dev/null; then \
            rm -f $(libsubdir)/include/$$i; \
!           $(HARDLINK) -s `echo $$i | sed "s|/[^/]*|/..|g" | sed 's|/..$$||'``echo "$$dest" | sed "s|$$dir||"` $(libsubdir)/include/$$i; \
          fi; \
        done; \
      fi
***************
*** 1947,1952 ****
--- 1955,1964 ----
  install-headers-cpio: stmp-headers $(STMP_FIXPROTO) install-include-dir
      cd include; find . -print | cpio -pdum $(libsubdir)/include

+ # Install the include directory using simple recursive copy.
+ install-headers-cp: stmp-headers install-include-dir
+     cd include; cp -r . $(libsubdir)/include
+
  # Put assert.h where it won't override GNU libc's assert.h.
  # It goes in a dir that is searched after GNU libc's headers;
  # thus, the following conditionals are no longer needed.
***************
*** 2034,2040 ****
      mkdir tmp/config
      mkdir tmp/objc
      for file in *[0-9a-zA-Z+]; do \
!       ln $$file tmp > /dev/null 2>&1 || cp $$file tmp; \
      done
      cd config; \
      for file in *[0-9a-zA-Z+]; do \
--- 2046,2052 ----
      mkdir tmp/config
      mkdir tmp/objc
      for file in *[0-9a-zA-Z+]; do \
!       $(HARDLINK) $$file tmp > /dev/null 2>&1 || cp $$file tmp; \
      done
      cd config; \
      for file in *[0-9a-zA-Z+]; do \
***************
*** 2042,2061 ****
          mkdir ../tmp/config/$$file; \
          cd $$file; \
          for subfile in *[0-9a-zA-Z+]; do \
!           ln $$subfile ../../tmp/config/$$file >/dev/null 2>&1 \
            || cp $$subfile ../../tmp/config/$$file; \
          done; \
          cd ..; \
        else \
!         ln $$file ../tmp/config >/dev/null 2>&1 \
          || cp $$file ../tmp/config; \
        fi; \
      done
      cd objc; \
      for file in *[0-9a-zA-Z+]; do \
!       ln $$file ../tmp/objc >/dev/null 2>&1 || cp $$file ../tmp/objc; \
      done
!     ln .gdbinit tmp
      mv tmp gcc-$(version)
  # Get rid of everything we don't want in the distribution.
      cd gcc-$(version); make -f Makefile.in extraclean
--- 2054,2073 ----
          mkdir ../tmp/config/$$file; \
          cd $$file; \
          for subfile in *[0-9a-zA-Z+]; do \
!           $(HARDLINK) $$subfile ../../tmp/config/$$file >/dev/null 2>&1 \
            || cp $$subfile ../../tmp/config/$$file; \
          done; \
          cd ..; \
        else \
!         $(HARDLINK) $$file ../tmp/config >/dev/null 2>&1 \
          || cp $$file ../tmp/config; \
        fi; \
      done
      cd objc; \
      for file in *[0-9a-zA-Z+]; do \
!       $(HARDLINK) $$file ../tmp/objc >/dev/null 2>&1 || cp $$file ../tmp/objc; \
      done
!     $(HARDLINK) .gdbinit tmp
      mv tmp gcc-$(version)
  # Get rid of everything we don't want in the distribution.
      cd gcc-$(version); make -f Makefile.in extraclean
***************
*** 2074,2090 ****
  # in the intended test directory to make it a suitable test directory.
  # THIS IS OBSOLETE; use the -srcdir operand in configure instead.
  maketest:
!     ln -s $(DIR)/*.[chy] .
!     ln -s $(DIR)/configure .
!     ln -s $(DIR)/*.def .
      -rm -f =*
!     ln -s $(DIR)/.gdbinit .
!     ln -s $(DIR)/$(FIXINCLUDES) .
!     -ln -s $(DIR)/bison.simple .
!     ln -s $(DIR)/config .
!     ln -s $(DIR)/move-if-change .
  # The then and else were swapped to avoid a problem on Ultrix.
!     if [ ! -f Makefile ] ; then ln -s $(DIR)/Makefile .; else false; fi
      -rm tm.h aux-output.c config.h md
      make clean
  # You must then run config to set up for compilation.
--- 2086,2102 ----
  # in the intended test directory to make it a suitable test directory.
  # THIS IS OBSOLETE; use the -srcdir operand in configure instead.
  maketest:
!     cp $(DIR)/*.[chy] .
!     cp $(DIR)/configure .
!     cp $(DIR)/*.def .
      -rm -f =*
!     cp $(DIR)/.gdbinit .
!     cp $(DIR)/$(FIXINCLUDES) .
!     -cp $(DIR)/bison.simple .
!     cp $(DIR)/config .
!     cp $(DIR)/move-if-change .
  # The then and else were swapped to avoid a problem on Ultrix.
!     if [ ! -f Makefile ] ; then cp $(DIR)/Makefile .; else false; fi
      -rm tm.h aux-output.c config.h md
      make clean
  # You must then run config to set up for compilation.
***************
*** 2100,2116 ****
  # To prevent `make install' from compiling alloca.o and then relinking cc1
  # because alloca.o is newer, we permit these recursive makes to compile
  # alloca.o.  Then cc1 is newer, so it won't have to be relinked.
!     $(MAKE) CC="stage1/xgcc -Bstage1/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) LANGUAGES="$(LANGUAGES)"
      $(MAKE) stage2
!     $(MAKE) CC="stage2/xgcc -Bstage2/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) LANGUAGES="$(LANGUAGES)"

  bootstrap2: force
!     $(MAKE) CC="stage1/xgcc -Bstage1/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) LANGUAGES="$(LANGUAGES)"
      $(MAKE) stage2
!     $(MAKE) CC="stage2/xgcc -Bstage2/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) LANGUAGES="$(LANGUAGES)"

  bootstrap3: force
!     $(MAKE) CC="stage2/xgcc -Bstage2/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) LANGUAGES="$(LANGUAGES)"

  # Compare the object files in the current directory with those in the
  # stage2 directory.
--- 2112,2128 ----
  # To prevent `make install' from compiling alloca.o and then relinking cc1
  # because alloca.o is newer, we permit these recursive makes to compile
  # alloca.o.  Then cc1 is newer, so it won't have to be relinked.
!     $(MAKE) CC="stage1/$(XGCC) -Bstage1/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) LANGUAGES="$(LANGUAGES)"
      $(MAKE) stage2
!     $(MAKE) CC="stage2/$(XGCC) -Bstage2/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) LANGUAGES="$(LANGUAGES)"

  bootstrap2: force
!     $(MAKE) CC="stage1/$(XGCC) -Bstage1/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) LANGUAGES="$(LANGUAGES)"
      $(MAKE) stage2
!     $(MAKE) CC="stage2/$(XGCC) -Bstage2/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) LANGUAGES="$(LANGUAGES)"

  bootstrap3: force
!     $(MAKE) CC="stage2/$(XGCC) -Bstage2/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) LANGUAGES="$(LANGUAGES)"

  # Compare the object files in the current directory with those in the
  # stage2 directory.
***************
*** 2134,2161 ****
      -rm -f tmp-foo*

  # Copy the object files from a particular stage into a subdirectory.
! stage1: force
      -if [ -d stage1 ] ; then true ; else mkdir stage1 ; fi
      -mv $(STAGESTUFF) stage1
      -rm -f stage1/libgcc.a
      -cp libgcc.a stage1
      -if $(RANLIB_TEST) ; then $(RANLIB) stage1/libgcc.a; else true; fi

! stage2: force
      -if [ -d stage2 ] ; then true ; else mkdir stage2 ; fi
      -mv $(STAGESTUFF) stage2
      -rm -f stage2/libgcc.a
      -cp libgcc.a stage2
      -if $(RANLIB_TEST) ; then $(RANLIB) stage2/libgcc.a; else true; fi

! stage3: force
      -if [ -d stage3 ] ; then true ; else mkdir stage3 ; fi
      -mv $(STAGESTUFF) stage3
      -rm -f stage3/libgcc.a
      -cp libgcc.a stage3
      -if $(RANLIB_TEST) ; then $(RANLIB) stage3/libgcc.a; else true; fi

! stage4: force
      -if [ -d stage4 ] ; then true ; else mkdir stage4 ; fi
      -mv $(STAGESTUFF) stage4
      -rm -f stage4/libgcc.a
--- 2146,2173 ----
      -rm -f tmp-foo*

  # Copy the object files from a particular stage into a subdirectory.
! stage1: force $(EXTRA_STAGE1_TARGETS)
      -if [ -d stage1 ] ; then true ; else mkdir stage1 ; fi
      -mv $(STAGESTUFF) stage1
      -rm -f stage1/libgcc.a
      -cp libgcc.a stage1
      -if $(RANLIB_TEST) ; then $(RANLIB) stage1/libgcc.a; else true; fi

! stage2: force $(EXTRA_STAGE2_TARGETS)
      -if [ -d stage2 ] ; then true ; else mkdir stage2 ; fi
      -mv $(STAGESTUFF) stage2
      -rm -f stage2/libgcc.a
      -cp libgcc.a stage2
      -if $(RANLIB_TEST) ; then $(RANLIB) stage2/libgcc.a; else true; fi

! stage3: force $(EXTRA_STAGE3_TARGETS)
      -if [ -d stage3 ] ; then true ; else mkdir stage3 ; fi
      -mv $(STAGESTUFF) stage3
      -rm -f stage3/libgcc.a
      -cp libgcc.a stage3
      -if $(RANLIB_TEST) ; then $(RANLIB) stage3/libgcc.a; else true; fi

! stage4: force $(EXTRA_STAGE4_TARGETS)
      -if [ -d stage4 ] ; then true ; else mkdir stage4 ; fi
      -mv $(STAGESTUFF) stage4
      -rm -f stage4/libgcc.a
diff -rc --new-file gcc-2.5.8/c-parse.y gcc-2.5.8-amiga/c-parse.y
*** gcc-2.5.8/c-parse.y    Tue Nov 23 23:43:28 1993
--- gcc-2.5.8-amiga/c-parse.y    Sun Dec 12 17:25:17 1993
***************
*** 898,905 ****

  attrib
      : IDENTIFIER
!     { if (strcmp (IDENTIFIER_POINTER ($1), "packed")
            && strcmp (IDENTIFIER_POINTER ($1), "noreturn"))
          warning ("`%s' attribute directive ignored",
               IDENTIFIER_POINTER ($1));
        $$ = $1; }
--- 898,913 ----

  attrib
      : IDENTIFIER
!     {
! #ifdef HANDLE_ATTRIBUTE0
!       /* give the function a chance to validate further attributes */
!       if (HANDLE_ATTRIBUTE0 (IDENTIFIER_POINTER ($1)) ||
!           (strcmp (IDENTIFIER_POINTER ($1), "packed")
!           && strcmp (IDENTIFIER_POINTER ($1), "noreturn")))
! #else
!       if (strcmp (IDENTIFIER_POINTER ($1), "packed")
            && strcmp (IDENTIFIER_POINTER ($1), "noreturn"))
+ #endif
          warning ("`%s' attribute directive ignored",
               IDENTIFIER_POINTER ($1));
        $$ = $1; }
diff -rc --new-file gcc-2.5.8/calls.c gcc-2.5.8-amiga/calls.c
*** gcc-2.5.8/calls.c    Thu Dec  2 12:21:43 1993
--- gcc-2.5.8-amiga/calls.c    Sun Dec 12 17:25:23 1993
***************
*** 2107,2112 ****
--- 2107,2120 ----

    argvec = (struct arg *) alloca (nargs * sizeof (struct arg));

+ #if defined (__amigados__)
+ /* how would you do this RIGHT ?? fake a DECL node? dunno... */
+ #ifdef ENCODE_SECTION_INFO
+   /* mark it as a function (to be in the text section that is) */
+   SYMBOL_REF_FLAG (fun) = 1;
+ #endif
+ #endif
+
    INIT_CUMULATIVE_ARGS (args_so_far, NULL_TREE, fun);

    args_size.constant = 0;
diff -rc --new-file gcc-2.5.8/cccp.c gcc-2.5.8-amiga/cccp.c
*** gcc-2.5.8/cccp.c    Sat Dec 11 13:49:38 1993
--- gcc-2.5.8-amiga/cccp.c    Sun Dec 12 17:25:32 1993
***************
*** 39,44 ****
--- 39,60 ----
  #include "config.h"
  #endif /* not EMACS */

+ #ifdef amigados
+ /* Since cpp uses alloca to store all its read files, this is quite deadly
+    on a system with non-automatic stackgrowth like amigados, so we better
+    turn it off now.  Normally alloca is #defined to __builtin_alloca, so
+    undefining it causes an external alloca to be used.
+
+    Note that it's not wise to generally inhibit __builtin_alloca, since
+    using the generic emulator entitels a serious (!) speed penalty, and
+    it's bad enough that we have to live with it in cccp, don't make cc1
+    unbearably slow as well... */
+
+ #undef alloca
+
+ static int amigados_abs_filename ();
+ #endif
+
  #ifndef STANDARD_INCLUDE_DIR
  #define STANDARD_INCLUDE_DIR "/usr/include"
  #endif
***************
*** 1874,1884 ****
--- 1890,1904 ----
        char *p = in_fname;
        char *p1 = p;
        /* Discard all directory prefixes from P.  */
+ #ifdef FILE_NAME_NONDIRECTORY
+       p = FILE_NAME_NONDIRECTORY (p);
+ #else
        while (*p1) {
      if (*p1 == '/')
        p = p1 + 1;
      p1++;
        }
+ #endif
        /* Output P, but remove known suffixes.  */
        len = strlen (p);
        if (p[len - 2] == '.' && p[len - 1] == 'c')
***************
*** 3636,3642 ****

        if (!no_output && already_output == 0
        && (kt->pass_thru
!           || (kt->type == T_DEFINE
            && (dump_macros == dump_names
                || dump_macros == dump_definitions)))) {
          int len;
--- 3656,3662 ----

        if (!no_output && already_output == 0
        && (kt->pass_thru
!           || ((kt->type == T_DEFINE || kt->type == T_UNDEF)
            && (dump_macros == dump_names
                || dump_macros == dump_definitions)))) {
          int len;
***************
*** 3982,3987 ****
--- 4002,4019 ----
          search_start = dsp;
  #ifndef VMS
          ep = rindex (nam, '/');
+
+ #ifdef amigados
+         /* amigados uses unix-style directory-filename separation, but
+            has VMS-style logicals as well */
+
+         if (ep == NULL)
+           {
+         ep = rindex (nam, ':');
+         /* a ':' is part of the directory name, a '/' isn't ! */
+             if (ep != NULL) ep++;
+           }
+ #endif /* amigados */
  #else                /* VMS */
          ep = rindex (nam, ']');
          if (ep == NULL) ep = rindex (nam, '>');
***************
*** 4061,4067 ****
--- 4093,4103 ----

    /* If specified file name is absolute, just open it.  */

+ #ifndef amigados
    if (*fbeg == '/') {
+ #else
+   if (amigados_abs_filename (fbeg, flen)) {
+ #endif
      strncpy (fname, fbeg, flen);
      fname[flen] = 0;
      if (redundant_include_p (fname))
***************
*** 4084,4089 ****
--- 4120,4129 ----
      if (searchptr->fname[0] == 0)
        continue;
      strcpy (fname, searchptr->fname);
+
+ #ifdef amigados
+     if (fname[strlen (fname) - 1] != ':')
+ #endif
      strcat (fname, "/");
      fname[strlen (fname) + flen] = 0;
        } else {
***************
*** 9017,9025 ****
  perror_with_name (name)
       char *name;
  {
    fprintf (stderr, "%s: ", progname);
!   if (errno < sys_nerr)
!     fprintf (stderr, "%s: %s\n", name, sys_errlist[errno]);
    else
      fprintf (stderr, "%s: undocumented I/O error\n", name);
    errors++;
--- 9057,9067 ----
  perror_with_name (name)
       char *name;
  {
+   int error = errno;
+
    fprintf (stderr, "%s: ", progname);
!   if (error < sys_nerr)
!     fprintf (stderr, "%s: %s\n", name, sys_errlist[error]);
    else
      fprintf (stderr, "%s: undocumented I/O error\n", name);
    errors++;
***************
*** 9416,9418 ****
--- 9458,9484 ----
    return dst;
  }
  #endif /* VMS */
+
+
+ #ifdef amigados
+
+ /* This function returns whether the LEN characters long filename FNAME
+    is an absolute path specification. */
+
+ static int
+ amigados_abs_filename (fname, len)
+      char *fname;
+      int len;
+ {
+   /* we're using ixemul.library, which treats `/foo' as `foo:', so
+      fname[0] is to be considered absolute as well */
+   if (fname[0] == '/')
+     return 1;
+
+   /* else do an index() on fname, but one which is limited to len characters */
+   while (*fname && *fname != ':' && len)
+     fname++, len--;
+
+   return *fname == ':';
+ }
+ #endif /* amigados */
diff -rc --new-file gcc-2.5.8/config/m68k/amigados.c gcc-2.5.8-amiga/config/m68k/amigados.c
*** gcc-2.5.8/config/m68k/amigados.c    Thu Jan  1 00:00:00 1970
--- gcc-2.5.8-amiga/config/m68k/amigados.c    Sun Dec 12 17:25:35 1993
***************
*** 0 ****
--- 1,158 ----
+ /* Definitions of target machine for GNU compiler.  amiga 68000/68020 version.
+    Copyright (C) 1992 Free Software Foundation, Inc.
+    Contributed by Markus M. Wild ([e-mail]).
+
+ This file is part of GNU CC.
+
+ GNU CC 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, or (at your option)
+ any later version.
+
+ GNU CC 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 GNU CC; see the file COPYING.  If not, write to
+ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+ #include "m68k/m68k.c"
+
+ /* Does operand (which is a symbolic_operand) live in text space? If
+    so SYMBOL_REF_FLAG, which is set by ENCODE_SECTION_INFO, will be true.
+
+    This function is used in base relative code generation. */
+
+ int
+ read_only_operand (operand)
+      rtx operand;
+ {
+   if (GET_CODE (operand) == CONST)
+     operand = XEXP (XEXP (operand, 0), 0);
+   if (GET_CODE (operand) == SYMBOL_REF)
+     return SYMBOL_REF_FLAG (operand) || CONSTANT_POOL_ADDRESS_P (operand);
+   return 1;
+ }
+
+
+ /* the rest of the file is to implement AmigaDOS specific keywords some day.
+    The approach used so far used __attribute__ for this, but this required
+    changes to c-parse.y as well as if we'd use the common keywords used
+    on commercial AmigaDOS C-compilers as well. So in the future I'll probably
+    switch to __saveds and __interrupt keywords as well.
+
+    The rest of this file is currently ignored, because it's no longer
+    working with the current gcc version. */
+
+ #if not_yet_working
+
+ #include "tree.h"
+
+ struct attribute {
+   tree ident;
+   int  saveds : 1,
+        interrupt : 1;
+ };
+
+
+ static struct attribute *a_tab = 0;
+ static int a_index, a_size;
+
+ void
+ add_attr_entry (attr)
+     struct attribute *attr;
+ {
+   if (! a_tab)
+     {
+       a_size = 10;
+       a_index = 0;
+       a_tab  = (struct attribute *) xmalloc (a_size * sizeof (struct attribute));
+     }
+
+   if (a_index == a_size)
+     {
+       a_size <<= 1;
+       a_tab = (struct attribute *) xrealloc (a_tab, a_size * sizeof (struct attribute));
+     }
+
+   a_tab[a_index++] = *attr;
+ }
+
+
+ void
+ attr_do_saveds (function_ident)
+       tree function_ident;
+ {
+   struct attribute attr, *a;
+   int i;
+
+   for (i = 0, a = a_tab; i < a_index; i++, a++)
+     if (a->ident == function_ident)
+       {
+     a->saveds = 1;
+     return;
+       }
+
+   /* create a new entry for this function */
+   attr.ident     = function_ident;
+   attr.saveds    = 1;
+   attr.interrupt = 0;
+   add_attr_entry (&attr);
+ }
+
+ void
+ attr_do_interrupt (function_ident)
+     tree function_ident;
+ {
+   struct attribute attr, *a;
+   int i;
+
+   for (i = 0, a = a_tab; i < a_index; i++, a++)
+     if (a->ident == function_ident)
+       {
+     /* __interrupt implies __saveds */
+     a->saveds    = 1;
+     a->interrupt = 1;
+     return;
+       }
+
+   /* create a new entry for this function */
+   attr.ident     = function_ident;
+   attr.saveds     = 1;
+   attr.interrupt = 1;
+   add_attr_entry (&attr);
+ }
+
+ int
+ attr_does_saveds (function_name)
+     char *function_name;
+ {
+   tree ident = get_identifier (function_name);
+   struct attribute *attr;
+   int i;
+
+   for (i = 0, attr = a_tab; i < a_index; i++, attr++)
+     if (attr->ident == ident)
+       return attr->saveds;
+
+   return 0;
+ }
+
+ int
+ attr_does_interrupt (function_name)
+     char *function_name;
+ {
+   tree ident = get_identifier (function_name);
+   struct attribute *attr;
+   int i;
+
+   for (i = 0, attr = a_tab; i < a_index; i++, attr++)
+     if (attr->ident == ident)
+       return attr->interrupt;
+
+   return 0;
+ }
+
+ #endif
diff -rc --new-file gcc-2.5.8/config/m68k/amigados.h gcc-2.5.8-amiga/config/m68k/amigados.h
*** gcc-2.5.8/config/m68k/amigados.h    Thu Jan  1 00:00:00 1970
--- gcc-2.5.8-amiga/config/m68k/amigados.h    Sun Dec 12 17:25:37 1993
***************
*** 0 ****
--- 1,408 ----
+ /* Definitions of target machine for GNU compiler.  amiga 68000/68020 version.
+    Copyright (C) 1992 Free Software Foundation, Inc.
+    Contributed by Markus M. Wild ([e-mail]).
+
+ This file is part of GNU CC.
+
+ GNU CC 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, or (at your option)
+ any later version.
+
+ GNU CC 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 GNU CC; see the file COPYING.  If not, write to
+ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+ #include "m68k/m68k.h"
+
+ /* See m68k.h for bits in TARGET_DEFAULT.
+    0 means 68000, no hardware fpu (68881/68882/68040).
+    7 means 68020 (or higher) with hardware fpu.  */
+
+ #ifndef TARGET_DEFAULT
+ #define TARGET_DEFAULT 0
+ #endif
+
+ /* Define __HAVE_68881__ in preprocessor according to the -m flags.
+    This will control the use of inline 68881 insns in certain macros.
+    Also inform the program which CPU this is for.  */
+
+ #if TARGET_DEFAULT & 02
+
+ /* -m68881 is the default */
+ #define CPP_SPEC \
+ "%{!msoft-float:-D__HAVE_68881__ }\
+ %{!ansi:%{m68000:-Dmc68010}%{mc68000:-Dmc68010}%{!mc68000:%{!m68000:-Dmc68020}}}"
+
+ #else
+
+ /* -msoft-float is the default, assume -mc68000 as well */
+ #define CPP_SPEC \
+ "%{m68881:-D__HAVE_68881__ }\
+ %{!ansi:%{m68020:-Dmc68020}%{mc68020:-Dmc68020}%{!mc68020:%{!m68020:-Dmc68010}}}"
+
+ /* Don't try using XFmode since we don't have appropriate runtime software
+    support.  */
+ #undef LONG_DOUBLE_TYPE_SIZE
+ #define LONG_DOUBLE_TYPE_SIZE 64
+
+ #endif
+
+ /* -m68000 requires special flags to the assembler.  */
+
+ #if TARGET_DEFAULT & 01
+
+ #define ASM_SPEC \
+  "%{m68000:-mc68010}%{mc68000:-mc68010}%{!mc68000:%{!m68000:-mc68020}} %{msmall-code:-l} "
+
+ #else
+
+ #define ASM_SPEC \
+  "%{m68020:-mc68020}%{mc68020:-mc68020}%{!mc68020:%{!m68020:-mc68010}} %{msmall-code:-l} "
+
+ #endif
+
+ /* amiga/amigados are the new "standard" defines for the Amiga, MCH_AMIGA
+  * was used before and is included for compatibility reasons */
+
+ #define CPP_PREDEFINES "-Dmc68000 -Damiga -Damigados -DMCH_AMIGA -DAMIGA"
+
+ /* Choose the right startup file, depending on whether we use base relative
+    code, base relative code with automatic relocation (-resident), or plain
+    crt0.o.
+
+    Profiling is currently only available for plain startup.
+    mcrt0.o does not (yet) exist. */
+
+ #define STARTFILE_SPEC \
+   "%{resident:rcrt0.o%s}%{!resident:%{!fbaserel:%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}%{fbaserel:%{pg:bgcrt0.o%s}%{!pg:%{p:bmcrt0.o%s}%{!p:bcrt0.o%s}}}}"
+
+
+ /* Automatically search libamiga.a for AmigaDOS specific functions.  Note
+    that we first search the standard C library to resolve as much as
+    possible from there, since it has names that are duplicated in libamiga.a
+    which we *don't* want from there.  Then search the standard C library
+    again to resolve any references that libamiga.a might have generated.
+    This may only be a temporary solution since it might be better to simply
+    remove the things from libamiga.a that should be pulled in from libc.a
+    instead, which would eliminate the first reference to libc.a. */
+
+ #define LIB_SPEC "%{!p:%{!pg:-lc -lamiga -lc}}%{p:-lc_p -lamiga -lc_p}%{pg:-lc_p -lamiga -lc_p}"
+
+ /* if debugging, tell the linker to output amiga-hunk symbols *and* a BSD
+    compatible debug hunk (which will probably change in the future, it's not
+    tremendously useful in its current state). */
+
+ #define LINK_SPEC "%{g:-amiga-debug-hunk} %{fbaserel:-databss-together} %{resident:-databss-together -datadata-reloc -f libb} "
+
+ #define CC1_SPEC "%{resident:-fbaserel} "
+
+ #define CC1PLUS_SPEC "%{resident:-fbaserel} "
+
+ /* Omit frame pointer at high optimization levels. (This doesn't hurt, since
+    GDB doesn't work under AmigaDOS at the moment anyway..) */
+
+ #define OPTIMIZATION_OPTIONS(OPTIMIZE) \
+ {                                  \
+   if (OPTIMIZE >= 2)                         \
+     flag_omit_frame_pointer = 1;                \
+ }
+
+ /* provide a dummy entry for the small-code switch. This is currently only
+    needed by the assembler (explanations: m68k.h), but will be used by cc1
+    to output 16bit pc-relative code later. */
+
+ #undef TARGET_SWITCHES
+ #define TARGET_SWITCHES  \
+   { { "68020", 5},                \
+     { "c68020", 5},                \
+     { "68881", 2},                \
+     { "bitfield", 4},                \
+     { "68000", -5},                \
+     { "c68000", -5},                \
+     { "soft-float", -0102},            \
+     { "nobitfield", -4},            \
+     { "rtd", 8},                \
+     { "nortd", -8},                \
+     { "short", 040},                \
+     { "noshort", -040},                \
+     { "fpa", 0100},                \
+     { "nofpa", -0100},                \
+     { "sky", 0200},                \
+     { "nosky", -0200},                \
+     { "68040", 0407},                \
+     { "68030", -01400},                \
+     { "68030", 7},                \
+     { "68040-only", 01000},            \
+     { "small-code", 0 },            \
+     { "", TARGET_DEFAULT}}
+
+ /* Every structure or union's size must be a multiple of 2 bytes.  */
+
+ #define STRUCTURE_SIZE_BOUNDARY 16
+
+ /* This is (almost;-)) BSD, so it wants DBX format.  */
+
+ #define DBX_DEBUGGING_INFO
+
+ /* Allow folding division by zero.  */
+ #define REAL_INFINITY
+
+ #if 0    /* This apparently is no longer necessary? */
+
+ /* This is how to output an assembler line defining a `double' constant.  */
+
+ #undef ASM_OUTPUT_DOUBLE
+ #define ASM_OUTPUT_DOUBLE(FILE,VALUE)                    \
+   {                                    \
+     if (REAL_VALUE_ISINF (VALUE))                    \
+       fprintf (FILE, "\t.double 0r%s99e999\n", (VALUE) > 0 ? "" : "-");    \
+     else if (isnan (VALUE))                        \
+       {                                    \
+     union { double d; long l[2];} t;                \
+     t.d = (VALUE);                            \
+     fprintf (FILE, "\t.long 0x%lx\n\t.long 0x%lx\n", t.l[0], t.l[1]); \
+       }                                    \
+     else                                \
+       fprintf (FILE, "\t.double 0r%.17g\n", VALUE);            \
+   }
+
+ /* This is how to output an assembler line defining a `float' constant.  */
+
+ #undef ASM_OUTPUT_FLOAT
+ #define ASM_OUTPUT_FLOAT(FILE,VALUE)                    \
+   {                                    \
+     if (REAL_VALUE_ISINF (VALUE))                    \
+       fprintf (FILE, "\t.single 0r%s99e999\n", (VALUE) > 0 ? "" : "-");    \
+     else if (isnan (VALUE))                        \
+       {                                    \
+     union { float f; long l;} t;                    \
+     t.f = (VALUE);                            \
+     fprintf (FILE, "\t.long 0x%lx\n", t.l);                \
+       }                                    \
+     else                                \
+       fprintf (FILE, "\t.single 0r%.9g\n", VALUE);            \
+   }
+
+ /* This is how to output an assembler lines defining floating operands.
+    There's no way to output a NaN's fraction, so we lose it.  */
+
+ #undef ASM_OUTPUT_FLOAT_OPERAND
+ #define ASM_OUTPUT_FLOAT_OPERAND(CODE,FILE,VALUE)                \
+  do {                                \
+       if (CODE == 'f')                        \
+         {                            \
+           (REAL_VALUE_ISINF ((VALUE))                        \
+            ? asm_fprintf (FILE, "%I0r%s99e999", ((VALUE) > 0 ? "" : "-")) \
+            : (VALUE) == -0.0                            \
+            ? asm_fprintf (FILE, "%I0r-0.0")                    \
+            : asm_fprintf (FILE, "%I0r%.9g", (VALUE))) \
+         } else {                                        \
+           long l;                        \
+           REAL_VALUE_TO_TARGET_SINGLE (VALUE, l);        \
+           if (sizeof (int) == sizeof (long))            \
+             asm_fprintf ((FILE), "%I0x%x", l);            \
+           else                            \
+             asm_fprintf ((FILE), "%I0x%lx", l);            \
+         }                            \
+      } while (0)
+
+ #undef ASM_OUTPUT_DOUBLE_OPERAND
+ #define ASM_OUTPUT_DOUBLE_OPERAND(FILE,VALUE)                \
+   (REAL_VALUE_ISINF ((VALUE))                        \
+    ? asm_fprintf (FILE, "%I0r%s99e999", ((VALUE) > 0 ? "" : "-")) \
+    : (VALUE) == -0.0                            \
+    ? asm_fprintf (FILE, "%I0r-0.0")                    \
+    : asm_fprintf (FILE, "%I0r%.17g", (VALUE)))
+
+ #endif    /* 0 */
+
+ /* use A5 as framepointer instead of A6, this makes A6 available as a
+    general purpose register, and can thus be used without problems in
+    direct library calls. */
+
+ #undef FRAME_POINTER_REGNUM
+ #define FRAME_POINTER_REGNUM 13
+ #undef ARG_POINTER_REGNUM
+ #define ARG_POINTER_REGNUM 13
+
+ /* we use A4 for this, not A5, which is the framepointer */
+ #undef PIC_OFFSET_TABLE_REGNUM
+ #define PIC_OFFSET_TABLE_REGNUM 12
+
+ /* setup a default shell return value for those (gazillion..) programs that
+    (inspite of ANSI-C) declare main() to be void (or even VOID...) and thus
+    cause the shell to randomly caugh upon executing such programs (contrary
+    to Unix, AmigaDOS scripts are terminated with an error if a program returns
+    with an error code above the `error' or even `failure' level
+    (which is configurable with the FAILAT command) */
+
+ #define DEFAULT_MAIN_RETURN c_expand_return (integer_zero_node)
+
+ /* we do have an ansi-compliant c-library ;-) */
+ #define HAVE_VPRINTF
+ #define HAVE_VFPRINTF
+ #define HAVE_PUTENV
+ #define HAVE_STRERROR
+ #define HAVE_ATEXIT
+
+ /* given that symbolic_operand(X), return TRUE if no special
+    base relative relocation is necessary */
+
+ #define LEGITIMATE_BASEREL_OPERAND_P(X) \
+   (flag_pic >= 3 && read_only_operand (X))
+
+ #undef LEGITIMATE_PIC_OPERAND_P
+ #define LEGITIMATE_PIC_OPERAND_P(X) \
+   (! symbolic_operand (X, VOIDmode) || LEGITIMATE_BASEREL_OPERAND_P (X))
+
+
+ /* Define this macro if references to a symbol must be treated
+    differently depending on something about the variable or
+    function named by the symbol (such as what section it is in).
+
+    The macro definition, if any, is executed immediately after the
+    rtl for DECL or other node is created.
+    The value of the rtl will be a `mem' whose address is a
+    `symbol_ref'.
+
+    The usual thing for this macro to do is to a flag in the
+    `symbol_ref' (such as `SYMBOL_REF_FLAG') or to store a modified
+    name string in the `symbol_ref' (if one bit is not enough
+    information).
+
+    On the Amiga we use this to indicate if a symbol is in text or
+    data space.  */
+
+ #define ENCODE_SECTION_INFO(DECL)\
+ do                                    \
+   {                                    \
+     if (TREE_CODE (DECL) == FUNCTION_DECL)                \
+       SYMBOL_REF_FLAG (XEXP (DECL_RTL (DECL), 0)) = 1;            \
+     else                                \
+       {                                    \
+     rtx rtl = (TREE_CODE_CLASS (TREE_CODE (DECL)) != 'd'        \
+            ? TREE_CST_RTL (DECL) : DECL_RTL (DECL));        \
+     if (RTX_UNCHANGING_P (rtl) && !MEM_VOLATILE_P (rtl))        \
+       SYMBOL_REF_FLAG (XEXP (rtl, 0)) = 1;                \
+       }                                    \
+   }                                    \
+ while (0)
+
+ #undef SELECT_RTX_SECTION
+ #define SELECT_RTX_SECTION(MODE, X) readonly_data_section ();
+
+ /* according to varasm.c, RELOC referrs *only* to whether constants (!)
+    are addressed by address. This doesn't matter in baserelative code,
+    so we allow (inspite of flag_pic) readonly_data_section() in that
+    case */
+
+ #undef SELECT_SECTION
+ #define SELECT_SECTION(DECL, RELOC)                    \
+ {                                    \
+   if (TREE_CODE (DECL) == STRING_CST)                    \
+     {                                    \
+       if (! flag_writable_strings)                    \
+     readonly_data_section ();                    \
+       else                                \
+     data_section ();                        \
+     }                                    \
+   else if (TREE_CODE (DECL) == VAR_DECL)                \
+     {                                    \
+       if ((flag_pic && flag_pic < 3 && RELOC)                \
+       || !TREE_READONLY (DECL) || TREE_SIDE_EFFECTS (DECL))        \
+     data_section ();                        \
+       else                                \
+     readonly_data_section ();                    \
+     }                                    \
+   else                                    \
+     readonly_data_section ();                        \
+ }
+
+
+
+ #if not_yet_working
+
+ /* starting support for amiga specific keywords
+  * --------------------------------------------
+  */
+
+ /* validate attributes that don't take a parameter. Currently we support
+  * __attribute__ (saveds) and __attribute__ (interrupt)
+  */
+ #define HANDLE_ATTRIBUTE0(attr) \
+   (strcmp(attr, "saveds") != 0 && strcmp(attr, "interrupt") != 0)
+
+ /* (c-common.c)
+  * install additional attributes
+  */
+ #define HANDLE_EXTRA_ATTRIBUTES(a)                         \
+   if (TREE_VALUE (a) != 0                            \
+       && TREE_CODE (TREE_VALUE (a)) == IDENTIFIER_NODE                \
+       && TREE_VALUE (a) == get_identifier ("saveds"))                \
+     {                                        \
+       if (TREE_CODE (decl) != FUNCTION_DECL)                    \
+         {                                    \
+           warning_with_decl (decl,                        \
+               "saveds attribute specified for non-function `%s'");        \
+       return;                                \
+         }                                    \
+                                               \
+       attr_do_saveds (DECL_NAME (decl));                    \
+     }                                        \
+   else if (TREE_VALUE (a) != 0                            \
+       && TREE_CODE (TREE_VALUE (a)) == IDENTIFIER_NODE                \
+       && TREE_VALUE (a) == get_identifier ("interrupt"))            \
+     {                                        \
+       if (TREE_CODE (decl) != FUNCTION_DECL)                    \
+         {                                    \
+           warning_with_decl (decl,                        \
+               "saveds attribute specified for non-function `%s'");        \
+       return;                                \
+         }                                    \
+                                               \
+       attr_do_interrupt (DECL_NAME (decl));                    \
+     }                                        \
+
+
+ #define PROLOGUE_EXTRA_SAVE(mask)                        \
+   { extern char *current_function_name;                        \
+     /* saveds makes the function preserve d1/a0/a1 as well */            \
+     if (attr_does_saveds (current_function_name))                \
+       mask |= 0x40c0; }                                \
+
+
+ #define EPILOGUE_EXTRA_RESTORE(mask, nregs)                    \
+   { extern char *current_function_name;                        \
+     /* restore those extra registers */                        \
+     if (attr_does_saveds (current_function_name))                \
+       {                                        \
+     mask |= 0x0302;                                \
+     nregs += 3;                                \
+       } }                                    \
+
+
+ #define EPILOGUE_EXTRA_BARRIER_KLUDGE(stream)                    \
+   { extern char *current_function_name;                        \
+     /* PLEASE Help! how is this done cleaner?? */                \
+     if (attr_does_saveds (current_function_name))                \
+       {                                        \
+     fprintf (stderr,                             \
+          "warning: couldn't cleanup `saveds'-stack in `%s'.\n");    \
+     fprintf (stderr,                            \
+          "         this is only ok, if the function never returns!\n");    \
+       }    }                                    \
+
+
+ #define EPILOGUE_EXTRA_TEST(stream)                        \
+   { extern char *current_function_name;                        \
+     /* with the interrupt-attribute, we have to set the cc before rts */    \
+     if (attr_does_interrupt (current_function_name))                \
+       asm_fprintf (stream, "\ttstl %s\n", reg_names[0]); }            \
+
+ #endif
diff -rc --new-file gcc-2.5.8/config/m68k/m68k.c gcc-2.5.8-amiga/config/m68k/m68k.c
*** gcc-2.5.8/config/m68k/m68k.c    Wed Nov  3 21:17:46 1993
--- gcc-2.5.8-amiga/config/m68k/m68k.c    Sun Dec 12 17:25:40 1993
***************
*** 61,67 ****
  void
  finalize_pic ()
  {
!   if (flag_pic && current_function_uses_pic_offset_table)
      emit_insn (gen_rtx (USE, VOIDmode, pic_offset_table_rtx));
  }

--- 61,67 ----
  void
  finalize_pic ()
  {
!   if (flag_pic && (flag_pic < 3) && current_function_uses_pic_offset_table)
      emit_insn (gen_rtx (USE, VOIDmode, pic_offset_table_rtx));
  }

***************
*** 181,186 ****
--- 181,189 ----
        mask &= ~ (1 << (15 - FRAME_POINTER_REGNUM));
        num_saved_regs--;
      }
+ #ifdef PROLOGUE_EXTRA_SAVE
+   PROLOGUE_EXTRA_SAVE (mask);
+ #endif

  #if NEED_PROBE
    fprintf (stream, "\ttstl sp@(%d)\n", NEED_PROBE - num_saved_regs * 4);
***************
*** 214,220 ****
        asm_fprintf (stream, "\tmoveml %0I0x%x,%Rsp@-\n", mask);
  #endif
      }
!   if (flag_pic && current_function_uses_pic_offset_table)
      {
  #ifdef MOTOROLA
        asm_fprintf (stream, "\t%Olea (%Rpc, %U_GLOBAL_OFFSET_TABLE_@GOTPC), %s\n",
--- 217,223 ----
        asm_fprintf (stream, "\tmoveml %0I0x%x,%Rsp@-\n", mask);
  #endif
      }
!   if (flag_pic && (flag_pic < 3) && current_function_uses_pic_offset_table)
      {
  #ifdef MOTOROLA
        asm_fprintf (stream, "\t%Olea (%Rpc, %U_GLOBAL_OFFSET_TABLE_@GOTPC), %s\n",
***************
*** 279,284 ****
--- 282,290 ----
        /* Output just a no-op so that debuggers don't get confused
       about which function the pc is in at this address.  */
        asm_fprintf (stream, "\tnop\n");
+ #ifdef EPILOGUE_EXTRA_BARRIER_KLUDGE
+       EPILOGUE_EXTRA_BARRIER_KLUDGE(stream);
+ #endif
        return;
      }

***************
*** 309,314 ****
--- 315,323 ----
          nregs++;
      mask |= 1 << regno;
        }
+ #ifdef EPILOGUE_EXTRA_RESTORE
+   EPILOGUE_EXTRA_RESTORE(mask, nregs);
+ #endif
    offset = foffset + nregs * 4;
    if (offset + fsize >= 0x8000
        && frame_pointer_needed
***************
*** 511,516 ****
--- 520,528 ----
  #endif
      }
      }
+ #ifdef EPILOGUE_EXTRA_TEST
+   EPILOGUE_EXTRA_TEST(stream);
+ #endif
    if (current_function_pops_args)
      asm_fprintf (stream, "\trtd %0I%d\n", current_function_pops_args);
    else
***************
*** 801,815 ****
    /* First handle a simple SYMBOL_REF or LABEL_REF */
    if (GET_CODE (orig) == SYMBOL_REF || GET_CODE (orig) == LABEL_REF)
      {
        if (reg == 0)
      abort ();

!       pic_ref = gen_rtx (MEM, Pmode,
!              gen_rtx (PLUS, Pmode,
!                   pic_offset_table_rtx, orig));
        current_function_uses_pic_offset_table = 1;
        RTX_UNCHANGING_P (pic_ref) = 1;
        emit_move_insn (reg, pic_ref);
        return reg;
      }
    else if (GET_CODE (orig) == CONST)
--- 813,837 ----
    /* First handle a simple SYMBOL_REF or LABEL_REF */
    if (GET_CODE (orig) == SYMBOL_REF || GET_CODE (orig) == LABEL_REF)
      {
+ #ifdef LEGITIMATE_BASEREL_OPERAND_P
+   if (LEGITIMATE_BASEREL_OPERAND_P (orig))
+     return orig;
+ #endif
+
        if (reg == 0)
      abort ();

!       if (flag_pic >= 3)
!     pic_ref = gen_rtx (PLUS, Pmode, pic_offset_table_rtx, orig);
!       else
!         pic_ref = gen_rtx (MEM, Pmode,
!                gen_rtx (PLUS, Pmode,
!                     pic_offset_table_rtx, orig));
!
        current_function_uses_pic_offset_table = 1;
        RTX_UNCHANGING_P (pic_ref) = 1;
        emit_move_insn (reg, pic_ref);
+
        return reg;
      }
    else if (GET_CODE (orig) == CONST)
***************
*** 838,843 ****
--- 860,866 ----
        pic_ref = gen_rtx (PLUS, Pmode, base, orig);
        /* Likewise, should we set special REG_NOTEs here?  */
      }
+
    return pic_ref;
  }

***************
*** 2166,2171 ****
--- 2189,2198 ----
                fprintf (file, ":w");
              if ((flag_pic == 2) && (breg == pic_offset_table_rtx))
                fprintf (file, ":l");
+             if ((flag_pic == 3) && (breg == pic_offset_table_rtx))
+               fprintf (file, ":W");
+             if ((flag_pic == 4) && (breg == pic_offset_table_rtx))
+               fprintf (file, ":L");
            }
          if (addr != 0 && ireg != 0)
            {
diff -rc --new-file gcc-2.5.8/config/m68k/m68k.h gcc-2.5.8-amiga/config/m68k/m68k.h
*** gcc-2.5.8/config/m68k/m68k.h    Fri Nov  5 08:09:54 1993
--- gcc-2.5.8-amiga/config/m68k/m68k.h    Sun Dec 12 17:25:43 1993
***************
*** 353,361 ****
  #ifndef SUPPORT_SUN_FPA

  #define CONDITIONAL_REGISTER_USAGE \
! {                                               \
!   if (flag_pic)                                 \
!     fixed_regs[PIC_OFFSET_TABLE_REGNUM] = 1;    \
  }

  #else /* defined SUPPORT_SUN_FPA */
--- 353,364 ----
  #ifndef SUPPORT_SUN_FPA

  #define CONDITIONAL_REGISTER_USAGE \
! {                                                \
!   if (flag_pic)                                  \
!     fixed_regs[PIC_OFFSET_TABLE_REGNUM] = 1;     \
!   /* prevent saving/restoring of the base reg */ \
!   if (flag_pic == 3)                 \
!     call_used_regs[PIC_OFFSET_TABLE_REGNUM] = 1; \
  }

  #else /* defined SUPPORT_SUN_FPA */
diff -rc --new-file gcc-2.5.8/config/m68k/m68k.md gcc-2.5.8-amiga/config/m68k/m68k.md
*** gcc-2.5.8/config/m68k/m68k.md    Wed Dec  1 00:17:46 1993
--- gcc-2.5.8-amiga/config/m68k/m68k.md    Sun Dec 12 17:25:48 1993
***************
*** 716,728 ****
  {
    if (flag_pic && symbolic_operand (operands[1], SImode))
      {
!       /* The source is an address which requires PIC relocation.
!          Call legitimize_pic_address with the source, mode, and a relocation
!          register (a new pseudo, or the final destination if reload_in_progress
!          is set).   Then fall through normally */
!       extern rtx legitimize_pic_address();
!       rtx temp = reload_in_progress ? operands[0] : gen_reg_rtx (Pmode);
!       operands[1] = legitimize_pic_address (operands[1], SImode, temp);
      }
  }")

--- 716,733 ----
  {
    if (flag_pic && symbolic_operand (operands[1], SImode))
      {
! #ifdef LEGITIMATE_BASEREL_OPERAND_P
!       if (flag_pic < 3 || !LEGITIMATE_BASEREL_OPERAND_P (operands[1]))
! #endif
!       {
!         /* The source is an address which requires PIC relocation.
!            Call legitimize_pic_address with the source, mode, and a relocation
!            register (a new pseudo, or the final destination if reload_in_progress
!            is set).   Then fall through normally */
!         extern rtx legitimize_pic_address();
!         rtx temp = reload_in_progress ? operands[0] : gen_reg_rtx (Pmode);
!         operands[1] = legitimize_pic_address (operands[1], SImode, temp);
!       }
      }
  }")

***************
*** 1890,1897 ****

        /* These insns can result from reloads to access
       stack slots over 64k from the frame pointer.  */
!       if (GET_CODE (operands[2]) == CONST_INT
!       && INTVAL (operands[2]) + 0x8000 >= (unsigned) 0x10000)
          return \"move%.l %2,%0\;add%.l %1,%0\";
  #ifdef SGS
        if (GET_CODE (operands[2]) == REG)
--- 1895,1903 ----

        /* These insns can result from reloads to access
       stack slots over 64k from the frame pointer.  */
!       if (((GET_CODE (operands[2]) == CONST_INT
!        && INTVAL (operands[2]) + 0x8000 >= (unsigned) 0x10000))
!       || (flag_pic == 4 && operands[1] == pic_offset_table_rtx))
          return \"move%.l %2,%0\;add%.l %1,%0\";
  #ifdef SGS
        if (GET_CODE (operands[2]) == REG)
***************
*** 4858,4864 ****
    ""
    "
  {
!   if (flag_pic && GET_CODE (XEXP (operands[0], 0)) == SYMBOL_REF)
  #ifdef MOTOROLA
      SYMBOL_REF_FLAG (XEXP (operands[0], 0)) = 1;
  #else
--- 4864,4870 ----
    ""
    "
  {
!   if (flag_pic && flag_pic < 3 && GET_CODE (XEXP (operands[0], 0)) == SYMBOL_REF)
  #ifdef MOTOROLA
      SYMBOL_REF_FLAG (XEXP (operands[0], 0)) = 1;
  #else
***************
*** 4873,4879 ****
       (match_operand:SI 1 "general_operand" "g"))]
    ;; Operand 1 not really used on the m68000.

!   "! flag_pic"
    "*
  #ifdef MOTOROLA
    return \"jsr %0\";
--- 4879,4885 ----
       (match_operand:SI 1 "general_operand" "g"))]
    ;; Operand 1 not really used on the m68000.

!   "(! flag_pic || flag_pic >= 3)"
    "*
  #ifdef MOTOROLA
    return \"jsr %0\";
***************
*** 4888,4894 ****
       (match_operand:SI 1 "general_operand" "g"))]
    ;; Operand 1 not really used on the m68000.

!   "flag_pic"
    "*
  #ifdef HPUX_ASM
    return \"bsr %0\";
--- 4894,4900 ----
       (match_operand:SI 1 "general_operand" "g"))]
    ;; Operand 1 not really used on the m68000.

!   "(flag_pic && flag_pic < 3)"
    "*
  #ifdef HPUX_ASM
    return \"bsr %0\";
***************
*** 4913,4919 ****
    ""
    "
  {
!   if (flag_pic && GET_CODE (XEXP (operands[1], 0)) == SYMBOL_REF)
  #ifdef MOTOROLA
      SYMBOL_REF_FLAG (XEXP (operands[1], 0)) = 1;
  #else
--- 4919,4925 ----
    ""
    "
  {
!   if (flag_pic && flag_pic < 3 && GET_CODE (XEXP (operands[1], 0)) == SYMBOL_REF)
  #ifdef MOTOROLA
      SYMBOL_REF_FLAG (XEXP (operands[1], 0)) = 1;
  #else
***************
*** 4928,4934 ****
      (call (match_operand:QI 1 "memory_operand" "o")
            (match_operand:SI 2 "general_operand" "g")))]
    ;; Operand 2 not really used on the m68000.
!   "! flag_pic"
    "*
  #ifdef MOTOROLA
    return \"jsr %1\";
--- 4934,4940 ----
      (call (match_operand:QI 1 "memory_operand" "o")
            (match_operand:SI 2 "general_operand" "g")))]
    ;; Operand 2 not really used on the m68000.
!   "(! flag_pic || flag_pic >= 3)"
    "*
  #ifdef MOTOROLA
    return \"jsr %1\";
***************
*** 4943,4949 ****
      (call (match_operand:QI 1 "memory_operand" "o")
            (match_operand:SI 2 "general_operand" "g")))]
    ;; Operand 2 not really used on the m68000.
!   "flag_pic"
    "*
  #ifdef HPUX_ASM
    return \"bsr %1\";
--- 4949,4955 ----
      (call (match_operand:QI 1 "memory_operand" "o")
            (match_operand:SI 2 "general_operand" "g")))]
    ;; Operand 2 not really used on the m68000.
!   "(flag_pic && flag_pic < 3)"
    "*
  #ifdef HPUX_ASM
    return \"bsr %1\";
diff -rc --new-file gcc-2.5.8/config/m68k/t-amigados gcc-2.5.8-amiga/config/m68k/t-amigados
*** gcc-2.5.8/config/m68k/t-amigados    Thu Jan  1 00:00:00 1970
--- gcc-2.5.8-amiga/config/m68k/t-amigados    Sun Dec 12 17:25:50 1993
***************
*** 0 ****
--- 1,178 ----
+ # Makefile fragment for amigados target.
+
+ # We generate two additional things:
+ #
+ # libb/libgcc.a
+ #    A base relative version of libgcc.a which is used when compiling and
+ #    linking with the '-resident' option.
+ #
+ # xgccv
+ #    A forking gcc instead of one calling ssytem(). This makes it less
+ #    system conformant (can't ^C it when started from make), while providing
+ #    increased functionality (-pipe option).
+
+ # Use the vfork'ing version of gcc by default, so that the -pipe option can
+ # get tested.  To use the regular version just do "make XGCC=gcc".  Note that
+ # PIPE is defined in x-amigados, so if we are doing a native build, it will
+ # be defined.  It can be overridden with "make PIPE=".
+
+ XGCC = xgccv $(PIPE)
+ GCC_FOR_TARGET = ./$(XGCC) -B./
+
+ # Build residentable versions of the gcc executables by default.  Use
+ # "make RESIDENT=" to build non-residentable versions.
+ # Note:  This failed during bootstrapping of 2.5.5.
+
+ #RESIDENT = -resident
+
+ # The standard additional target flags for the compiler.
+
+ T_CFLAGS = $(RESIDENT)
+
+ # Allow the user to override the default target optimizations with gcc, or if the
+ # target compiler is not gcc and doesn't understand -O<N>.
+
+ T_OPTIMISE = -O2
+
+ # We don't need a libgcc1, it's all in ixemul.library
+
+ LIBGCC1 = libgcc1.null
+
+ # Flags to use when compiling the normal version of libgcc.a.
+ # Don't compile with debugging, as long as there is no debugger.
+ # Explicitly leave out the -resident compilation flag and don't use T_CFLAGS.
+
+ LIBGCC2_CFLAGS = $(T_OPTIMIZE) $(INTERNAL_CFLAGS) $(X_CFLAGS) $(CFLAGS) \
+           $(CROSS_GCC_CFLAGS)
+
+ # Flags to use when compiling the base relative version of libgcc.a.
+ # Don't compile with debugging, as long as there is no debugger.
+ # Explicitly force -resident in the compilation flags and don't use T_CFLAGS.
+
+ LIBBGCC2_CFLAGS = $(T_OPTIMIZE) $(INTERNAL_CFLAGS) $(X_CFLAGS) $(CFLAGS) \
+           $(CROSS_GCC_CFLAGS) -resident
+
+ # Build the base relative library.
+ # It is later copied into gcc:lib/gcc-lib/amigados/<version>/libb/libgcc.a, whereas
+ # libgcc.a is copied into gcc:lib/gcc-lib/amigados/<version>/libgcc.a.
+ # It doesn't work very well to define one of the EXTRA_* macros to contain
+ # libb/libgcc.a, particularly for doing "make stageN" or "make install".
+
+ GCC_PARTS=$(GCC_PASSES) libgcc.a libb/libgcc.a $(EXTRA_PROGRAMS) $(USE_COLLECT2) $(EXTRA_PARTS)
+
+ # Add install_libbgcc to normal define of INSTALL_LIBGCC.  Let install-gccv
+ # hitch a ride on here as well.
+
+ INSTALL_LIBGCC = install-libgcc install-libbgcc install-gccv
+
+ # This includes the knowledge that target amigados doesn't need libgcc1.a
+
+ libb/libgcc.a: libgcc1.null libgcc2.c libgcc2.ready $(CONFIG_H) \
+    $(LIB2FUNCS_EXTRA) machmode.h longlong.h gbl-ctors.h config.status
+ # Actually build it in tmplibbgcc.a, then rename at end,
+ # so that libb/libgcc.a itself remains nonexistent if compilation is aborted.
+     -rm -f tmplibbgcc.a
+ # -e causes any failing command to make this rule fail.
+ # -e doesn't work in certain shells, so we test $$? as well.
+     set -e; \
+     for name in $(LIB2FUNCS); \
+     do \
+       echo $${name}; \
+       $(GCC_FOR_TARGET) $(LIBBGCC2_CFLAGS) $(INCLUDES) -c -DL$${name} \
+           $(srcdir)/libgcc2.c -o $${name}.o; \
+       if [ $$? -eq 0 ] ; then true; else exit 1; fi; \
+       $(AR) $(AR_FLAGS) tmplibbgcc.a $${name}.o; \
+       rm -f $${name}.o; \
+     done
+ # Some shells crash when a loop has no items.
+ # So make sure there is always at least one--`..'.
+ # Then ignore it.
+ # We don't use -e here because there are if statements
+ # that should not make the command give up when the if condition is false.
+ # Instead, we test for failure after each command where it matters.
+     -for file in .. $(LIB2FUNCS_EXTRA); \
+     do \
+       if [ x$${file} != x.. ]; then \
+         name=`echo $${file} | sed -e 's/[.]c$$//' -e 's/[.]asm$$//'`; \
+         echo $${name}; \
+         if [ $${name}.asm = $${file} ]; then \
+           cp $${file} $${name}.s || exit 1; file=$${name}.s; \
+         else true; fi; \
+         $(GCC_FOR_TARGET) $(LIBBGCC2_CFLAGS) $(INCLUDES) -c $${file}; \
+         if [ $$? -eq 0 ] ; then true; else exit 1; fi; \
+         $(AR) $(AR_FLAGS) tmplibbgcc.a $${name}.o; \
+         rm -f $${name}.[so]; \
+       else true; \
+       fi; \
+     done
+     -if $(RANLIB_TEST) ; then $(RANLIB) tmplibbgcc.a; else true; fi
+     -if [ -d libb ] ; then true ; else mkdir libb ; fi
+     mv tmplibbgcc.a libb/libgcc.a
+
+
+ install-libbgcc: libb/libgcc.a install-dir
+     -if [ -d $(libsubdir)/libb ] ; then true ; else mkdir $(libsubdir)/libb ; fi
+     -if [ -f libb/libgcc.a ] ; then \
+       rm -f $(libsubdir)/libb/libgcc.a; \
+       $(INSTALL_DATA) libb/libgcc.a $(libsubdir)/libb/libgcc.a; \
+       if $(RANLIB_TEST) ; then \
+         (cd $(libsubdir)/libb; $(RANLIB) libgcc.a); else true; fi; \
+       chmod a-x $(libsubdir)/libb/libgcc.a; \
+     else true; fi
+
+
+ # The default gcc (xgcc) is built without -DAMIGADOS_FORK_GCC. This gcc (xgccv)
+ # is built with AMIGADOS_FORK_GCC defined, so that it can use '-pipe'.  We
+ # don't want to define EXTRA_PASSES to xgccv because that will cause xgccv
+ # to be installed in $(libsubdir), so instead we use the default GCC_PASSES
+ # and add xgccv to it.
+
+ GCC_PASSES = xgcc xgccv cc1 cpp $(EXTRA_PASSES)
+
+ xgccv: xgccv.o version.o $(LIBDEPS)
+     $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o xgccv xgccv.o version.o $(LIBS)
+
+ xgccv.o: gcc.c $(CONFIG_H) gvarargs.h obstack.h
+     $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+   -DSTANDARD_STARTFILE_PREFIX=\"$(libdir)/\" \
+   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
+   -DDEFAULT_TARGET_MACHINE=\"$(target)\" \
+   -DTOOLDIR=\"$(tooldir)/\" \
+   -DAMIGADOS_FORK_GCC \
+   -c `echo $(srcdir)/gcc.c | sed 's,^\./,,'` -o xgccv.o
+
+ install-gccv: xgccv
+     rm -f $(bindir)/gccv
+     $(INSTALL_PROGRAM) xgccv $(bindir)/gccv
+
+ # When making one of the stage<N> dirs, we need to make a libb subdir for
+ # it, and copy libbgcc.a there as libgcc.a.
+
+ EXTRA_STAGE1_TARGETS = stage1-libb
+ EXTRA_STAGE2_TARGETS = stage2-libb
+ EXTRA_STAGE3_TARGETS = stage3-libb
+ EXTRA_STAGE4_TARGETS = stage4-libb
+
+ stage1-libb:
+     -if [ -d stage1 ] ; then true ; else mkdir stage1 ; fi
+     -if [ -d stage1/libb ] ; then true ; else mkdir stage1/libb ; fi
+     -cp libb/libgcc.a stage1/libb/libgcc.a
+     -if $(RANLIB_TEST) ; then $(RANLIB) stage1/libb/libgcc.a; else true; fi
+
+ stage2-libb:
+     -if [ -d stage2 ] ; then true ; else mkdir stage2 ; fi
+     -if [ -d stage2/libb ] ; then true ; else mkdir stage2/libb ; fi
+     -cp libb/libgcc.a stage2/libb/libgcc.a
+     -if $(RANLIB_TEST) ; then $(RANLIB) stage2/libb/libgcc.a; else true; fi
+
+ stage3-libb:
+     -if [ -d stage3 ] ; then true ; else mkdir stage3 ; fi
+     -if [ -d stage3/libb ] ; then true ; else mkdir stage3/libb ; fi
+     -cp libb/libgcc.a stage3/libb/libgcc.a
+     -if $(RANLIB_TEST) ; then $(RANLIB) stage3/libb/libgcc.a; else true; fi
+
+ stage4-libb:
+     -if [ -d stage4 ] ; then true ; else mkdir stage4 ; fi
+     -if [ -d stage4/libb ] ; then true ; else mkdir stage4/libb ; fi
+     -cp libb/libgcc.a stage4/libb/libgcc.a
+     -if $(RANLIB_TEST) ; then $(RANLIB) stage4/libb/libgcc.a; else true; fi
diff -rc --new-file gcc-2.5.8/config/m68k/x-amigados gcc-2.5.8-amiga/config/m68k/x-amigados
*** gcc-2.5.8/config/m68k/x-amigados    Thu Jan  1 00:00:00 1970
--- gcc-2.5.8-amiga/config/m68k/x-amigados    Sun Dec 12 17:25:51 1993
***************
*** 0 ****
--- 1,44 ----
+ # Note: It doesn't do any good to try to define prefix or local_prefix
+ # in the host overrides because configure will just change them back.
+ # You either have to give an appropriate option to configure or live with
+ # an Amiga specific patch to configure.  See the note in configure.  -fnf
+
+ # Building under amigados almost certainly requires an already working gcc.
+ # Use gccv, which is a gcc compiled with AMIGADOS_FORK_GCC so "-pipe" will
+ # work and get exercised.  To bootstrap with the regular gcc just do
+ # "make CC=gcc".  To bootstrap without "-pipe" do "make PIPE=".
+
+ CC = gccv $(PIPE)
+
+ # Disable -pipe for now since I had problems bootstrapping gcc 2.5.5 with
+ # it. (fnf)
+ #PIPE = -pipe
+
+ # Allow the user to override the default host optimization with gcc, or if the
+ # host compiler is not gcc and doesn't understand -O<N>.
+
+ X_OPTIMIZE = -O2
+
+ # The standard additional host flags for the compiler.
+
+ X_CFLAGS = $(X_OPTIMIZE)
+
+ # Man pages get a wierd suffix...
+
+ manext = .0
+
+ # We really shouldn't specify CFLAGS from here, but there's no other way
+ # to get rid of the `-g' indoctrinated by Makefile.in.  Note this becomes
+ # part of both the host compilation CFLAGS and the target compilation
+ # CFLAGS.
+
+ CFLAGS =
+
+ # Ranlib does exist, but may not be in a path where the default RANLIB_TEST
+ # expects it, so just force it to true.
+
+ RANLIB_TEST = true
+
+ # My current version of ln doesn't work, so use cp instead.  -fnf
+
+ HARDLINK = cp
diff -rc --new-file gcc-2.5.8/config/m68k/xm-amigados.h gcc-2.5.8-amiga/config/m68k/xm-amigados.h
*** gcc-2.5.8/config/m68k/xm-amigados.h    Thu Jan  1 00:00:00 1970
--- gcc-2.5.8-amiga/config/m68k/xm-amigados.h    Sun Dec 12 17:25:53 1993
***************
*** 0 ****
--- 1,215 ----
+ /* Configuration for GNU C-compiler for Commodore Amiga, running AmigaDOS.
+    Copyright (C) 1992 Free Software Foundation, Inc.
+    Contributed by Markus M. Wild ([e-mail]).
+
+ This file is part of GNU CC.
+
+ GNU CC 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, or (at your option)
+ any later version.
+
+ GNU CC 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 GNU CC; see the file COPYING.  If not, write to
+ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+ /* first include the generic header, then modify some parts.. */
+
+ #include "m68k/xm-m68k.h"
+
+ /* Amiga specific headers, such as from the Native Developer Update kits,
+    go in SYSTEM_INCLUDE_DIR.  STANDARD_INCLUDE_DIR is the equivalent of
+    Unix "/usr/include".  All other include paths are set in Makefile. */
+
+ #define SYSTEM_INCLUDE_DIR    "/gcc/os-include"
+ #define STANDARD_INCLUDE_DIR    "/gcc/include"
+
+ /* Fork one piped subcommand.  SEARCH_FLAG is the system call to use
+    (either execv or execvp).  ARGV is the arg vector to use.
+    NOT_LAST is nonzero if this is not the last subcommand
+    (i.e. its output should be piped to the next one.)  */
+
+ #ifndef AMIGADOS_FORK_GCC
+
+ /* This version uses a more or less amigados-conformant way of running a
+    program (in the context of the parent). If you want to use -pipe however,
+    you'll have to use the vfork() version afterwards. */
+
+ #define PEXECUTE(SEARCH_FLAG,PROGRAM,ARGV,NOT_LAST) \
+ ({char *_argline;                        \
+   int _arglinelength, _i;                    \
+                                 \
+   for (_i = 1, _arglinelength=0; ARGV[_i]; ++_i)        \
+     _arglinelength += strlen(ARGV[_i]) + 1;            \
+                                 \
+   _arglinelength += strlen(PROGRAM) + 1;            \
+                                 \
+   if (!(_argline = (char *)alloca(_arglinelength)))         \
+     pfatal_with_name ("alloca");                \
+                                 \
+   strcpy(_argline, PROGRAM);                    \
+   for (_i = 1; ARGV[_i]; ++_i)                     \
+     {                                \
+       strcat(_argline, " ");                    \
+       strcat(_argline, ARGV[_i]);                \
+     }                                \
+                                 \
+   ssystem(_argline); })                        \
+
+ #define PEXECUTE_RESULT(STATUS, COMMAND) \
+   ({ STATUS = COMMAND.pid; })
+
+ #else
+
+ /* the vfork() version. This one has the drawback, that gcc is not
+    interruptible when started from make, since ixemul.library doesn't yet
+    propagate ^C to subprocesses. */
+
+ #define PEXECUTE(SEARCH_FLAG,PROGRAM,ARGV,NOT_LAST) \
+ ({int (*_func)() = (SEARCH_FLAG ? execv : execvp);            \
+   int _pid;                                \
+   int _pdes[2];                                \
+   int _input_desc = last_pipe_input;                    \
+   int _output_desc = STDOUT_FILE_NO;                    \
+   int _retries, _sleep_interval, _result;                \
+                                     \
+   /* If this isn't the last process, make a pipe for its output,    \
+      and record it as waiting to be the input to the next process.  */    \
+                                     \
+   if (NOT_LAST)                                \
+     {                                    \
+       if (pipe (_pdes) < 0)                        \
+     pfatal_with_name ("pipe");                    \
+       _output_desc = _pdes[WRITE_PORT];                    \
+       last_pipe_input = _pdes[READ_PORT];                \
+     }                                    \
+   else                                    \
+     last_pipe_input = STDIN_FILE_NO;                    \
+                                     \
+   /* Fork a subprocess; wait and retry if it fails.  */            \
+   _sleep_interval = 1;                            \
+   for (_retries = 0; _retries < 4; _retries++)                \
+     {                                    \
+       _pid = vfork ();                            \
+       if (_pid >= 0)                            \
+     break;                                \
+       sleep (_sleep_interval);                        \
+       _sleep_interval *= 2;                        \
+     }                                    \
+                                     \
+   switch (_pid)                                \
+     {                                    \
+     case -1:                                \
+       pfatal_with_name ("vfork");                    \
+       /* NOTREACHED */                            \
+       _result = 0;                            \
+       break;                                \
+                                     \
+     case 0: /* child */                            \
+       /* Move the input and output pipes into place, if nec.  */    \
+       if (_input_desc != STDIN_FILE_NO)                    \
+     {                                \
+       close (STDIN_FILE_NO);                    \
+       dup (_input_desc);                        \
+       close (_input_desc);                        \
+     }                                \
+       if (_output_desc != STDOUT_FILE_NO)                \
+     {                                \
+       close (STDOUT_FILE_NO);                    \
+       dup (_output_desc);                        \
+       close (_output_desc);                        \
+     }                                \
+                                     \
+       /* Close the parent's descs that aren't wanted here.  */        \
+       if (last_pipe_input != STDIN_FILE_NO)                \
+     close (last_pipe_input);                    \
+                                     \
+       /* Exec the program.  */                        \
+       (*_func) (PROGRAM, ARGV);                        \
+       perror_exec (PROGRAM);                        \
+       exit (-1);                            \
+       /* NOTREACHED */                            \
+       _result = 0;                            \
+       break;                                \
+                                     \
+     default:                                \
+       /* In the parent, after forking.                    \
+      Close the descriptors that we made for this child.  */        \
+       if (_input_desc != STDIN_FILE_NO)                    \
+     close (_input_desc);                        \
+       if (_output_desc != STDOUT_FILE_NO)                \
+     close (_output_desc);                        \
+                                     \
+       /* Return child's process number.  */                \
+       _result = _pid;                            \
+       break;                                \
+     }                                     \
+ _result; })                                \
+
+ #define PEXECUTE_RESULT(STATUS, COMMAND) \
+   ({ wait (& STATUS); })
+
+ #endif /* AMIGADOS_FORK_GCC */
+
+ /* the following macros are stolen more or less from xm-vms.h ... */
+
+ /* This macro is used to help compare filenames in cp-lex.c.
+
+    We also need to make sure that the names are all lower case, because
+    we must be able to compare filenames to determine if a file implements
+    a class.  */
+
+ #define FILE_NAME_NONDIRECTORY(C)                \
+ ({                                \
+    extern char *rindex();                    \
+    char * pnt_ = (C), * pnt1_;                    \
+    pnt1_ = pnt_ - 1;                        \
+    while (*++pnt1_)                        \
+      if ((*pnt1_ >= 'A' && *pnt1_ <= 'Z')) *pnt1_ |= 0x20;    \
+    pnt1_ = rindex (pnt_, '/');                     \
+    pnt1_ = (pnt1_ == 0 ? rindex (pnt_, ':') : pnt1_);        \
+    (pnt1_ == 0 ? pnt_ : pnt1_ + 1);                \
+  })
+
+ /* Macro to generate the name of the cross reference file.  The standard
+    one does not work, since it was written assuming that the conventions
+    of a unix style filesystem will work on the host system.
+
+    Contrary to VMS, I'm using the original unix filename, there's no reason
+    not to use this under AmigaDOS. */
+
+ #define XREF_FILE_NAME(BUFF, NAME)    \
+   s = FILE_NAME_NONDIRECTORY (NAME);            \
+   if (s == NAME) sprintf(BUFF, ".%s.gxref", NAME);    \
+   else {                        \
+     unsigned char ch = *s; /* could be Latin1 char.. */    \
+     /* temporary: cut the filename from the directory */\
+     *s = 0;                        \
+     sprintf (BUFF, "%s.%c%s.gxref", NAME, ch, s+1);    \
+     /* and restore the filename */            \
+     *s = ch;                        \
+   }                            \
+
+ /* Macro that is used in cp-xref.c to determine whether a file name is
+    absolute or not.
+
+    This checks for both, '/' as first character, since we're running under
+    ixemul.library which provides for this unix'ism, and for the usual
+    logical-terminator, ':', somewhere in the filename. */
+
+ #define FILE_NAME_ABSOLUTE_P(NAME) (NAME[0] == '/' || index(NAME, ':'))
+
+ /* the colon conflicts with the name space of logicals */
+
+ #define PATH_SEPARATOR ','
+
+ /* AmigaDOS handles rename(2) *much* better than any link(2)/unlink(2)
+    hacks. It's actually the inverse case as on Unix. rename(2) was always
+    there, link(2) is new with OS 2.0 */
+
+ #define HAVE_rename 1
diff -rc --new-file gcc-2.5.8/configure gcc-2.5.8-amiga/configure
*** gcc-2.5.8/configure    Fri Nov 19 21:44:34 1993
--- gcc-2.5.8-amiga/configure    Sun Dec 12 17:25:59 1993
***************
*** 45,52 ****

  # Default --srcdir to the directory where the script is found,
  # if a directory was specified.
! # The second sed call is to convert `.//configure' to `./configure'.
! srcdir=`echo $0 | sed 's|//|/|' | sed 's|/[^/]*$||'`
  if [ x$srcdir = x$0 ]
  then
  srcdir=
--- 45,54 ----

  # Default --srcdir to the directory where the script is found,
  # if a directory was specified.
! # The first sed call works around a bug in the AmigaDOS port of sksh, where
! # $0 has a trailing slash appended to it.  It is a NOP for other systems.
! # The third sed call is to convert `.//configure' to `./configure'.
! srcdir=`echo $0 | sed 's|/$||' | sed 's|//|/|' | sed 's|/[^/]*$||'`
  if [ x$srcdir = x$0 ]
  then
  srcdir=
***************
*** 54,61 ****

  host=

! # Default prefix to /usr/local.
! prefix=/usr/local

  # local_prefix specifies where to find the directory /usr/local/include
  # We don't use $(prefix) for this
--- 56,68 ----

  host=

! # Note:  For AmigaDOS we want this to default to /gcc unless we specify
! # otherwise to configure.  Changing it in Makefile.in or config/m68k/x-amigados
! # is ineffective since configure will always change them back in the final
! # generated Makefile, so we have to go to the root of the problem, which is
! # here.  -fnf
! # Default prefix to /gcc.
! prefix=/gcc

  # local_prefix specifies where to find the directory /usr/local/include
  # We don't use $(prefix) for this
***************
*** 63,75 ****
  # even if GCC is installed somewhere other than /usr/local.
  # Think THREE TIMES before specifying any other value for this!
  # DO NOT make this use $prefix!
! local_prefix=/usr/local
  # Default is to let the Makefile set exec_prefix from $(prefix)
  exec_prefix='$(prefix)'

  remove=rm
! hard_link=ln
! symbolic_link='ln -s'
  copy=cp

  # Record all the arguments, to write them in config.status.
--- 70,83 ----
  # even if GCC is installed somewhere other than /usr/local.
  # Think THREE TIMES before specifying any other value for this!
  # DO NOT make this use $prefix!
! # Note:  See AmigaDOS note above for this AmigaDOS specific change.  -fnf
! local_prefix=/local
  # Default is to let the Makefile set exec_prefix from $(prefix)
  exec_prefix='$(prefix)'

  remove=rm
! hard_link=cp
! symbolic_link=cp
  copy=cp

  # Record all the arguments, to write them in config.status.
***************
*** 297,303 ****
      use_collect2=
      # Set this to override the default target model.
      target_cpu_default=
!     # Set this to force use of install.sh.
      broken_install=
      # Set this to control which fixincludes program to use.
      fixincludes=fixincludes
--- 305,312 ----
      use_collect2=
      # Set this to override the default target model.
      target_cpu_default=
!     # Set this to force use of install.sh (if set to 'yes')
!     # Set to name of installer to use a custom installer.
      broken_install=
      # Set this to control which fixincludes program to use.
      fixincludes=fixincludes
***************
*** 642,647 ****
--- 651,666 ----
          tm_file=sparc/lite.h
          use_collect2=yes
          ;;
+     m68k-*-amigados)
+         xm_file=m68k/xm-amigados.h
+         out_file=m68k/amigados.c
+         tm_file=m68k/amigados.h
+         tmake_file=m68k/t-amigados
+         xmake_file=m68k/x-amigados
+         fixincludes=Makefile.in # Headers are already fixed.
+         broken_install=cp
+         install_headers_dir=install-headers-cp
+         ;;
      m68k-cbm-sysv4*)        # Commodore variant of V.4.
          tm_file=m68k/amix.h
          xm_file=m68k/xm-amix.h
***************
*** 1763,1770 ****
  then true
  else
      rm -f Makefile.xx
!     abssrcdir=`cd ${srcdir}; pwd`
!     sed "s|^INSTALL = .*|INSTALL = ${abssrcdir}/install.sh -c|" Makefile.tem > Makefile.xx
      rm -f Makefile.tem
      mv Makefile.xx Makefile.tem
  fi
--- 1782,1795 ----
  then true
  else
      rm -f Makefile.xx
!     if [ x$host_broken_install = xyes ]
!     then
!         abssrcdir=`cd ${srcdir}; pwd`
!         installer=${abssrcdir}/install.sh -c
!     else
!         installer=$host_broken_install
!     fi
!     sed "s|^INSTALL = .*|INSTALL = ${installer}|" Makefile.tem > Makefile.xx
      rm -f Makefile.tem
      mv Makefile.xx Makefile.tem
  fi
diff -rc --new-file gcc-2.5.8/gcc.c gcc-2.5.8-amiga/gcc.c
*** gcc-2.5.8/gcc.c    Fri Nov 26 20:57:21 1993
--- gcc-2.5.8-amiga/gcc.c    Sun Dec 12 17:26:06 1993
***************
*** 1398,1405 ****
--- 1398,1409 ----
    base = choose_temp_base_try (P_tmpdir, base);
  #endif

+ #ifdef amigados
+   base = "ram:";
+ #else
    base = choose_temp_base_try ("/usr/tmp", base);
    base = choose_temp_base_try ("/tmp", base);
+ #endif

    /* If all else fails, use the current directory! */
    if (base == (char *)0)
***************
*** 1408,1414 ****
    len = strlen (base);
    temp_filename = xmalloc (len + sizeof("/ccXXXXXX") + 1);
    strcpy (temp_filename, base);
!   if (len > 0 && temp_filename[len-1] != '/')
      temp_filename[len++] = '/';
    strcpy (temp_filename + len, "ccXXXXXX");

--- 1412,1422 ----
    len = strlen (base);
    temp_filename = xmalloc (len + sizeof("/ccXXXXXX") + 1);
    strcpy (temp_filename, base);
!   if (len > 0 && temp_filename[len-1] != '/'
! #ifdef amigados
!                         && temp_filename[len-1] != ':'
! #endif
!                                     )
      temp_filename[len++] = '/';
    strcpy (temp_filename + len, "ccXXXXXX");

***************
*** 1552,1558 ****

    /* Determine the filename to execute (special case for absolute paths).  */

!   if (*name == '/')
      {
        if (access (name, mode))
      {
--- 1560,1570 ----

    /* Determine the filename to execute (special case for absolute paths).  */

!   if (*name == '/'
! #ifdef amigados
!           || index (name, ':')
! #endif
!                     )
      {
        if (access (name, mode))
      {
***************
*** 1758,1763 ****
--- 1770,1776 ----
     NOT_LAST is nonzero if this is not the last subcommand
     (i.e. its output should be piped to the next one.)  */

+ #ifndef PEXECUTE
  #ifndef OS2
  #ifdef __MSDOS__

***************
*** 1913,1918 ****
--- 1926,1932 ----
    return (search_flag ? spawnv : spawnvp) (1, program, argv);
  }
  #endif /* not OS2 */
+ #endif /* !defined (PEXECUTE) */

  /* Execute the command specified by the arguments on the current line of spec.
     When using pipes, this includes several piped-together commands
***************
*** 2007,2015 ****
--- 2021,2035 ----
      {
        char *string = commands[i].argv[0];

+ #ifdef PEXECUTE
+       commands[i].pid = PEXECUTE (string != commands[i].prog,
+                   string, commands[i].argv,
+                   i + 1 < n_commands);
+ #else
        commands[i].pid = pexecute (string != commands[i].prog,
                    string, commands[i].argv,
                    i + 1 < n_commands);
+ #endif

        if (string != commands[i].prog)
      free (string);
***************
*** 2030,2040 ****
--- 2050,2064 ----
      int pid;
      char *prog;

+ #ifdef PEXECUTE_RESULT
+     pid = PEXECUTE_RESULT (status, commands[i]);
+ #else /* PEXECUTE_RESULT */
  #ifdef __MSDOS__
          status = pid = commands[i].pid;
  #else
      pid = wait (&status);
  #endif
+ #endif /* PEXECUTE_RESULT */
      if (pid < 0)
        abort ();

***************
*** 2141,2146 ****
--- 2165,2171 ----
        if (*endp == PATH_SEPARATOR || *endp == 0)
          {
            strncpy (nstore, startp, endp-startp);
+ #ifndef amigados
            if (endp == startp)
          {
            strcpy (nstore, "./");
***************
*** 2152,2157 ****
--- 2177,2191 ----
          }
            else
          nstore[endp-startp] = 0;
+ #else
+           if (endp[-1] != '/' && endp[-1] != ':')
+         {
+           nstore[endp-startp] = '/';
+           nstore[endp-startp+1] = 0;
+         }
+           else
+         nstore[endp-startp] = 0;
+ #endif
            add_prefix (&exec_prefix, nstore, 0, 0, NULL_PTR);
            if (*endp == 0)
          break;
***************
*** 2174,2179 ****
--- 2208,2214 ----
        if (*endp == PATH_SEPARATOR || *endp == 0)
          {
            strncpy (nstore, startp, endp-startp);
+ #ifndef amigados
            if (endp == startp)
          {
            strcpy (nstore, "./");
***************
*** 2185,2190 ****
--- 2220,2234 ----
          }
            else
          nstore[endp-startp] = 0;
+ #else
+           if (endp[-1] != '/' && endp[-1] != ':')
+         {
+           nstore[endp-startp] = '/';
+           nstore[endp-startp+1] = 0;
+         }
+           else
+         nstore[endp-startp] = 0;
+ #endif
            add_prefix (&startfile_prefix, nstore, 0, 0, NULL_PTR);
            if (*endp == 0)
          break;
***************
*** 2208,2213 ****
--- 2252,2258 ----
        if (*endp == PATH_SEPARATOR || *endp == 0)
          {
            strncpy (nstore, startp, endp-startp);
+ #ifndef amigados
            if (endp == startp)
          {
            strcpy (nstore, "./");
***************
*** 2219,2224 ****
--- 2264,2278 ----
          }
            else
          nstore[endp-startp] = 0;
+ #else
+           if (endp[-1] != '/' && endp[-1] != ':')
+         {
+           nstore[endp-startp] = '/';
+           nstore[endp-startp+1] = 0;
+         }
+           else
+         nstore[endp-startp] = 0;
+ #endif
            add_prefix (&startfile_prefix, nstore, 0, 0, NULL_PTR);
            if (*endp == 0)
          break;
***************
*** 3862,3871 ****
--- 3916,3929 ----
        register char *p;
        int len;

+ #ifdef FILE_NAME_NONDIRECTORY
+       input_basename = FILE_NAME_NONDIRECTORY (input_filename);
+ #else
        input_basename = input_filename;
        for (p = input_filename; *p; p++)
          if (*p == '/')
            input_basename = p + 1;
+ #endif

        /* Find a suffix starting with the last period,
           and set basename_length to exclude that suffix.  */
diff -rc --new-file gcc-2.5.8/genconfig.c gcc-2.5.8-amiga/genconfig.c
*** gcc-2.5.8/genconfig.c    Tue Oct 13 04:11:48 1992
--- gcc-2.5.8-amiga/genconfig.c    Sun Dec 12 17:26:11 1993
***************
*** 303,310 ****
--- 303,318 ----
    printf ("/* Generated automatically by the program `genconfig'\n\
  from the machine description file `md'.  */\n\n");

+ #ifdef amigados
+   /* this constant probably better be 14 in general, or a cross compiling
+      host might choke on some amigados header files... */
+
+   /* Allow at least 14 operands for the sake of asm constructs.  */
+   max_recog_operands = 14;
+ #else
    /* Allow at least 10 operands for the sake of asm constructs.  */
    max_recog_operands = 9;  /* We will add 1 later.  */
+ #endif
    max_dup_operands = 1;

    /* Read the machine description.  */
diff -rc --new-file gcc-2.5.8/gstdarg.h gcc-2.5.8-amiga/gstdarg.h
*** gcc-2.5.8/gstdarg.h    Sat Nov 13 01:54:16 1993
--- gcc-2.5.8-amiga/gstdarg.h    Sun Dec 12 17:26:15 1993
***************
*** 157,160 ****
--- 157,166 ----

  #endif /* __GNUC__ */
  #endif /* not _ANSI_STDARG_H_ */
+ #ifdef amigados
+ # ifndef _VA_LIST
+ #  define _VA_LIST
+    typedef __gnuc_va_list va_list;
+ # endif
+ #endif /* amigados */
  #endif /* not _STDARG_H */
diff -rc --new-file gcc-2.5.8/gstddef.h gcc-2.5.8-amiga/gstddef.h
*** gcc-2.5.8/gstddef.h    Fri Dec  3 11:47:17 1993
--- gcc-2.5.8-amiga/gstddef.h    Sun Dec 12 17:26:20 1993
***************
*** 3,8 ****
--- 3,48 ----
  #ifndef _ANSI_STDDEF_H
  #ifndef __STDDEF_H__

+ #ifdef amigados
+
+ /* GNU libc has special support in this file, 4.3bsd-net2 libc deserves that
+    just as well. The system headers are ANSI compliant, the used compiler IS
+    gcc, so it's really ok to use the system header, no reason to hassle
+    with a jungle of ifdefs. Besides, amigados is only defined if compiling
+    with host=amigados, it doesn't apply if compiling with target=amigados
+    on a different host with possibly different system headers. Same thing
+    would apply to gstdarg.h and gvarargs.h, but those headers are more
+    easily fixable than this one and I'm sick of writing the same comment
+    there as well. MW
+
+    Include the contents of <stddef.h> inline rather than with a #include,
+    to avoid infinite include recursion when this file is installed in
+    gcc's include directory as stddef.h.  (fnf)  */
+
+ #define _STDDEF_H_
+
+ #include <machine/ansi.h>
+
+ typedef    _PTRDIFF_T_    ptrdiff_t;
+
+ #ifdef    _SIZE_T_
+ typedef    _SIZE_T_    size_t;
+ #undef    _SIZE_T_
+ #endif
+
+ #ifdef    _WCHAR_T_
+ typedef    _WCHAR_T_    wchar_t;
+ #undef    _WCHAR_T_
+ #endif
+
+ #ifndef    NULL
+ #define    NULL    0
+ #endif
+
+ #define    offsetof(type, member)    ((size_t)(&((type *)0)->member))
+
+ #else /* not amigados */
+
  /* Any one of these symbols __need_* means that GNU libc
     wants us just to define one data type.  So don't define
     the symbols that indicate this file's entire job has been done.  */
***************
*** 172,177 ****
--- 212,219 ----
  #ifndef __WCHAR_TYPE__
  #define __WCHAR_TYPE__ int
  #endif
+
+ #endif /* not amigados */
  #ifdef __GNUG__
  /* In C++, wchar_t is a distinct basic type,
     and we can expect __wchar_t to be defined by cc1plus.  */
diff -rc --new-file gcc-2.5.8/gvarargs.h gcc-2.5.8-amiga/gvarargs.h
*** gcc-2.5.8/gvarargs.h    Sat Nov 13 08:33:41 1993
--- gcc-2.5.8-amiga/gvarargs.h    Sun Dec 12 17:26:25 1993
***************
*** 156,162 ****
  /* The macro _VA_LIST_T_H is used in the Bull dpx2  */
  #ifndef _VA_LIST_T_H
  #define _VA_LIST_T_H
! #if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__))
  #define _VA_LIST_
  #endif
  #define _VA_LIST
--- 156,162 ----
  /* The macro _VA_LIST_T_H is used in the Bull dpx2  */
  #ifndef _VA_LIST_T_H
  #define _VA_LIST_T_H
! #if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__amigados__))
  #define _VA_LIST_
  #endif
  #define _VA_LIST
***************
*** 172,176 ****
--- 172,183 ----
  #ifdef _BSD_VA_LIST
  #undef _BSD_VA_LIST
  #endif
+
+ #ifdef amigados
+ # ifndef _VA_LIST
+ #  define _VA_LIST
+    typedef __gnuc_va_list va_list;
+ # endif
+ #endif /* amigados */

  #endif /* __GNUC__ */
diff -rc --new-file gcc-2.5.8/machmode.h gcc-2.5.8-amiga/machmode.h
*** gcc-2.5.8/machmode.h    Mon Jun 28 01:18:48 1993
--- gcc-2.5.8-amiga/machmode.h    Sun Dec 12 17:26:29 1993
***************
*** 92,98 ****

  /* Get the name of mode MODE as a string.  */

! extern char *mode_name[];
  #define GET_MODE_NAME(MODE)        (mode_name[(int)(MODE)])

  enum mode_class { MODE_RANDOM, MODE_INT, MODE_FLOAT, MODE_PARTIAL_INT, MODE_CC,
--- 92,98 ----

  /* Get the name of mode MODE as a string.  */

! extern char * const mode_name[];
  #define GET_MODE_NAME(MODE)        (mode_name[(int)(MODE)])

  enum mode_class { MODE_RANDOM, MODE_INT, MODE_FLOAT, MODE_PARTIAL_INT, MODE_CC,
***************
*** 101,107 ****
  /* Get the general kind of object that mode MODE represents
     (integer, floating, complex, etc.)  */

! extern enum mode_class mode_class[];
  #define GET_MODE_CLASS(MODE)        (mode_class[(int)(MODE)])

  /* Nonzero if MODE is an integral mode.  */
--- 101,107 ----
  /* Get the general kind of object that mode MODE represents
     (integer, floating, complex, etc.)  */

! extern const enum mode_class mode_class[];
  #define GET_MODE_CLASS(MODE)        (mode_class[(int)(MODE)])

  /* Nonzero if MODE is an integral mode.  */
***************
*** 117,128 ****

  /* Get the size in bytes of an object of mode MODE.  */

! extern int mode_size[];
  #define GET_MODE_SIZE(MODE)        (mode_size[(int)(MODE)])

  /* Get the size in bytes of the basic parts of an object of mode MODE.  */

! extern int mode_unit_size[];
  #define GET_MODE_UNIT_SIZE(MODE)    (mode_unit_size[(int)(MODE)])

  /* Get the number of units in the object.  */
--- 117,128 ----

  /* Get the size in bytes of an object of mode MODE.  */

! extern const int mode_size[];
  #define GET_MODE_SIZE(MODE)        (mode_size[(int)(MODE)])

  /* Get the size in bytes of the basic parts of an object of mode MODE.  */

! extern const int mode_unit_size[];
  #define GET_MODE_UNIT_SIZE(MODE)    (mode_unit_size[(int)(MODE)])

  /* Get the number of units in the object.  */
***************
*** 144,150 ****

  /* Get the next wider natural mode (eg, QI -> HI -> SI -> DI -> TI).  */

! extern enum machine_mode mode_wider_mode[];
  #define GET_MODE_WIDER_MODE(MODE)    (mode_wider_mode[(int)(MODE)])

  /* Return the mode for data of a given size SIZE and mode class CLASS.
--- 144,150 ----

  /* Get the next wider natural mode (eg, QI -> HI -> SI -> DI -> TI).  */

! extern const enum machine_mode mode_wider_mode[];
  #define GET_MODE_WIDER_MODE(MODE)    (mode_wider_mode[(int)(MODE)])

  /* Return the mode for data of a given size SIZE and mode class CLASS.
diff -rc --new-file gcc-2.5.8/print-tree.c gcc-2.5.8-amiga/print-tree.c
*** gcc-2.5.8/print-tree.c    Wed Oct 27 05:55:26 1993
--- gcc-2.5.8-amiga/print-tree.c    Sun Dec 12 17:26:34 1993
***************
*** 24,30 ****

  extern char **tree_code_name;

! extern char *mode_name[];

  void print_node ();
  void indent_to ();
--- 24,30 ----

  extern char **tree_code_name;

! extern char *const mode_name[];

  void print_node ();
  void indent_to ();
diff -rc --new-file gcc-2.5.8/protoize.c gcc-2.5.8-amiga/protoize.c
*** gcc-2.5.8/protoize.c    Wed Nov 24 19:31:26 1993
--- gcc-2.5.8-amiga/protoize.c    Sun Dec 12 17:26:42 1993
***************
*** 839,846 ****
--- 839,851 ----
  {
    struct default_include *p;

+ #ifdef FILE_NAME_ABSOLUTE_P
+   if (! FILE_NAME_ABSOLUTE_P (path))
+     abort ();
+ #else
    if (path[0] != '/')
      abort ();        /* Must be an absolutized filename.  */
+ #endif

    for (p = include_defaults; p->fname; p++)
      if (!strncmp (path, p->fname, strlen (p->fname))
***************
*** 1267,1273 ****
--- 1272,1282 ----
    {
      const char *src_p;

+ #ifdef FILE_NAME_ABSOLUTE_P
+     if (! FILE_NAME_ABSOLUTE_P (rel_filename))
+ #else
      if (rel_filename[0] != '/')
+ #endif
        {
          src_p = cwd2;
          while (*endp++ = *src_p++)
***************
*** 1530,1535 ****
--- 1539,1563 ----
    return ++q;
  }

+ /* Use this macro to advance a char * over the filename part in a line
+    read from an aux-info file. */
+
+ #ifndef amigados
+ /* Version for file systems where the colon has no special meaning */
+ #define ADVANCE_PAST_FILENAME(CP) \
+   while (* (CP) != ':') (CP)++
+ #else
+ /* Have to heuristically decide whether the colon is part of the filename
+    or whether it serves to delimit the filename from the line number. If
+    it's the latter case, then the character following the colon *must*
+    be a digit. Note that this heuristic fails if the filename starts
+    with a digit. */
+ #define ADVANCE_PAST_FILENAME(CP) \
+     while ((CP)[0] != ':' || !isdigit ((CP)[1])) \
+       (CP)++;
+ #endif
+
+
  /* Given a line from  an aux info file, and a time at which the aux info
     file it came from was created, check to see if the item described in
     the line comes from a file which has been modified since the aux info
***************
*** 1551,1558 ****
    {
      const char *filename_start = p = l + 3;

!     while (*p != ':')
!       p++;
      filename = (char *) alloca ((size_t) (p - filename_start) + 1);
      strncpy (filename, filename_start, (size_t) (p - filename_start));
      filename[p-filename_start] = '\0';
--- 1579,1585 ----
    {
      const char *filename_start = p = l + 3;

!     ADVANCE_PAST_FILENAME (p);
      filename = (char *) alloca ((size_t) (p - filename_start) + 1);
      strncpy (filename, filename_start, (size_t) (p - filename_start));
      filename[p-filename_start] = '\0';
***************
*** 1609,1616 ****
      const char *filename_start = p = l + 3;
      char *filename;

!     while (*p != ':')
!       p++;
      filename = (char *) alloca ((size_t) (p - filename_start) + 1);
      strncpy (filename, filename_start, (size_t) (p - filename_start));
      filename[p-filename_start] = '\0';
--- 1636,1642 ----
      const char *filename_start = p = l + 3;
      char *filename;

!     ADVANCE_PAST_FILENAME (p);
      filename = (char *) alloca ((size_t) (p - filename_start) + 1);
      strncpy (filename, filename_start, (size_t) (p - filename_start));
      filename[p-filename_start] = '\0';
***************
*** 2330,2336 ****
    {
      char *p = aux_info_base;

!     while (*p != ':')
        p++;
      p++;
      while (*p == ' ')
--- 2356,2364 ----
    {
      char *p = aux_info_base;

!     /* have to make sure at least one space is following the colon to make
!        sure the colon is not part of the filename */
!     while (*p != ':' && p[1] != ' ')
        p++;
      p++;
      while (*p == ' ')
***************
*** 2344,2350 ****
        continue;
      aux_info_second_line = p;
      aux_info_relocated_name = 0;
!     if (invocation_filename[0] != '/')
        {
      /* INVOCATION_FILENAME is relative;
         append it to BASE_SOURCE_FILENAME's dir.  */
--- 2372,2382 ----
        continue;
      aux_info_second_line = p;
      aux_info_relocated_name = 0;
! #ifdef FILE_NAME_ABSOLUTE_P
!     if (! FILE_NAME_ABSOLUTE_P (invocation_filename))
! #else
!       if (invocation_filename[0] != '/')
! #endif
        {
      /* INVOCATION_FILENAME is relative;
         append it to BASE_SOURCE_FILENAME's dir.  */
***************
*** 2432,2438 ****
  #ifndef UNPROTOIZE

  /* Check an individual filename for a .c suffix.  If the filename has this
!    suffix, rename the file such that its suffix is changed to .C.  This
     function implements the -C option.  */

  static void
--- 2464,2470 ----
  #ifndef UNPROTOIZE

  /* Check an individual filename for a .c suffix.  If the filename has this
!    suffix, rename the file such that its suffix is changed to .cc.  This
     function implements the -C option.  */

  static void
***************
*** 2441,2447 ****
  {
    const char *filename = hp->symbol;
    int last_char_index = strlen (filename) - 1;
!   char *const new_filename = (char *) alloca (strlen (filename) + 1);

    /* Note that we don't care here if the given file was converted or not.  It
       is possible that the given file was *not* converted, simply because there
--- 2473,2479 ----
  {
    const char *filename = hp->symbol;
    int last_char_index = strlen (filename) - 1;
!   char *const new_filename = (char *) alloca (strlen (filename) + 2);

    /* Note that we don't care here if the given file was converted or not.  It
       is possible that the given file was *not* converted, simply because there
***************
*** 2453,2460 ****
      return;

    strcpy (new_filename, filename);
!   new_filename[last_char_index] = 'C';

    if (my_link (filename, new_filename) == -1)
      {
        fprintf (stderr, "%s: warning: can't link file `%s' to `%s': %s\n",
--- 2485,2509 ----
      return;

    strcpy (new_filename, filename);
!   strcat (new_filename + last_char_index, "cc");
!
!   /* use rename(2) if available !! Update config files to include HAVE_rename
!      if the used OS provides it. Advantages are: it's atomic, it's one
!      system call compared to two. */
!
! #ifdef HAVE_rename
!   /* if the mentioned systems (POSIX 1003.1-1988) have rename(2), this has
!      to be changed to `my_rename' as well. */

+   if (rename (filename, new_filename) == -1)
+     {
+       fprintf (stderr, "%s: warning: can't rename file `%s' to `%s': %s\n",
+            pname, shortpath (NULL, filename),
+            shortpath (NULL, new_filename), sys_errlist[errno]);
+       errors++;
+       return;
+     }
+ #else
    if (my_link (filename, new_filename) == -1)
      {
        fprintf (stderr, "%s: warning: can't link file `%s' to `%s': %s\n",
***************
*** 2471,2476 ****
--- 2520,2526 ----
        errors++;
        return;
      }
+ #endif
  }

  #endif /* !defined (UNPROTOIZE) */
diff -rc --new-file gcc-2.5.8/real.c gcc-2.5.8-amiga/real.c
*** gcc-2.5.8/real.c    Wed Oct 13 19:46:38 1993
--- gcc-2.5.8-amiga/real.c    Sun Dec 12 17:26:49 1993
***************
*** 4333,4341 ****
    if (y[NE - 1] == 0x7fff)
      {
        if (sign)
!     sprintf (wstring, " -Infinity ");
        else
!     sprintf (wstring, " Infinity ");
        goto bxit;
      }

--- 4333,4341 ----
    if (y[NE - 1] == 0x7fff)
      {
        if (sign)
!     sprintf (wstring, " -NaN ");
        else
!     sprintf (wstring, " NaN ");
        goto bxit;
      }

diff -rc --new-file gcc-2.5.8/rtl.c gcc-2.5.8-amiga/rtl.c
*** gcc-2.5.8/rtl.c    Thu Oct  7 21:05:00 1993
--- gcc-2.5.8-amiga/rtl.c    Sun Dec 12 17:26:54 1993
***************
*** 50,56 ****

  #define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS)   NAME ,

! char *rtx_name[] = {
  #include "rtl.def"        /* rtl expressions are documented here */
  };

--- 50,56 ----

  #define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS)   NAME ,

! char * const rtx_name[] = {
  #include "rtl.def"        /* rtl expressions are documented here */
  };

***************
*** 61,67 ****

  #define DEF_MACHMODE(SYM, NAME, CLASS, SIZE, UNIT, WIDER)  NAME,

! char *mode_name[(int) MAX_MACHINE_MODE] = {
  #include "machmode.def"

  #ifdef EXTRA_CC_MODES
--- 61,67 ----

  #define DEF_MACHMODE(SYM, NAME, CLASS, SIZE, UNIT, WIDER)  NAME,

! char * const mode_name[(int) MAX_MACHINE_MODE] = {
  #include "machmode.def"

  #ifdef EXTRA_CC_MODES
***************
*** 77,83 ****

  #define DEF_MACHMODE(SYM, NAME, CLASS, SIZE, UNIT, WIDER)  CLASS,

! enum mode_class mode_class[(int) MAX_MACHINE_MODE] = {
  #include "machmode.def"
  };

--- 77,83 ----

  #define DEF_MACHMODE(SYM, NAME, CLASS, SIZE, UNIT, WIDER)  CLASS,

! const enum mode_class mode_class[(int) MAX_MACHINE_MODE] = {
  #include "machmode.def"
  };

***************
*** 88,94 ****

  #define DEF_MACHMODE(SYM, NAME, CLASS, SIZE, UNIT, WIDER)  SIZE,

! int mode_size[(int) MAX_MACHINE_MODE] = {
  #include "machmode.def"
  };

--- 88,94 ----

  #define DEF_MACHMODE(SYM, NAME, CLASS, SIZE, UNIT, WIDER)  SIZE,

! const int mode_size[(int) MAX_MACHINE_MODE] = {
  #include "machmode.def"
  };

***************
*** 99,105 ****

  #define DEF_MACHMODE(SYM, NAME, CLASS, SIZE, UNIT, WIDER)  UNIT,

! int mode_unit_size[(int) MAX_MACHINE_MODE] = {
  #include "machmode.def"        /* machine modes are documented here */
  };

--- 99,105 ----

  #define DEF_MACHMODE(SYM, NAME, CLASS, SIZE, UNIT, WIDER)  UNIT,

! const int mode_unit_size[(int) MAX_MACHINE_MODE] = {
  #include "machmode.def"        /* machine modes are documented here */
  };

***************
*** 112,118 ****
  #define DEF_MACHMODE(SYM, NAME, CLASS, SIZE, UNIT, WIDER)  \
    (enum machine_mode) WIDER,

! enum machine_mode mode_wider_mode[(int) MAX_MACHINE_MODE] = {
  #include "machmode.def"        /* machine modes are documented here */
  };

--- 112,118 ----
  #define DEF_MACHMODE(SYM, NAME, CLASS, SIZE, UNIT, WIDER)  \
    (enum machine_mode) WIDER,

! const enum machine_mode mode_wider_mode[(int) MAX_MACHINE_MODE] = {
  #include "machmode.def"        /* machine modes are documented here */
  };

***************
*** 126,132 ****
     rtx's of that code.  The sequence is a C string in which
     each character describes one operand.  */

! char *rtx_format[] = {
    /* "*" undefined.
           can cause a warning message
       "0" field is unused (or used in a phase-dependent manner)
--- 126,132 ----
     rtx's of that code.  The sequence is a C string in which
     each character describes one operand.  */

! char *const rtx_format[] = {
    /* "*" undefined.
           can cause a warning message
       "0" field is unused (or used in a phase-dependent manner)
***************
*** 157,163 ****
  /* Indexed by rtx code, gives a character representing the "class" of
     that rtx code.  See rtl.def for documentation on the defined classes.  */

! char rtx_class[] = {
  #define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS)   CLASS,
  #include "rtl.def"        /* rtl expressions are defined here */
  #undef DEF_RTL_EXPR
--- 157,163 ----
  /* Indexed by rtx code, gives a character representing the "class" of
     that rtx code.  See rtl.def for documentation on the defined classes.  */

! const char rtx_class[] = {
  #define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS)   CLASS,
  #include "rtl.def"        /* rtl expressions are defined here */
  #undef DEF_RTL_EXPR
***************
*** 165,171 ****

  /* Names for kinds of NOTEs and REG_NOTEs.  */

! char *note_insn_name[] = { 0                    , "NOTE_INSN_DELETED",
                 "NOTE_INSN_BLOCK_BEG", "NOTE_INSN_BLOCK_END",
                 "NOTE_INSN_LOOP_BEG", "NOTE_INSN_LOOP_END",
                 "NOTE_INSN_FUNCTION_END", "NOTE_INSN_SETJMP",
--- 165,171 ----

  /* Names for kinds of NOTEs and REG_NOTEs.  */

! char * const note_insn_name[] = { 0                    , "NOTE_INSN_DELETED",
                 "NOTE_INSN_BLOCK_BEG", "NOTE_INSN_BLOCK_END",
                 "NOTE_INSN_LOOP_BEG", "NOTE_INSN_LOOP_END",
                 "NOTE_INSN_FUNCTION_END", "NOTE_INSN_SETJMP",
***************
*** 173,179 ****
                 "NOTE_INSN_PROLOGUE_END", "NOTE_INSN_EPILOGUE_BEG",
                 "NOTE_INSN_DELETED_LABEL", "NOTE_INSN_FUNCTION_BEG"};

! char *reg_note_name[] = { "", "REG_DEAD", "REG_INC", "REG_EQUIV", "REG_WAS_0",
                "REG_EQUAL", "REG_RETVAL", "REG_LIBCALL",
                "REG_NONNEG", "REG_NO_CONFLICT", "REG_UNUSED",
                "REG_CC_SETTER", "REG_CC_USER", "REG_LABEL",
--- 173,180 ----
                 "NOTE_INSN_PROLOGUE_END", "NOTE_INSN_EPILOGUE_BEG",
                 "NOTE_INSN_DELETED_LABEL", "NOTE_INSN_FUNCTION_BEG"};

! char * const reg_note_name[] =
!              { "", "REG_DEAD", "REG_INC", "REG_EQUIV", "REG_WAS_0",
                "REG_EQUAL", "REG_RETVAL", "REG_LIBCALL",
                "REG_NONNEG", "REG_NO_CONFLICT", "REG_UNUSED",
                "REG_CC_SETTER", "REG_CC_USER", "REG_LABEL",
diff -rc --new-file gcc-2.5.8/rtl.h gcc-2.5.8-amiga/rtl.h
*** gcc-2.5.8/rtl.h    Wed Sep 29 22:34:24 1993
--- gcc-2.5.8-amiga/rtl.h    Sun Dec 12 17:27:00 1993
***************
*** 44,56 ****
  extern int rtx_length[];
  #define GET_RTX_LENGTH(CODE)        (rtx_length[(int)(CODE)])

! extern char *rtx_name[];
  #define GET_RTX_NAME(CODE)        (rtx_name[(int)(CODE)])

! extern char *rtx_format[];
  #define GET_RTX_FORMAT(CODE)        (rtx_format[(int)(CODE)])

! extern char rtx_class[];
  #define GET_RTX_CLASS(CODE)        (rtx_class[(int)(CODE)])

  /* Common union for an element of an rtx.  */
--- 44,56 ----
  extern int rtx_length[];
  #define GET_RTX_LENGTH(CODE)        (rtx_length[(int)(CODE)])

! extern char * const rtx_name[];
  #define GET_RTX_NAME(CODE)        (rtx_name[(int)(CODE)])

! extern char * const rtx_format[];
  #define GET_RTX_FORMAT(CODE)        (rtx_format[(int)(CODE)])

! extern const char rtx_class[];
  #define GET_RTX_CLASS(CODE)        (rtx_class[(int)(CODE)])

  /* Common union for an element of an rtx.  */
***************
*** 331,337 ****

  /* Names for REG_NOTE's in EXPR_LIST insn's.  */

! extern char *reg_note_name[];
  #define GET_REG_NOTE_NAME(MODE) (reg_note_name[(int)(MODE)])

  /* The label-number of a code-label.  The assembler label
--- 331,337 ----

  /* Names for REG_NOTE's in EXPR_LIST insn's.  */

! extern char *const reg_note_name[];
  #define GET_REG_NOTE_NAME(MODE) (reg_note_name[(int)(MODE)])

  /* The label-number of a code-label.  The assembler label
***************
*** 408,414 ****

  /* Names for NOTE insn's other than line numbers.  */

! extern char *note_insn_name[];
  #define GET_NOTE_INSN_NAME(NOTE_CODE) (note_insn_name[-(NOTE_CODE)])

  /* The name of a label, in case it corresponds to an explicit label
--- 408,414 ----

  /* Names for NOTE insn's other than line numbers.  */

! extern char *const note_insn_name[];
  #define GET_NOTE_INSN_NAME(NOTE_CODE) (note_insn_name[-(NOTE_CODE)])

  /* The name of a label, in case it corresponds to an explicit label
diff -rc --new-file gcc-2.5.8/scan-types.sh gcc-2.5.8-amiga/scan-types.sh
*** gcc-2.5.8/scan-types.sh    Tue Oct 26 23:01:02 1993
--- gcc-2.5.8-amiga/scan-types.sh    Sun Dec 12 17:27:04 1993
***************
*** 1,4 ****
! #! /bin/sh
  # Deduce values of standard ANSI and POSIX types (e.g. size_t, pid_t).
  # Emits macros definitions for these, and some other types.
  # Intended to be used to massage the sys-protos.h file.
--- 1,4 ----
! #!/bin/sh
  # Deduce values of standard ANSI and POSIX types (e.g. size_t, pid_t).
  # Emits macros definitions for these, and some other types.
  # Intended to be used to massage the sys-protos.h file.
diff -rc --new-file gcc-2.5.8/toplev.c gcc-2.5.8-amiga/toplev.c
*** gcc-2.5.8/toplev.c    Sat Dec 11 00:59:54 1993
--- gcc-2.5.8-amiga/toplev.c    Sun Dec 12 17:27:11 1993
***************
*** 504,509 ****
--- 504,510 ----
    {"unroll-all-loops", &flag_unroll_all_loops, 1},
    {"writable-strings", &flag_writable_strings, 1},
    {"peephole", &flag_no_peephole, 0},
+   {"large-baserel", &flag_pic, 4},
    {"force-mem", &flag_force_mem, 1},
    {"force-addr", &flag_force_addr, 1},
    {"function-cse", &flag_no_function_cse, 0},
***************
*** 522,527 ****
--- 523,529 ----
    {"schedule-insns2", &flag_schedule_insns_after_reload, 1},
    {"pic", &flag_pic, 1},
    {"PIC", &flag_pic, 2},
+   {"baserel", &flag_pic, 3},
    {"fast-math", &flag_fast_math, 1},
    {"common", &flag_no_common, 0},
    {"inhibit-size-directive", &flag_inhibit_size_directive, 1},
***************
*** 1530,1535 ****
--- 1532,1540 ----
       FILE *asm_file;
       char *input_name;
  {
+ #ifdef FILE_NAME_NONDIRECTORY
+   char *na = FILE_NAME_NONDIRECTORY (input_name);
+ #else
    int len = strlen (input_name);
    char *na = input_name + len;

***************
*** 1540,1545 ****
--- 1545,1551 ----
      break;
        na--;
      }
+ #endif

  #ifdef ASM_OUTPUT_MAIN_SOURCE_FILENAME
    ASM_OUTPUT_MAIN_SOURCE_FILENAME (asm_file, na);
***************
*** 3507,3512 ****
--- 3513,3519 ----

  #ifndef OS2
  #ifndef VMS
+ #ifndef amigados
    if (flag_print_mem)
      {
        char *lim = (char *) sbrk (0);
***************
*** 3521,3526 ****
--- 3528,3534 ----
        system ("ps v");
  #endif /* not USG */
      }
+ #endif /* not amigados */
  #endif /* not VMS */
  #endif /* not OS2 */

diff -rc --new-file gcc-2.5.8/tree.c gcc-2.5.8-amiga/tree.c
*** gcc-2.5.8/tree.c    Sun Oct 10 21:08:12 1993
--- gcc-2.5.8-amiga/tree.c    Sun Dec 12 17:27:17 1993
***************
*** 248,254 ****
  /* Unique id for next type created.  */
  static int next_type_uid = 1;

! extern char *mode_name[];

  void gcc_obstack_init ();
  static tree stabilize_reference_1 ();
--- 248,254 ----
  /* Unique id for next type created.  */
  static int next_type_uid = 1;

! extern char *const mode_name[];

  void gcc_obstack_init ();
  static tree stabilize_reference_1 ();