[Commits] r22871 - in /fsf/trunk/libc: ChangeLog Makefile.in benchtests/Makefile elf/elf.h rt/tst-aio7.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Apr 17 00:03:06 2013
New Revision: 22871

Log:
Import glibc-mainline for 2013-04-17

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/Makefile.in
    fsf/trunk/libc/benchtests/Makefile
    fsf/trunk/libc/elf/elf.h
    fsf/trunk/libc/rt/tst-aio7.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Apr 17 00:03:06 2013
@@ -1,3 +1,20 @@
+2013-04-16  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* rt/tst-aio7.c (do_test): Don't test O_RDONLY fd case, which is now
+	considered kosher.
+
+2013-04-16  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	* benchtests/Makefile: Include cppflags-iterator.mk to add
+	-DNOT_IN_libc=1 to CPPFLAGS of all benchmark programs.
+
+	* Makefile.in (bench-clean): New target.
+	* benchtests/Makefile (bench-clean): Likewise.
+
+2013-04-16  David Holsgrove  <david.holsgrove@xxxxxxxxxx>
+
+	* elf/elf.h: Add EM_MICROBLAZE and MicroBlaze relocations.
+
 2013-04-15  Thomas Schwinge  <thomas@xxxxxxxxxxxxxxxx>
 
 	* stdio-common/tstdiomisc.c: Fix coding-style violation.

Modified: fsf/trunk/libc/Makefile.in
==============================================================================
--- fsf/trunk/libc/Makefile.in (original)
+++ fsf/trunk/libc/Makefile.in Wed Apr 17 00:03:06 2013
@@ -12,7 +12,7 @@
 	LANGUAGE=C LC_ALL=C; export LANGUAGE LC_ALL; \
 	$(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@
 
-bench:
+bench bench-clean:
 	$(MAKE) -C $(srcdir)/benchtests $(PARALLELMFLAGS) objdir=`pwd` $@
 
 # Convenience target to rebuild ULPs for all math tests.

Modified: fsf/trunk/libc/benchtests/Makefile
==============================================================================
--- fsf/trunk/libc/benchtests/Makefile (original)
+++ fsf/trunk/libc/benchtests/Makefile Wed Apr 17 00:03:06 2013
@@ -114,11 +114,20 @@
 
 binaries-bench := $(addprefix $(objpfx)bench-,$(bench))
 
+# This makes sure CPPFLAGS-nonlib and CFLAGS-nonlib are passed
+# for all these modules.
+cpp-srcs-left := $(binaries-bench:=.c)
+lib := nonlib
+include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+
 bench-deps := bench-skeleton.c Makefile
 
 run-bench = $(test-wrapper-env) \
 	    GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
 	    $($*-ENV) $(rtld-prefix) $${run}
+
+bench-clean:
+	rm -f $(binaries-bench) $(addsuffix .o,$(binaries-bench))
 
 bench: $(binaries-bench)
 	{ for run in $^; do \

Modified: fsf/trunk/libc/elf/elf.h
==============================================================================
--- fsf/trunk/libc/elf/elf.h (original)
+++ fsf/trunk/libc/elf/elf.h Wed Apr 17 00:03:06 2013
@@ -251,6 +251,7 @@
 #define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
 #define EM_AARCH64	183		/* ARM AARCH64 */
 #define EM_TILEPRO	188		/* Tilera TILEPro */
+#define EM_MICROBLAZE	189		/* Xilinx MicroBlaze */
 #define EM_TILEGX	191		/* Tilera TILE-Gx */
 #define EM_NUM		192
 
@@ -2955,6 +2956,37 @@
 #define R_M32R_GOTOFF_LO	64	/* Low 16 bit offset to GOT */
 #define R_M32R_NUM		256	/* Keep this the last entry. */
 
+/* MicroBlaze relocations */
+#define R_MICROBLAZE_NONE		0	/* No reloc. */
+#define R_MICROBLAZE_32 		1	/* Direct 32 bit. */
+#define R_MICROBLAZE_32_PCREL		2	/* PC relative 32 bit. */
+#define R_MICROBLAZE_64_PCREL		3	/* PC relative 64 bit. */
+#define R_MICROBLAZE_32_PCREL_LO	4	/* Low 16 bits of PCREL32. */
+#define R_MICROBLAZE_64 		5	/* Direct 64 bit. */
+#define R_MICROBLAZE_32_LO		6	/* Low 16 bit. */
+#define R_MICROBLAZE_SRO32		7	/* Read-only small data area. */
+#define R_MICROBLAZE_SRW32		8	/* Read-write small data area. */
+#define R_MICROBLAZE_64_NONE		9	/* No reloc. */
+#define R_MICROBLAZE_32_SYM_OP_SYM	10	/* Symbol Op Symbol relocation. */
+#define R_MICROBLAZE_GNU_VTINHERIT	11	/* GNU C++ vtable hierarchy. */
+#define R_MICROBLAZE_GNU_VTENTRY	12	/* GNU C++ vtable member usage. */
+#define R_MICROBLAZE_GOTPC_64		13	/* PC-relative GOT offset.  */
+#define R_MICROBLAZE_GOT_64		14	/* GOT entry offset.  */
+#define R_MICROBLAZE_PLT_64		15	/* PLT offset (PC-relative).  */
+#define R_MICROBLAZE_REL		16	/* Adjust by program base.  */
+#define R_MICROBLAZE_JUMP_SLOT		17	/* Create PLT entry.  */
+#define R_MICROBLAZE_GLOB_DAT		18	/* Create GOT entry.  */
+#define R_MICROBLAZE_GOTOFF_64		19	/* 64 bit offset to GOT. */
+#define R_MICROBLAZE_GOTOFF_32		20	/* 32 bit offset to GOT. */
+#define R_MICROBLAZE_COPY		21	/* Runtime copy.  */
+#define R_MICROBLAZE_TLS		22	/* TLS Reloc. */
+#define R_MICROBLAZE_TLSGD		23	/* TLS General Dynamic. */
+#define R_MICROBLAZE_TLSLD		24	/* TLS Local Dynamic. */
+#define R_MICROBLAZE_TLSDTPMOD32	25	/* TLS Module ID. */
+#define R_MICROBLAZE_TLSDTPREL32	26	/* TLS Offset Within TLS Block. */
+#define R_MICROBLAZE_TLSDTPREL64	27	/* TLS Offset Within TLS Block. */
+#define R_MICROBLAZE_TLSGOTTPREL32	28	/* TLS Offset From Thread Pointer. */
+#define R_MICROBLAZE_TLSTPREL32 	29	/* TLS Offset From Thread Pointer. */
 
 /* TILEPro relocations.  */
 #define R_TILEPRO_NONE		0	/* No reloc */

Modified: fsf/trunk/libc/rt/tst-aio7.c
==============================================================================
--- fsf/trunk/libc/rt/tst-aio7.c (original)
+++ fsf/trunk/libc/rt/tst-aio7.c Wed Apr 17 00:03:06 2013
@@ -78,7 +78,7 @@
       puts ("aio_cancel( -1, {-2..} ) did not return -1 or errno != EBADF");
   }
 
-  /* Test for aio_fsync() detecting bad fd, and fd not open for writing.  */
+  /* Test for aio_fsync() detecting bad fd.  */
   {
     struct aiocb cb;
     int fd = -1;
@@ -98,21 +98,6 @@
 	puts ("aio_fsync( op, {-1..} ) did not return -1 or errno != EBADF");
 	++result;
       }
-
-    if ((fd = open ("/dev/null", O_RDONLY)) < 0)
-      error (1, errno, "opening /dev/null");
-
-    cb.aio_fildes = fd;
-    errno = 0;
-
-    /* Case two: valid fd but open for read only.  */
-    if (aio_fsync (O_SYNC, &cb) != -1 || errno != EBADF)
-      {
-	puts ("aio_fsync( op, {RO..} ) did not return -1 or errno != EBADF");
-	++result;
-      }
-
-    close (fd);
   }
 
   /* Test for aio_suspend() suspending even if completed elements in list.  */

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