[Commits] r19236 - in /branches/eglibc-2_15: ./ libc/ ports/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Fri Jun 22 15:16:33 2012
New Revision: 19236

Log:
Merge changes between r19163 and r19235 from /fsf/glibc-2_15-branch.

Modified:
    branches/eglibc-2_15/   (props changed)
    branches/eglibc-2_15/libc/ChangeLog
    branches/eglibc-2_15/libc/aclocal.m4
    branches/eglibc-2_15/libc/configure
    branches/eglibc-2_15/ports/ChangeLog.alpha
    branches/eglibc-2_15/ports/ChangeLog.arm
    branches/eglibc-2_15/ports/ChangeLog.hppa

Propchange: branches/eglibc-2_15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 22 15:16:33 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_15-branch:16509-19163
+/fsf/glibc-2_15-branch:16509-19235
 /fsf/trunk:15224-16494

Modified: branches/eglibc-2_15/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_15/libc/ChangeLog (original)
+++ branches/eglibc-2_15/libc/ChangeLog Fri Jun 22 15:16:33 2012
@@ -1,3 +1,12 @@
+2012-06-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #14167]
+	* aclocal.m4 (LIBC_TRY_CC_OPTION): New macro.
+	* configure: Regenerated.
+	* sysdeps/ia64/configure: Likewise.
+	* sysdeps/mach/configure: Likewise.
+	* sysdeps/mach/hurd/configure: Likewise.
+
 2012-05-17  Andreas Jaeger  <aj@xxxxxxx>
 	    Carlos O'Donell  <carlos_odonell@xxxxxxxxxx>
 

Modified: branches/eglibc-2_15/libc/aclocal.m4
==============================================================================
--- branches/eglibc-2_15/libc/aclocal.m4 (original)
+++ branches/eglibc-2_15/libc/aclocal.m4 Fri Jun 22 15:16:33 2012
@@ -117,6 +117,12 @@
 gnu_ld=$libc_cv_prog_ld_gnu
 ])
 
+dnl Test a compiler option or options with an empty input file.
+dnl LIBC_TRY_CC_OPTION([options], [action-if-true], [action-if-false])
+AC_DEFUN([LIBC_TRY_CC_OPTION],
+[AS_IF([AC_TRY_COMMAND([${CC-cc} $1 -xc /dev/null -S -o /dev/null])],
+	[$2], [$3])])
+
 # These two macros are taken from GCC's config/acx.m4.
 dnl Support the --with-pkgversion configure option.
 dnl ACX_PKGVERSION(default-pkgversion)

Modified: branches/eglibc-2_15/libc/configure
==============================================================================
--- branches/eglibc-2_15/libc/configure (original)
+++ branches/eglibc-2_15/libc/configure Fri Jun 22 15:16:33 2012
@@ -7732,7 +7732,15 @@
 else
   libc_cv_cc_nofma=
 for opt in -ffp-contract=off -mno-fused-madd; do
-  LIBC_TRY_CC_OPTION($opt, libc_cv_cc_nofma=$opt; break)
+  if { ac_try='${CC-cc} $opt -xc /dev/null -S -o /dev/null'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  libc_cv_cc_nofma=$opt; break
+fi
+
 done
 fi
 { $as_echo "$as_me:$LINENO: result: $libc_cv_cc_nofma" >&5

Modified: branches/eglibc-2_15/ports/ChangeLog.alpha
==============================================================================
--- branches/eglibc-2_15/ports/ChangeLog.alpha (original)
+++ branches/eglibc-2_15/ports/ChangeLog.alpha Fri Jun 22 15:16:33 2012
@@ -1,3 +1,7 @@
+2012-06-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/alpha/elf/configure: Regenerated.
+
 2011-10-05  Andreas Schwab  <schwab@xxxxxxxxxx>
 
 	* sysdeps/alpha/dl-machine.h (elf_machine_rela)

Modified: branches/eglibc-2_15/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_15/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_15/ports/ChangeLog.arm Fri Jun 22 15:16:33 2012
@@ -1,3 +1,7 @@
+2012-06-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/arm/configure: Regenerated.
+
 2012-02-15  Khem Raj  <raj.khem@xxxxxxxxx>
 
 	[BZ #12097]

Modified: branches/eglibc-2_15/ports/ChangeLog.hppa
==============================================================================
--- branches/eglibc-2_15/ports/ChangeLog.hppa (original)
+++ branches/eglibc-2_15/ports/ChangeLog.hppa Fri Jun 22 15:16:33 2012
@@ -1,3 +1,8 @@
+2012-06-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/hppa/configure: Regenerated.
+	* sysdeps/hppa/elf/configure: Regenerated.
+
 2011-10-21  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/hppa/sys/procfs.h: Update copyright year.

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits