Merge branch 'regex-impl' of github.com:waywardmonkeys/emscripten into incoming1.7.6

Conflicts:
	tools/shared.py

1 files changed, 6 insertions, 0 deletions

diff --git a/emcc b/emcc
index 9afec57a..4c3aa009 100755
--- a/emcc
+++ b/emcc
@@ -1430,6 +1430,12 @@ try:
           'wctob.c',
           'wctomb.c',
          ]],
+         ['regex', [
+          'regcomp.c',
+          'regerror.c',
+          'regexec.c',
+          'tre-mem.c',
+         ]],
          ['stdio', [
           'fwprintf.c',
           'swprintf.c',