This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-366-gb468825
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Oct 2011 18:49:15 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-366-gb468825
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via b468825a053aed4db613f06ea88f94008bbf3472 (commit)
via 7872cfb09feb6f4aabb62a8aea8035e6c3ce2ddb (commit)
from 2d1f3a4db65d2731a695dee6b973accea8b9adc0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b468825a053aed4db613f06ea88f94008bbf3472
commit b468825a053aed4db613f06ea88f94008bbf3472
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat Oct 15 20:29:06 2011 +0200
Fix lost wmemcmp symbol
diff --git a/ChangeLog b/ChangeLog
index 2771cd3..d6760b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
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.
diff --git a/wcsmbs/wmemcmp.c b/wcsmbs/wmemcmp.c
index e7edc87..73c6394 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
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7872cfb09feb6f4aabb62a8aea8035e6c3ce2ddb
commit 7872cfb09feb6f4aabb62a8aea8035e6c3ce2ddb
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat Oct 15 20:08:45 2011 +0200
Fix searching for C++ system headers for cross compilers
diff --git a/ChangeLog b/ChangeLog
index 414611a..2771cd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-15 Andreas Schwab <schwab@linux-m68k.org>
+
+ * 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 b59049f..ec1d651 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 b2949b4..6977fe1 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)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
configure | 9 +++++++--
configure.in | 9 +++++++--
wcsmbs/wmemcmp.c | 4 ++--
4 files changed, 23 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources