[commits] r12595 - in /fsf/trunk/libc: ChangeLog elf/Makefile

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jan 19 00:03:12 2011
New Revision: 12595

Log:
Import glibc-mainline for 2011-01-19

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/elf/Makefile

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jan 19 00:03:12 2011
@@ -1,3 +1,7 @@
+2011-01-18  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* elf/Makefile: Build IFUNC tests unless multi-arch = no.
+
 2011-01-17  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* version.h (RELEASE): Bump for 2.13 release.

Modified: fsf/trunk/libc/elf/Makefile
==============================================================================
--- fsf/trunk/libc/elf/Makefile (original)
+++ fsf/trunk/libc/elf/Makefile Wed Jan 19 00:03:12 2011
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2007,2008,2009,2010 Free Software Foundation, Inc.
+# Copyright (C) 1995-2007,2008,2009,2010,2011 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -274,7 +274,7 @@
 # filtmod1.so has a special rule
 modules-names-nobuild := filtmod1
 
-ifeq (yes,$(multi-arch))
+ifneq (no,$(multi-arch))
 tests-static += ifuncmain1static ifuncmain1picstatic \
 		ifuncmain2static ifuncmain2picstatic \
 		ifuncmain4static ifuncmain4picstatic \