This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

PATCH: libstdc++/3243


Checked by rebuilding libstdc++-v3 in an already bootstrapped 3.0 tree
and visually inspecting libstdc++-v3/include/bits/gthr.h as produced
during the reconfiguration step.  Also, checked that, as installed, no
additional failures were seen with -I- (done by hand editing
testsuite_flags to add -I- before -I${SRC_DIR}/testsuite in the
--install-includes case and running ``gmake check-script-install'').

OK for mainline?

Completely unrelated, pending patch for libstdc++/3195 was also in
source tree.

2001-06-20  Loren J. Rittle  <ljrittle@acm.org>

	* acinclude.m4 (GLIBCPP_ENABLE_THREADS): Add relative path
	while staging so that -I- works with the installed gthr.h file.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.129.2.21
diff -c -r1.129.2.21 acinclude.m4
*** acinclude.m4	2001/06/14 08:47:35	1.129.2.21
--- acinclude.m4	2001/06/20 08:29:12
***************
*** 1137,1143 ****
  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])
--- 1137,1144 ----
  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])
***************
*** 1155,1161 ****
    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 \
--- 1156,1163 ----
    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 \


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]