diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-10-15 16:28:27 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-10-15 16:28:27 -0400 |
| commit | e9b25bd9303436af1de65afea4e984b640b2c81d (patch) | |
| tree | 066e112c2c11bab5f3fa1ff42ba70b71fa678537 | |
| parent | fd5bdc0924e0cfd1688b632068c1b26f3b0c88da (diff) | |
| parent | b468825a053aed4db613f06ea88f94008bbf3472 (diff) | |
| download | glibc-e9b25bd9303436af1de65afea4e984b640b2c81d.tar.gz glibc-e9b25bd9303436af1de65afea4e984b640b2c81d.tar.xz glibc-e9b25bd9303436af1de65afea4e984b640b2c81d.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | wcsmbs/wmemcmp.c | 4 |
4 files changed, 23 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index a708003301..3e71646be1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,13 @@ * ctype/Versions: Export __ctype_init for GLIBC_PRIVATE. * sysdeps/unix/sysv/linux/init-first.c (_init): Call __ctype_init. +2011-10-15 Andreas Schwab <schwab@linux-m68k.org> + + * wcsmbs/wmemcmp.c (WMEMCMP): Define. + + * configure.in: Also look in $cxxmachine/include for C++ system + headers. + 2011-09-27 Liubov Dmitrieva <liubov.dmitrieva@gmail.com> * sysdeps/x86_64/multiarch/Makefile: (sysdep_routines): Add diff --git a/configure b/configure index b59049f639..ec1d6514a4 100755 --- a/configure +++ b/configure @@ -5372,11 +5372,16 @@ if test -n "$sysheaders"; then SYSINCLUDES="$SYSINCLUDES \ -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" if test -n "$CXX"; then + CXX_SYSINCLUDES= cxxversion=`$CXX -dumpversion 2>&5` && cxxmachine=`$CXX -dumpmachine 2>&5` && - cxxheaders=`$CXX -print-file-name=../../../../include/c++/`"$cxxversion" && - CXX_SYSINCLUDES="-isystem $cxxheaders \ + for d in include "$cxxmachine/include"; do + i=../../../../$d/c++/$cxxversion + cxxheaders=`$CXX -print-file-name="$i"` && + test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" && + CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \ -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward" + done fi fi diff --git a/configure.in b/configure.in index b2949b4958..6977fe1015 100644 --- a/configure.in +++ b/configure.in @@ -1061,11 +1061,16 @@ if test -n "$sysheaders"; then SYSINCLUDES="$SYSINCLUDES \ -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" if test -n "$CXX"; then + CXX_SYSINCLUDES= cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` && cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` && - cxxheaders=`$CXX -print-file-name=../../../../include/c++/`"$cxxversion" && - CXX_SYSINCLUDES="-isystem $cxxheaders \ + for d in include "$cxxmachine/include"; do + i=../../../../$d/c++/$cxxversion + cxxheaders=`$CXX -print-file-name="$i"` && + test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" && + CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \ -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward" + done fi fi AC_SUBST(SYSINCLUDES) diff --git a/wcsmbs/wmemcmp.c b/wcsmbs/wmemcmp.c index e7edc87164..73c6394f8e 100644 --- a/wcsmbs/wmemcmp.c +++ b/wcsmbs/wmemcmp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997i, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. @@ -20,7 +20,7 @@ #include <wchar.h> #ifndef WMEMCMP -# define wmemcmp +# define WMEMCMP wmemcmp #endif int |