Re: Patch: Fix for bootstrap/3075

[Nathan Sidwell <nathan at codesourcery dot com>]

Alexandre Oliva wrote:
> Yep.  Also note that you should modify acinclude.m4, not aclocal.m4,
> since the latter is generated from the former.  Please mention in the
> ChangeLog that you're rebuilding both aclocal.m4 and configure after
> the change in acinclude.m4, then check it in after making these
> changes, in mainline and branch.
No, that's not the right patch. AC_LINK_FILE prepends `$srcdir/' to the
filenames, so we need the relative path from there to gcc. This patch
does that and it works for

sibling-dir bootstrap on i686-pc-linux-gnu
in-dir bootstrap on sparc-sun-solaris2.7

so is this one ok for mainline & branch?

The in-dir build now fails further on, and I'm investigating

nathan

-- 
Dr Nathan Sidwell   ::   http://www.codesourcery.com   ::   CodeSourcery LLC
         'But that's a lie.' - 'Yes it is. What's your point?'
nathan@codesourcery.com : http://www.cs.bris.ac.uk/~nathan/ : nathan@acm.org
2001-06-11  Nathan Sidwell  <nathan@codesourcery.com>

	* configure.in (auxdir): Replace by ...
	(toprel): ... new variable.
	(toplevel_srcdir): Construct from $toprel.
	* acinclude.m4 (GLIBCPP_ENABLE_THREADS): Use $toprel
	rather than .. to locate gcc source directory.
	(GLIBCPP_CONFIGURE): Replace $auxdir with $srcdir/$toprel.
	* aclocal.m4, configure: Rebuilt.

Index: configure.in
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/configure.in,v
retrieving revision 1.63
diff -c -3 -p -r1.63 configure.in
*** configure.in	2001/06/01 09:22:05	1.63
--- configure.in	2001/06/11 12:52:42
*************** AC_INIT(src/ios.cc)
*** 11,32 ****
  # source directory.
  if test "${srcdir}" = "."; then
    if test -z "${with_target_subdir}"; then
!     toplevel_srcdir="\${top_srcdir}/.."
!     auxdir="${srcdir}/.."
    else
      if test "${with_target_subdir}" != "."; then
!       toplevel_srcdir="\${top_srcdir}/${with_multisrctop}../.."
!       auxdir="${srcdir}/${with_multisrctop}../.."
      else
!       toplevel_srcdir="\${top_srcdir}/${with_multisrctop}.."
!       auxdir="${srcdir}/${with_multisrctop}.."
      fi
    fi
  else
!   toplevel_srcdir="\${top_srcdir}/.."
!   auxdir="${srcdir}/.."
  fi
! AC_CONFIG_AUX_DIR($auxdir)
  AC_SUBST(toplevel_srcdir)
  
  dnl This is here just to satisfy automake.
--- 11,29 ----
  # source directory.
  if test "${srcdir}" = "."; then
    if test -z "${with_target_subdir}"; then
!     toprel=".."
    else
      if test "${with_target_subdir}" != "."; then
!       toprel="${with_multisrctop}../.."
      else
!       toprel="${with_multisrctop}.."
      fi
    fi
  else
!   toprel=".."
  fi
! AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
! toplevel_srcdir=\${top_srcdir}/$toprel
  AC_SUBST(toplevel_srcdir)
  
  dnl This is here just to satisfy automake.
Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/acinclude.m4,v
retrieving revision 1.155
diff -c -3 -p -r1.155 acinclude.m4
*** acinclude.m4	2001/06/11 04:36:55	1.155
--- acinclude.m4	2001/06/11 12:52:43
*************** AC_DEFUN(GLIBCPP_CONFIGURE, [
*** 14,20 ****
      *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
     esac], [multilib=yes])dnl
  
!   glibcpp_basedir=$auxdir/$1/libstdc++-v3
    AC_SUBST(glibcpp_basedir)
  
    AM_INIT_AUTOMAKE(libstdc++, 2.92)
--- 14,20 ----
      *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
     esac], [multilib=yes])dnl
  
!   glibcpp_basedir=$srcdir/$toprel/$1/libstdc++-v3
    AC_SUBST(glibcpp_basedir)
  
    AM_INIT_AUTOMAKE(libstdc++, 2.92)
*************** AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
*** 1146,1154 ****
    target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
    AC_MSG_RESULT([$target_thread_file])
  
!   AC_LINK_FILES(../gcc/gthr.h, include/bits/gthr.h-in)
!   AC_LINK_FILES(../gcc/gthr-single.h, include/bits/gthr-single.h-in)
!   AC_LINK_FILES(../gcc/gthr-$target_thread_file.h,
  		include/bits/gthr-default.h-in)
    if test $target_thread_file != single; then
      AC_DEFINE(HAVE_GTHR_DEFAULT)
--- 1146,1155 ----
    target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
    AC_MSG_RESULT([$target_thread_file])
  
!   AC_LINK_FILES($toprel/gcc/gthr.h, include/bits/gthr.h-in)
!   AC_LINK_FILES($toprel/gcc/gthr-single.h,
! 		include/bits/gthr-single.h-in)
!   AC_LINK_FILES($toprel/gcc/gthr-$target_thread_file.h,
  		include/bits/gthr-default.h-in)
    if test $target_thread_file != single; then
      AC_DEFINE(HAVE_GTHR_DEFAULT)