[3.0.1 and mainline] PATCH for libstdc++/3243

Loren James Rittle rittle@latour.rsch.comm.mot.com
Mon Jul 2 14:35:00 GMT 2001


This patch was approved for use on 3.0.1 and mainline over a week ago
by Alexandre Oliva.  Fully bootstrapped and checked with no
regressions in either location on i386-unknown-freebsd4.2.  Installed
on both.  Sorry for the delay.

[I will check in the fix for the dreaded Mandrake 8.0 bootstrap
 failure libstdc++/3284 next after it finishes bootstrapping here.]

2001-07-02  Loren J. Rittle  <ljrittle@acm.org>

	libstdc++/3243
	* acinclude.m4 (GLIBCPP_ENABLE_THREADS): Add relative path to
	staged/installed area to support -I-.  Document.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

Index: libstdc++-v3/acinclude.m4
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/acinclude.m4,v
retrieving revision 1.161
diff -c -r1.161 acinclude.m4
*** acinclude.m4	2001/06/26 23:35:19	1.161
--- acinclude.m4	2001/07/02 21:13:57
***************
*** 1142,1148 ****
  dnl and process to <file> with an output command.  The reason for a two-
  dnl stage process here is to correctly handle $srcdir!=$objdir without
  dnl having to write complex code (the sed commands to clean the macro
! dnl namespace are complex and fragile enough as it is).
  dnl
  AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
    AC_MSG_CHECKING([for thread model used by GCC])
--- 1142,1149 ----
  dnl and process to <file> with an output command.  The reason for a two-
  dnl stage process here is to correctly handle $srcdir!=$objdir without
  dnl having to write complex code (the sed commands to clean the macro
! dnl namespace are complex and fragile enough as it is).  We must also
! dnl add a relative path so that -I- is supported properly.
  dnl
  AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
    AC_MSG_CHECKING([for thread model used by GCC])
***************
*** 1160,1166 ****
    fi
    AC_OUTPUT_COMMANDS([d=include/bits
      rm -f $d/gthr.h $d/gthr-single.h $d/gthr-default.h
!     sed '/^#/s/\([A-Z_][A-Z_]*\)/_GLIBCPP_\1/g' <$d/gthr.h-in >$d/gthr.h
      sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-single.h-in \
        | sed 's/\(GCC[A-Z_]*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
      sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \
--- 1161,1168 ----
    fi
    AC_OUTPUT_COMMANDS([d=include/bits
      rm -f $d/gthr.h $d/gthr-single.h $d/gthr-default.h
!     sed '/^#/s/\([A-Z_][A-Z_]*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
!       | sed 's,"gthr-,"bits/gthr-,' >$d/gthr.h
      sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-single.h-in \
        | sed 's/\(GCC[A-Z_]*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
      sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \



More information about the Gcc-patches mailing list