AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-10 07:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://sourceware.org/git/glibc

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Ulrich Drepper 2011-10-15 16:28:27 -04:00
commit e9b25bd930
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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

9
configure vendored
View File

@ -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

9
configure.in
View File

@ -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)

4
wcsmbs/wmemcmp.c
View File

@ -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