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

diff --cc ChangeLog
index 2f45bbae49ad24ce037ffba2e96bf4081c3f2c4f,1e22a45c475c73ff7e87d35eac29118735b3c170..fc743105458ffabb5cdc680fcc1b58d43fe7e84c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,17 +1,22 @@@
 +2012-04-24  Andreas Jaeger  <aj@suse.de>
 +
 +      * Makerules (common-clean): Also remove gen-as-const-headers
 +      files.
 +
+ 2012-04-24  Joseph Myers  <joseph@codesourcery.com>
+ 
+       * Makerules (native-compile): Do not change working directory for
+       build.  Use $(OUTPUT_OPTION) in command.
+       (ALL_BUILD_CFLAGS): Use $(common-objpfx) to find config.h.
+ 
+ 2012-04-24  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+ 
+       [BZ #13886]
+       * sysdeps/powerpc/powerpc64/fpu/s_floorl.S: Delete file. Use the
+       sysdeps/ieee754/ldbl-128ibm/s_floorl.c version instead.
+       * math/libm-test.inc (floor_test): Add more tests.
+       * sysdeps/powerpc/fpu/libm-test-ulps: Update for pow tests.
+ 
  2012-04-24  Joseph Myers  <joseph@codesourcery.com>
  
        * sysdeps/unix/getdents.c: Remove file.

diff --cc Makerules
Simple merge