Merge branch 'llvm-svn'

Conflicts:
	src/dlmalloc.c
	tests/dlmalloc.c
	tests/runner.py
	tools/shared.py

1 files changed, 39 insertions, 0 deletions

diff --git a/system/include/libc/sys/timeb.h b/system/include/libc/sys/timeb.h
new file mode 100644
index 00000000..0a2c3de8
--- /dev/null
+++ b/system/include/libc/sys/timeb.h
@@ -0,0 +1,39 @@
+/* timeb.h -- An implementation of the standard Unix <sys/timeb.h> file.
+   Written by Ian Lance Taylor <ian@cygnus.com>
+   Public domain; no rights reserved.
+
+   <sys/timeb.h> declares the structure used by the ftime function, as
+   well as the ftime function itself.  Newlib does not provide an
+   implementation of ftime.  */
+
+#ifndef _SYS_TIMEB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define _SYS_TIMEB_H
+
+#include <_ansi.h>
+#include <machine/types.h>
+
+#ifndef __time_t_defined
+typedef _TIME_T_ time_t;
+#define __time_t_defined
+#endif
+
+struct timeb
+{
+  time_t time;
+  unsigned short millitm;
+  short timezone;
+  short dstflag;
+};
+
+extern int ftime _PARAMS ((struct timeb *));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ! defined (_SYS_TIMEB_H) */