Notes on the merge

[Raja R Harinath]

Jeffrey A Law <law@cygnus.com> writes:
> Kenner made some pretty significant changes to how xm files are
> handled.  Hopefully I got configure.in properly merged after these
> changes.

Here's what I needed to get it compiled on Solaris 2.5 (sparc-sun-solaris2.5).

  Index: gcc/configure
  ===================================================================
  RCS file: /egcs/carton/cvsfiles/egcs/gcc/configure,v
  retrieving revision 1.77
  diff -u -p -u -p -r1.77 egcs/gcc/configure
  --- egcs/gcc/configure  17:04:23	1.77
  +++ egcs/gcc/configure  22:44:16
  @@ -4159,6 +4159,7 @@ for machine in $build $host $target; do
			  tm_file=sparc/sol2-sld.h
		  fi
		  xm_file="sparc/xm-sysv4.h sparc/xm-sol2.h"
  +               xm_defines="USG POSIX"
		  tmake_file=sparc/t-sol2
		  xmake_file=sparc/x-sysv4
		  extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
  Index: gcc/configure.in
  ===================================================================
  RCS file: /egcs/carton/cvsfiles/egcs/gcc/configure.in,v
  retrieving revision 1.77
  diff -u -p -u -p -r1.77 egcs/gcc/configure.in
  --- egcs/gcc/configure.in  17:04:24	1.77
  +++ egcs/gcc/configure.in  22:44:22
  @@ -2476,6 +2476,7 @@ for machine in $build $host $target; do
			  tm_file=sparc/sol2-sld.h
		  fi
		  xm_file="sparc/xm-sysv4.h sparc/xm-sol2.h"
  +               xm_defines="USG POSIX"
		  tmake_file=sparc/t-sol2
		  xmake_file=sparc/x-sysv4
		  extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
  Index: gcc/config/sparc/xm-sysv4.h
  ===================================================================
  RCS file: /egcs/carton/cvsfiles/egcs/gcc/config/sparc/xm-sysv4.h,v
  retrieving revision 1.1.1.2
  diff -u -p -u -p -r1.1.1.2 egcs/gcc/config/sparc/xm-sysv4.h
  --- egcs/gcc/config/sparc/xm-sysv4.h  05:29:15	1.1.1.2
  +++ egcs/gcc/config/sparc/xm-sysv4.h  22:44:22
  @@ -35,6 +35,8 @@ Boston, MA 02111-1307, USA.  */
      matters when cross-compiling.  */
   #define HOST_WORDS_BIG_ENDIAN 1

  +#include "xm-siglist.h"
  +
   /* target machine dependencies.
      tm.h is a symbolic link to the actual target specific file.   */
   #include "tm.h"

The last diff is to `sparc/xm-sysv4.h' rather than `sparc/xm-sol2.h':
`sparc/xm-sysv4.h' originally included `xm-svr4.h' (deleted by Kenner,
but still in egcs repo), which in turn had the defines `USG' & `POSIX',
and the contents of `xm-siglist.h'.

- Hari
-- 
Raja R Harinath ------------------------------ harinath@cs.umn.edu
"When all else fails, read the instructions."      -- Cahn's Axiom
"Our policy is, when in doubt, do the right thing."   -- Roy L Ash