AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-29 16:21:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,605 Commits 334 Branches 1,646 Tags 278 MiB
f230c29b40
Commit Graph

14103 Commits

Author SHA1 Message Date
H.J. Lu
61f65140eb Define __SYSCALL_WORDSIZE for x86-64 2012-05-21 11:45:16 -07:00
Andreas Jaeger
5fefb43629 [BZ #13691], Revert breakage of iconv() converter for TCVN-5712. 
* iconvdata/tcvn5712-1.c (BODY for FROM_LOOP): Don't consider
	inptr and inend for must_buffer_ch.
	* wcsmbs/tst-mbsnrtowcs.c: Remove file.
	* wcsmbs/Makefile (tests): Remove tst-mbsnrtowcs.
	* stdio-common/Makefile (tests): Remove bug15.
	(bug15-ENV): Remove macro.
	* stdio-common/bug15.c: Remove, we do not support vi_VN.TCVN5712-1
	anymore.

localedata:
	* SUPPORTED: Remove vi_VN.TCVN/TCVN5712-1.
	* tst-strptime.c: Remove, we do not support vi_VN.TCVN5712-1
	anymore.
	* Makefile (LOCALES): Remove vi_VN.TCVN5712-1 from list.
	(tests): Remove tst-strptime.
 2012-05-21 20:41:36 +02:00
Andreas Jaeger
d8e272abb3 Rewrite manual/contrib.texi 
* manual/contrib.texi: Completely rewritten. It contains now an
	alphabetical list of contributors and their contributions.
 2012-05-21 20:33:57 +02:00
H.J. Lu
d024d23cbe Add x32 syscalls.list 2012-05-21 11:32:25 -07:00
Richard Henderson
4a56a16205 * misc/getauxval.c (__getauxval): Use unsigned long int. 
* misc/sys/auxv.h: Include <sys/cdefs.h>.
        (getauxval): Use unsigned long int.
 2012-05-21 11:27:04 -07:00
Roland McGrath
cbc00a0398 Set MALLOC_ALIGNMENT to at least __alignof__ (long double) for new ABIs. 2012-05-21 11:13:10 -07:00
Adhemerval Zanella
478143fa17 PowerPC: ULPs update 
Adjustments for libm ulps added with commit d8b82cad1b,
495fd99f3a, and 5ba3cc691c.
I also adjusted some exp10 ulps definition that was higher than needed.
 2012-05-21 14:28:51 -03:00
Richard Henderson
c7683a6d02 Add <sys/auxv.h> and getauxval. 2012-05-20 10:40:35 -07:00
Adhemerval Zanella
a6f1845d45 Update powerpc ULPs for ccos, csin, ccosh, csinh tests. 2012-05-19 15:46:20 +00:00
David S. Miller
cbcbe830f9 Update sparc ULPs for ccos, csin, ccosh, csinh tests. 2012-05-19 15:36:55 +00:00
Joseph Myers
e0b16cc25c Fix ccos, csin, ccosh, csinh overflows (bug 14123). 2012-05-19 15:35:29 +00:00
H.J. Lu
f66f0ce833 Add 64-bit preadv.c and pwritev.c 2012-05-19 06:51:12 -07:00
H.J. Lu
6ad13e088d Add a comment to sysdeps/x86_64/x32/_itoa.h 2012-05-19 06:46:29 -07:00
H.J. Lu
bb07f69f3b Use __syscall_slong_t in bits/timex.h 2012-05-19 06:45:33 -07:00
Joseph Myers
b1d072a75e Remove sysdeps/powerpc/soft-fp. 2012-05-19 10:03:24 +00:00
Andreas Jaeger
9eae47cb5b Delete unused csu/.gitignore 2012-05-19 11:35:20 +02:00
Andreas Jaeger
e6bdb741d1 Fix INSTALL description for modified files in source dir 2012-05-18 20:30:51 +02:00
H.J. Lu
1b74487e90 Use RAX_LP and "or" to operate on return value 2012-05-18 11:05:56 -07:00
Tulio Magno Quites Machado Filho
a88b64b9bb [PowerPC] Remove -ftree-loop-linear from Makefiles 
In the past the "-ftree-loop-linear" switch provided a measurable
improvement in performance for certain functions.  At some point it
was assigned as the responsibility of Graphite in GCC.  It has been
found that even with Graphite enabled these flags no longer perform
any appreciable improvement over the baseline.

Graphite now has some open bugs which need to be fixed in order for it
to provide measurable performance improvements but it lacks active
development.  As a result some compiler distributors may disable
Graphite.  If Graphite is disabled then building GLIBC will fail if
the "-ftree-loop-linear" switch is used.

This patch removes the use of "-ftree-loop-linear" as unnecessary.
 2012-05-18 10:15:30 -05:00
H.J. Lu
610b86225e Add sysdeps/x86_64/x32/_itoa.h 2012-05-18 07:37:55 -07:00
H.J. Lu
7cd195df62 Check d_ino/d_off before using getdents syscall 2012-05-18 07:12:47 -07:00
H.J. Lu
94b07d20dd Check _ITOA_NEEDED and use _ITOA_WORD_TYPE 2012-05-18 06:03:04 -07:00
H.J. Lu
18298070c0 Fold copyright years 2012-05-18 04:16:55 -07:00
H.J. Lu
553c7ea4fa Add x32 support to x86_64/bits/sigcontext.h 2012-05-18 04:10:55 -07:00
H.J. Lu
3707636e48 Use anonymous union in x86_64/sys/user.h 2012-05-18 04:07:51 -07:00
Andreas Schwab
37fb1dc057 Avoid runtime GOT relocations in ld.so on powerpc 2012-05-18 12:00:22 +02:00
Andreas Schwab
b53ef01aa2 Fix undefined reference to _dl_prof_resolve in profiled libc 2012-05-18 11:59:44 +02:00
Andreas Jaeger
7a185db2b7 Do not provide inlines for GCC build-in functions 2012-05-18 09:08:14 +02:00
H.J. Lu
428bd7074c Use __syscall_ulong_t in pselect.c 2012-05-17 17:27:13 -07:00
H.J. Lu
3e5aef87d7 Add __fsword_t and use it in bits/statfs.h 2012-05-17 17:20:52 -07:00
David S. Miller
1ba7c3dca1 Bump sha512c-test.c timeout for the sake of 32-bit sparc. 
* crypt/sha512c-test.c (TIMEOUT): Increase to 32.
 2012-05-17 13:33:50 -07:00
Andreas Jaeger
59910343fc Fix warning 
Fixes:
tst-relsort1.c:6:1: warning: function declaration isn’t a prototype
[-Wstrict-prototypes]
 2012-05-17 22:00:57 +02:00
H.J. Lu
2e4c1e9edb Cast to unsigned long 2012-05-17 12:44:52 -07:00
Andreas Jaeger
de7f5ce7c5 Fix warnings on Linux/i686 
Fixes:
../sysdeps/i386/dl-machine.h:336:30: warning: unused variable ‘refsym’ [-Wunused-variable]
rtld.c:1435:3: warning: implicit declaration of function ‘_dl_discover_osversion’ [-Wimplicit-function-declaration]
 2012-05-17 20:17:53 +02:00
Chris Metcalf
286abc3dea Bump up stdio bug22 timeout from 30 seconds to 60 seconds 
The older Tilera platform (tilepro) needs just a hair over 30 seconds
to run this on one core.
 2012-05-17 12:59:08 -04:00
H.J. Lu
477cc68e90 Add tst-mallocalign1 2012-05-17 09:55:25 -07:00
Carlos O'Donell
1a0994f535 BZ#14059: Fix AVX and FMA4 detection. 
Fix AVX and FMA4 detection by following the guidelines
set out by Intel and AMD for detecting these features.
 2012-05-17 06:59:28 -07:00
Chris Metcalf
0af797def3 math: support platforms with limited FP rounding or exception support 
For some tests, just claim that fetestexcept() always returns true,
so the rest of the test can be compiled.

For libm-test, provide known bogus values for unsupported rounding
modes, so fesetround() will return failure.

Elsewhere, just add some #ifdefs to avoid code that uses particular
FP exceptions if the exceptions aren't supported.
 2012-05-17 08:50:41 -04:00
Andreas Jaeger
e39745ffa0 Avoid compiler warnings in qsort/bsearch examples 2012-05-17 11:05:52 +02:00
H.J. Lu
48970aba30 Fold copyright years 2012-05-16 20:02:44 -07:00
Paul Pluzhnikov
bedee953d8 For [BZ #208], accumulate malloc stats over all arenas. 2012-05-16 16:46:10 -07:00
Roland McGrath
30b99d798f BZ#10375: Configure magic to use -fno-stack-protector if needed. 2012-05-16 16:22:50 -07:00
Roland McGrath
61653dfb81 BZ#10375: Configure magic to use -U_FORTIFY_SOURCE if needed. 2012-05-16 16:20:59 -07:00
Roland McGrath
90c885c87b Remove redundant ChangeLog header lines. 2012-05-16 15:32:06 -07:00
H.J. Lu
661768bb50 Use __syscall_slong_t in bits/mqueue.h 2012-05-16 14:39:45 -07:00
H.J. Lu
d4261567b7 Add x32 suppport to x86_64/bits/stat.h 2012-05-16 13:23:20 -07:00
H.J. Lu
cf3ff365ec Add x86-64 bits/typesizes.h 2012-05-16 13:16:18 -07:00
H.J. Lu
76cf3e4d01 Add x86_64/bits/ipctypes.h 2012-05-16 13:02:28 -07:00
H.J. Lu
a637753a56 Use __syscall_ulong_t in bits/ipc.h 2012-05-16 13:01:32 -07:00
H.J. Lu
d5e0511985 Add x32 support to sys/ucontext.h 2012-05-16 12:52:45 -07:00
H.J. Lu
f62ee380a1 Add x32 support to <sys/user.h> 2012-05-16 12:17:31 -07:00
H.J. Lu
953ca31a0c Add x32 gmp-mparam.h 2012-05-16 11:54:57 -07:00
H.J. Lu
617aca05db Add x32 ffs 2012-05-16 11:54:56 -07:00
Joseph Myers
6a3951a036 Update Texinfo version requirement. 2012-05-16 18:50:39 +00:00
Joseph Myers
4e124cedfb Update __STDC_ISO_10646__. 2012-05-16 18:49:30 +00:00
H.J. Lu
5762f7aeff Add x32 support to x86_64/bits/shm.h 2012-05-16 11:48:54 -07:00
H.J. Lu
a26b685664 Add x32 support to x86_64/bits/sem.h 2012-05-16 11:47:22 -07:00
H.J. Lu
cb2b9ef758 Add x32 support to x86_64/bits/msq.h 2012-05-16 11:45:19 -07:00
H.J. Lu
34683bb01b Check __x86_64__ in x86_64/bits/a.out.h 2012-05-16 10:35:34 -07:00
H.J. Lu
84a6878674 Add x86-64 <bits/siginfo.h> 2012-05-16 10:31:10 -07:00
H.J. Lu
48baa5f1d1 Add dummy files for x32 2012-05-16 10:24:02 -07:00
H.J. Lu
180be88bf5 Replace long int with __syscall_slong_t in sys/msg.h 2012-05-16 10:22:18 -07:00
H.J. Lu
5e90c8ad55 Check __x86_64__ in x86-64 sys/reg.h 2012-05-16 10:20:45 -07:00
H.J. Lu
23dfb58b4d Add x32 support to sys/procfs.h 2012-05-16 10:20:06 -07:00
H.J. Lu
ce5d54b0d6 Use ULL suffix on DR_CONTROL_RESERVED 2012-05-16 10:19:17 -07:00
H.J. Lu
13dc9eac61 Add uintptr_t cast to GET_PC/GET_FRAME/GET_STACK 2012-05-16 10:18:30 -07:00
H.J. Lu
a7895d159f Use 64bit filesystem functions for x32 2012-05-16 10:01:44 -07:00
Andreas Schwab
5bd66283db Track dependencies for .oS-only objects 2012-05-16 18:47:38 +02:00
Andreas Schwab
656416c965 Fix dependency tracking on cross-rpcgen-objs 2012-05-16 14:09:23 +02:00
H.J. Lu
a46f2169d3 Remove __snseconds_t 2012-05-15 18:05:26 -07:00
H.J. Lu
6af6528b3b Add __SYSCALL_{S,U}LONG_TYPE to hurd typesizes.h 2012-05-15 17:54:06 -07:00
H.J. Lu
de986b5636 Add __syscall_slong_t and __syscall_ulong_t 2012-05-15 17:41:38 -07:00
H.J. Lu
85736dc78b Use R*_LP, sizeSS, oSS_FLAGS, oSS_SP and oSS_SIZE 2012-05-15 16:43:11 -07:00
Joseph Myers
a9538892ad Split up stackguard-macros.h into sysdeps directories. 2012-05-15 23:34:30 +00:00
H.J. Lu
9317101683 Add x86_64 Implies-after files 2012-05-15 14:38:32 -07:00
Joseph Myers
cc03b29695 Avoid plain "aligned" attributes in installed headers. 2012-05-15 21:26:40 +00:00
H.J. Lu
d86813a021 Use R*_LP to call _dl_profile_fixup and frame size 2012-05-15 14:24:00 -07:00
H.J. Lu
2953ec750f Add x32 init-first.c 2012-05-15 12:51:18 -07:00
H.J. Lu
3b550e9e48 Add sysdeps/x86_64/x32/sysdep.h 2012-05-15 12:49:42 -07:00
H.J. Lu
eda4170670 Use R*_LP on SP and PC in __longjmp.S and setjmp.S 2012-05-15 12:46:04 -07:00
Adhemerval Zanella
9ea01d93f7 Log2 and log10 for wordsize-64. 
This patch also fixes indentation on default dbl-64 code.
 2012-05-15 16:34:41 -03:00
Chris Metcalf
02a9193863 Remove duplicate #include <not-cancel.h> in Linux getsysstats.c 2012-05-15 15:02:58 -04:00
Roland McGrath
6540185fb9 Fix formatting in last change. 2012-05-15 11:45:42 -07:00
Andreas Jaeger
509072a0f7 Avoid race in nscd 
2012-05-15  Jeff Law  <law@redhat.com>
            Andreas Jaeger  <aj@suse.de>

        [BZ #13594]
        * nscd/nscd-client.h (__nscd_acquire_maplock): New function, split
        out from...
        * nscd/nscd_helper.c (__nscd_get_map_ref): ... here.
        * nscd/nscd-client.h: Add __nscd_acquire_maplock.
        * nscd/nscd_gethst_r.c (__nscd_get_nl_timestamp): Add locking to
        code changing __hst_map_handle.map.
 2012-05-15 20:37:05 +02:00
Roland McGrath
ba75122dd9 configure change to handle Implies-{before,after} files 2012-05-15 11:04:22 -07:00
H.J. Lu
890d8bd854 Replace 8-byte data alignment with LP_SIZE alignment 2012-05-15 10:17:30 -07:00
H.J. Lu
f6ee662322 Load pointer to TID into R10_LP 2012-05-15 10:15:35 -07:00
H.J. Lu
ea2626f675 Add x32 dl-cache.h 2012-05-15 10:14:34 -07:00
H.J. Lu
085f715e51 Add x32 getcpu and sched_getcpu 2012-05-15 10:13:55 -07:00
H.J. Lu
be8498fca0 Use RSP_LP to operate on stack in stackinfo.h 2012-05-15 10:00:56 -07:00
H.J. Lu
70bc83b910 Load pointers into RAX_LP in strcmp-sse42.S 2012-05-15 09:59:31 -07:00
H.J. Lu
9bc0b730a6 Load cache sizes into R*_LP in memcpy-ssse3.S 2012-05-15 09:58:28 -07:00
H.J. Lu
6d2850e7f5 Load cache sizes into R*_LP in memcpy-ssse3-back.S 2012-05-15 09:56:17 -07:00
H.J. Lu
3cb845617b Load pointers into R*_LP in strcmp.S 2012-05-15 09:54:05 -07:00
H.J. Lu
54e2ed8105 Load cache sizes into R11_LP/R8_LP 2012-05-15 09:52:35 -07:00
H.J. Lu
8a17f34979 Load cache size into R8_LP 2012-05-15 09:35:43 -07:00
Adhemerval Zanella
777b1eea9d PowerPC - logb[f|l] optimization for POWER7 
This patch provides optimized logb (1.2x on PPC32 and 2.5x on PPC64),
logbf (1.1x on PPC32 and 2.2x on PPC64), and logbl (1.3x on PPC32 and
50% on PPC64) for the POWER7 processor.
 2012-05-15 10:32:28 -05:00
Joseph Myers
d20d4ac2e0 Remove README.libm. 2012-05-15 10:24:47 +00:00
H.J. Lu
6cdef1ab36 Update sysdeps/x86_64/start.S for x32 2012-05-14 17:50:41 -07:00
H.J. Lu
0b254d8f3d Add sysdeps/x86_64/{64,x32}/shlib-versions 2012-05-14 16:23:57 -07:00
Roland McGrath
ceb809dcae Use _dl_fatal_printf instead of a private variant. 2012-05-14 16:10:12 -07:00
H.J. Lu
144c546772 Mention BZ #14103/#14104 in News and ChangeLog 2012-05-14 15:34:37 -07:00
Joseph Myers
37f1abd46c Improve consistency of --enable-kernel and default builds. 2012-05-14 22:22:52 +00:00
H.J. Lu
11de3a3371 Update elf_machine_load_address for x32 2012-05-14 15:17:30 -07:00
H.J. Lu
e02f153a1a Update x86_64 PTR_MANGLE/PTR_DEMANGLE for x32 2012-05-14 15:16:27 -07:00
H.J. Lu
520ae0fd0b Define LP_SIZE/LP_OP/ASM_ADDR/RXX_LP for x86-64 2012-05-14 14:56:07 -07:00
H.J. Lu
b985be81fa Add x32 dl-machine.h 2012-05-14 13:21:46 -07:00
Andreas Jaeger
6a4888ffd6 Do not build manual in source dir 
[BZ #13750]
Do not build manual anymore in the source dir. Also clean up the
Makefile and remove rules that have been used previously
when we had a stand-alone Makefile which was obsoleted recently.
 2012-05-14 22:01:08 +02:00
Andreas Jaeger
7ac772940e Remove unused variable in linux/getcwd.c 2012-05-14 16:27:05 +02:00
Andreas Jaeger
caae5a8101 Remove unused functions from i386/mathinline.h 2012-05-14 16:13:24 +02:00
Joseph Myers
ffb7875d03 Remove pre-2.2 Linux kernel support. 2012-05-14 14:11:02 +00:00
Andreas Jaeger
1bfb72913b Fix concat example 
2012-05-14  Andreas Jaeger  <aj@suse.de>

	* manual/string.texi (Copying and Concatenation): Add missing
	variable in concat example.
	Reported by David C. Rankin <drankinatty@suddenlinkmail.com>.
 2012-05-14 15:30:30 +02:00
H.J. Lu
c044d724dc Use __builtin_clzll on int64 in __logb 2012-05-14 05:04:11 -07:00
H.J. Lu
2523c62bec Free memory at exit in check_pf.c 2012-05-14 05:02:08 -07:00
Liubov Dmitrieva
d7bb4c428a Add optimized expf for x86 
2012-05-14  Liubov Dmitrieva  <liubov.dmitrieva@gmail.com>

	* sysdeps/i386/i686/fpu/multiarch/Makefile: New file.
	* sysdeps/i386/i686fpu/multiarch/e_expf.c: New file.
	* sysdeps/i386/i686fpu/multiarch/e_expf-ia32.S: New file.
	* sysdeps/i386/i686/fpu/multiarch/e_expf-sse2.S: New file.
 2012-05-14 11:23:56 +02:00
Mike Frysinger
9dc4e1fbfc NEWS: update ia64 info 
Mention that ia64 has moved into ports/, and drop the old build/install
details that don't belong in the NEWS file in the first place.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
 2012-05-14 01:02:35 -04:00
Andreas Schwab
c7df011202 Fix warning in powerpc bcopy 2012-05-12 17:41:37 +02:00
Thomas Schwinge
dc70356cbf Avoid dup3 PLT usage. 
Fixes fallout from 5aa3a74a59.
 2012-05-12 10:53:04 +08:00
H.J. Lu
9fb1a21f4d Add x32 support to STACK_CHK_GUARD 2012-05-11 16:31:34 -07:00
H.J. Lu
4822a2a520 Add x32 support to TLS_LE/TLS_IE/TLS_GD 2012-05-11 14:35:56 -07:00
David S. Miller
842b81d611 Mark sparc %fsr load and store inline asms as volatile. 
* sysdeps/sparc/fpu/bits/fenv.h (__fenv_stfsr): Add __volatile__.
	* sysdeps/sparc/fpu/fpu_control.h (_FPU_GETCW):	Likewise.
	(_FPU_SETCW): Likewise.
 2012-05-11 13:58:41 -07:00
H.J. Lu
1cf463cd4e Check if RTLD_SAVESPACE_SSE is aligned to 32 bytes 2012-05-11 11:50:11 -07:00
Andreas Schwab
60cc4a18e6 Complete GB18030 charmap 2012-05-11 19:24:00 +02:00
Thomas Schwinge
febb44a4cb [BZ #13673] Replace FSF snail mail address with URL. 2012-05-11 17:39:57 +08:00
H.J. Lu
0a10fb9eec Don't handle R_X86_64_RELATIVE64 in ld.so 2012-05-10 19:24:54 -07:00
H.J. Lu
df8a552f6f Handle R_X86_64_RELATIVE64 and R_X86_64_64 for x32 2012-05-10 17:05:06 -07:00
Samuel Thibault
f42d41d107 Hurd: Define some posix types 2012-05-10 15:57:29 -07:00
Samuel Thibault
3c3571fc10 Hurd: Fix paths in paths.h 2012-05-10 15:57:29 -07:00
Samuel Thibault
61f06bd3ba Hurd: fix mode type for openat 2012-05-10 15:57:29 -07:00
Samuel Thibault
918d4d7163 Hurd: Fix port deallocation on mknod error. 2012-05-10 15:57:28 -07:00
Samuel Thibault
f34d6f840e Hurd: Fix __dup3 _hurd_dtable_lock usage. 2012-05-10 15:57:28 -07:00
Thomas Schwinge
674cdbc7a3 Hurd: Support --prefix=/usr special-casing for all GNU systems. 2012-05-10 15:57:28 -07:00
Thomas Schwinge
8e41b99fe1 Hurd: struct timespec members in struct stat 2012-05-10 15:57:28 -07:00
Thomas Schwinge
10589b4adb Hurd: avoid PLT call to strtoul 2012-05-10 15:57:28 -07:00
Pino Toscano
63643c85d4 Hurd: hurdsock: reject negative domains 2012-05-10 15:57:28 -07:00
Samuel Thibault
3faebe6abc Hurd: Fix setres[ug]id handling of -1 2012-05-10 15:57:27 -07:00
Pino Toscano
c6474b07e7 Hurd: _hurd_select: check for invalid parameter values 2012-05-10 15:57:27 -07:00
Samuel Thibault
1043890b10 Hurd: Fix sbrk beyond 128MB 2012-05-10 15:57:27 -07:00
Pino Toscano
37ed8b9bdc Hurd: recvfrom(): take into account null address ports 2012-05-10 15:57:27 -07:00
Samuel Thibault
b29d4053f0 Hurd: readlinkat 2012-05-10 15:57:27 -07:00
Samuel Thibault
db65366043 Hurd: Update posix_opt.h 2012-05-10 15:57:27 -07:00
Samuel Thibault
ee16e894aa Hurd: Fix POSIX 2008 visibility 2012-05-10 15:57:26 -07:00
Thomas Schwinge
6103ae3b0e Hurd: Build pldd also if use-ldconfig != yes || build-shared != yes 2012-05-10 15:57:26 -07:00
Thomas Schwinge
80b4e5f3ef Hurd: opendirat 2012-05-10 15:57:26 -07:00
Samuel Thibault
edadcbd624 Hurd: empty file names fail with ENOENT 2012-05-10 15:57:26 -07:00
Thomas Schwinge
1792c087e5 Hurd: hidden_nolink macro for NO_HIDDEN case. 2012-05-10 15:57:26 -07:00
Thomas Schwinge
8069478040 Hurd: mmap deficiencies 2012-05-10 15:57:26 -07:00
Samuel Thibault
66cbbebcc6 Hurd: Fix mlock in all cases except non-readable pages. 2012-05-10 15:57:25 -07:00
Samuel Thibault
6b645f0d70 Hurd: Fix mkdir / error value 2012-05-10 15:57:25 -07:00
Thomas Schwinge
e468f8a3a7 Hurd: Add missing includes 2012-05-10 15:57:25 -07:00