Skip to content

Commit 0d33848

Browse files
brsonbrson
committed
---
yaml --- r: 6192 b: refs/heads/master c: fdeb5ba h: refs/heads/master v: v3
1 parent 9f8b312 commit 0d33848

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1611
-347
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 06d14f3a1cef79977da60c392b1c52d4ab87e2c7
2+
refs/heads/master: fdeb5ba3043bbd173bd5b7308e98dde723f66d5c

‎trunk/mk/libuv/ia32/mac/src/rt/libuv/run-tests.target.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
5050
$(obj).target/$(TARGET)/src/rt/libuv/test/test-idle.o \
5151
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ipc.o \
5252
$(obj).target/$(TARGET)/src/rt/libuv/test/test-loop-handles.o \
53+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-multiple-listen.o \
5354
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pass-always.o \
5455
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ping-pong.o \
5556
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-bind-error.o \
57+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-connect-error.o \
5658
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ref.o \
5759
$(obj).target/$(TARGET)/src/rt/libuv/test/test-shutdown-eof.o \
5860
$(obj).target/$(TARGET)/src/rt/libuv/test/test-spawn.o \
@@ -64,6 +66,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
6466
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect-error.o \
6567
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect6-error.o \
6668
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-error.o \
69+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-to-half-open-connection.o \
6770
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-writealot.o \
6871
$(obj).target/$(TARGET)/src/rt/libuv/test/test-threadpool.o \
6972
$(obj).target/$(TARGET)/src/rt/libuv/test/test-timer-again.o \

‎trunk/mk/libuv/ia32/mac/src/rt/libuv/uv.target.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/src/uv-common.o \
8989
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/tty.o \
9090
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/stream.o \
9191
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/cares.o \
92+
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/dl.o \
9293
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/error.o \
9394
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/process.o \
9495
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/eio/eio.o \

‎trunk/mk/libuv/ia32/unix/src/rt/libuv/run-benchmarks.target.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DEFS_Default := '-D_LARGEFILE_SOURCE' \
88
'-DEIO_STACKSIZE=262144'
99

1010
# Flags passed to all source files.
11-
CFLAGS_Default :=
11+
CFLAGS_Default := -pthread
1212

1313
# Flags passed to only C files.
1414
CFLAGS_C_Default :=
@@ -61,7 +61,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.c FORCE_DO_CMD
6161

6262
# End of this set of suffix rules
6363
### Rules for final target.
64-
LDFLAGS_Default := -pthread
64+
LDFLAGS_Default :=
6565

6666
LIBS := -lrt
6767

‎trunk/mk/libuv/ia32/unix/src/rt/libuv/run-tests.target.mk

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DEFS_Default := '-D_LARGEFILE_SOURCE' \
88
'-DEIO_STACKSIZE=262144'
99

1010
# Flags passed to all source files.
11-
CFLAGS_Default :=
11+
CFLAGS_Default := -pthread
1212

1313
# Flags passed to only C files.
1414
CFLAGS_C_Default :=
@@ -40,9 +40,11 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
4040
$(obj).target/$(TARGET)/src/rt/libuv/test/test-idle.o \
4141
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ipc.o \
4242
$(obj).target/$(TARGET)/src/rt/libuv/test/test-loop-handles.o \
43+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-multiple-listen.o \
4344
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pass-always.o \
4445
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ping-pong.o \
4546
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-bind-error.o \
47+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-connect-error.o \
4648
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ref.o \
4749
$(obj).target/$(TARGET)/src/rt/libuv/test/test-shutdown-eof.o \
4850
$(obj).target/$(TARGET)/src/rt/libuv/test/test-spawn.o \
@@ -54,6 +56,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
5456
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect-error.o \
5557
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect6-error.o \
5658
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-error.o \
59+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-to-half-open-connection.o \
5760
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-writealot.o \
5861
$(obj).target/$(TARGET)/src/rt/libuv/test/test-threadpool.o \
5962
$(obj).target/$(TARGET)/src/rt/libuv/test/test-timer-again.o \
@@ -92,7 +95,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.c FORCE_DO_CMD
9295

9396
# End of this set of suffix rules
9497
### Rules for final target.
95-
LDFLAGS_Default := -pthread
98+
LDFLAGS_Default :=
9699

97100
LIBS := -lrt
98101

‎trunk/mk/libuv/ia32/unix/src/rt/libuv/uv.target.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ DEFS_Default := '-D_LARGEFILE_SOURCE' \
1111
'-DEIO_CONFIG_H="config_linux.h"'
1212

1313
# Flags passed to all source files.
14-
CFLAGS_Default := -g \
14+
CFLAGS_Default := -pthread \
15+
-g \
1516
--std=gnu89 \
1617
-pedantic \
1718
-Wall \
@@ -84,6 +85,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/src/uv-common.o \
8485
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/tty.o \
8586
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/stream.o \
8687
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/cares.o \
88+
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/dl.o \
8789
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/error.o \
8890
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/process.o \
8991
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/eio/eio.o \

‎trunk/mk/libuv/ia32/win/src/rt/libuv/run-tests.target.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
3737
$(obj).target/$(TARGET)/src/rt/libuv/test/test-idle.o \
3838
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ipc.o \
3939
$(obj).target/$(TARGET)/src/rt/libuv/test/test-loop-handles.o \
40+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-multiple-listen.o \
4041
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pass-always.o \
4142
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ping-pong.o \
4243
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-bind-error.o \
44+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-connect-error.o \
4345
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ref.o \
4446
$(obj).target/$(TARGET)/src/rt/libuv/test/test-shutdown-eof.o \
4547
$(obj).target/$(TARGET)/src/rt/libuv/test/test-spawn.o \
@@ -51,6 +53,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
5153
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect-error.o \
5254
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect6-error.o \
5355
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-error.o \
56+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-to-half-open-connection.o \
5457
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-writealot.o \
5558
$(obj).target/$(TARGET)/src/rt/libuv/test/test-threadpool.o \
5659
$(obj).target/$(TARGET)/src/rt/libuv/test/test-timer-again.o \

‎trunk/mk/libuv/ia32/win/src/rt/libuv/uv.target.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/src/uv-common.o \
7171
$(obj).target/$(TARGET)/src/rt/libuv/src/win/async.o \
7272
$(obj).target/$(TARGET)/src/rt/libuv/src/win/cares.o \
7373
$(obj).target/$(TARGET)/src/rt/libuv/src/win/core.o \
74+
$(obj).target/$(TARGET)/src/rt/libuv/src/win/dl.o \
7475
$(obj).target/$(TARGET)/src/rt/libuv/src/win/error.o \
7576
$(obj).target/$(TARGET)/src/rt/libuv/src/win/fs.o \
7677
$(obj).target/$(TARGET)/src/rt/libuv/src/win/fs-event.o \

‎trunk/mk/libuv/x86_64/mac/src/rt/libuv/run-tests.target.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
5050
$(obj).target/$(TARGET)/src/rt/libuv/test/test-idle.o \
5151
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ipc.o \
5252
$(obj).target/$(TARGET)/src/rt/libuv/test/test-loop-handles.o \
53+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-multiple-listen.o \
5354
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pass-always.o \
5455
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ping-pong.o \
5556
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-bind-error.o \
57+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-connect-error.o \
5658
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ref.o \
5759
$(obj).target/$(TARGET)/src/rt/libuv/test/test-shutdown-eof.o \
5860
$(obj).target/$(TARGET)/src/rt/libuv/test/test-spawn.o \
@@ -64,6 +66,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
6466
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect-error.o \
6567
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect6-error.o \
6668
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-error.o \
69+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-to-half-open-connection.o \
6770
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-writealot.o \
6871
$(obj).target/$(TARGET)/src/rt/libuv/test/test-threadpool.o \
6972
$(obj).target/$(TARGET)/src/rt/libuv/test/test-timer-again.o \

‎trunk/mk/libuv/x86_64/mac/src/rt/libuv/uv.target.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/src/uv-common.o \
8989
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/tty.o \
9090
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/stream.o \
9191
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/cares.o \
92+
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/dl.o \
9293
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/error.o \
9394
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/process.o \
9495
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/eio/eio.o \

‎trunk/mk/libuv/x86_64/unix/src/rt/libuv/run-benchmarks.target.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DEFS_Default := '-D_LARGEFILE_SOURCE' \
88
'-DEIO_STACKSIZE=262144'
99

1010
# Flags passed to all source files.
11-
CFLAGS_Default :=
11+
CFLAGS_Default := -pthread
1212

1313
# Flags passed to only C files.
1414
CFLAGS_C_Default :=
@@ -61,7 +61,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.c FORCE_DO_CMD
6161

6262
# End of this set of suffix rules
6363
### Rules for final target.
64-
LDFLAGS_Default := -pthread
64+
LDFLAGS_Default :=
6565

6666
LIBS := -lrt
6767

‎trunk/mk/libuv/x86_64/unix/src/rt/libuv/run-tests.target.mk

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DEFS_Default := '-D_LARGEFILE_SOURCE' \
88
'-DEIO_STACKSIZE=262144'
99

1010
# Flags passed to all source files.
11-
CFLAGS_Default :=
11+
CFLAGS_Default := -pthread
1212

1313
# Flags passed to only C files.
1414
CFLAGS_C_Default :=
@@ -40,9 +40,11 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
4040
$(obj).target/$(TARGET)/src/rt/libuv/test/test-idle.o \
4141
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ipc.o \
4242
$(obj).target/$(TARGET)/src/rt/libuv/test/test-loop-handles.o \
43+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-multiple-listen.o \
4344
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pass-always.o \
4445
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ping-pong.o \
4546
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-bind-error.o \
47+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-connect-error.o \
4648
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ref.o \
4749
$(obj).target/$(TARGET)/src/rt/libuv/test/test-shutdown-eof.o \
4850
$(obj).target/$(TARGET)/src/rt/libuv/test/test-spawn.o \
@@ -54,6 +56,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
5456
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect-error.o \
5557
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect6-error.o \
5658
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-error.o \
59+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-to-half-open-connection.o \
5760
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-writealot.o \
5861
$(obj).target/$(TARGET)/src/rt/libuv/test/test-threadpool.o \
5962
$(obj).target/$(TARGET)/src/rt/libuv/test/test-timer-again.o \
@@ -92,7 +95,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.c FORCE_DO_CMD
9295

9396
# End of this set of suffix rules
9497
### Rules for final target.
95-
LDFLAGS_Default := -pthread
98+
LDFLAGS_Default :=
9699

97100
LIBS := -lrt
98101

‎trunk/mk/libuv/x86_64/unix/src/rt/libuv/uv.target.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ DEFS_Default := '-D_LARGEFILE_SOURCE' \
1111
'-DEIO_CONFIG_H="config_linux.h"'
1212

1313
# Flags passed to all source files.
14-
CFLAGS_Default := -g \
14+
CFLAGS_Default := -pthread \
15+
-g \
1516
--std=gnu89 \
1617
-pedantic \
1718
-Wall \
@@ -84,6 +85,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/src/uv-common.o \
8485
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/tty.o \
8586
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/stream.o \
8687
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/cares.o \
88+
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/dl.o \
8789
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/error.o \
8890
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/process.o \
8991
$(obj).target/$(TARGET)/src/rt/libuv/src/unix/eio/eio.o \

‎trunk/mk/libuv/x86_64/win/src/rt/libuv/run-tests.target.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
3737
$(obj).target/$(TARGET)/src/rt/libuv/test/test-idle.o \
3838
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ipc.o \
3939
$(obj).target/$(TARGET)/src/rt/libuv/test/test-loop-handles.o \
40+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-multiple-listen.o \
4041
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pass-always.o \
4142
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ping-pong.o \
4243
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-bind-error.o \
44+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-pipe-connect-error.o \
4345
$(obj).target/$(TARGET)/src/rt/libuv/test/test-ref.o \
4446
$(obj).target/$(TARGET)/src/rt/libuv/test/test-shutdown-eof.o \
4547
$(obj).target/$(TARGET)/src/rt/libuv/test/test-spawn.o \
@@ -51,6 +53,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/test/blackhole-server.o \
5153
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect-error.o \
5254
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-connect6-error.o \
5355
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-error.o \
56+
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-write-to-half-open-connection.o \
5457
$(obj).target/$(TARGET)/src/rt/libuv/test/test-tcp-writealot.o \
5558
$(obj).target/$(TARGET)/src/rt/libuv/test/test-threadpool.o \
5659
$(obj).target/$(TARGET)/src/rt/libuv/test/test-timer-again.o \

‎trunk/mk/libuv/x86_64/win/src/rt/libuv/uv.target.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ OBJS := $(obj).target/$(TARGET)/src/rt/libuv/src/uv-common.o \
7171
$(obj).target/$(TARGET)/src/rt/libuv/src/win/async.o \
7272
$(obj).target/$(TARGET)/src/rt/libuv/src/win/cares.o \
7373
$(obj).target/$(TARGET)/src/rt/libuv/src/win/core.o \
74+
$(obj).target/$(TARGET)/src/rt/libuv/src/win/dl.o \
7475
$(obj).target/$(TARGET)/src/rt/libuv/src/win/error.o \
7576
$(obj).target/$(TARGET)/src/rt/libuv/src/win/fs.o \
7677
$(obj).target/$(TARGET)/src/rt/libuv/src/win/fs-event.o \

‎trunk/src/etc/gyp-uv

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ do
4040

4141
# Comment out the gyp auto regeneration
4242
for os in mac unix win; do
43-
sed -i "" \
43+
sed -i \
4444
-e 's/^\(Makefile: $(srcdir)\/src\/rt\/libuv\/uv\.gyp\)/#\1/' \
4545
mk/libuv/$ARCH/$os/Makefile
4646

47-
sed -i "" \
47+
sed -i \
4848
-e 's/^\( $(call do_cmd,regen_makefile)\)/#\1/' \
4949
mk/libuv/$ARCH/$os/Makefile
5050
done
5151
done
5252

5353
# On Mac, GYP hardcodes a -arch i386 into the output. Fix that.
54-
sed -i "" \
54+
sed -i \
5555
-e 's/-arch i386/-arch x86_64/' \
5656
mk/libuv/x86_64/mac/src/rt/libuv/*.mk

‎trunk/src/rt/libuv/build/gcc_version.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/usr/bin/env python
2+
3+
import os
4+
import re
5+
import subprocess
6+
import sys
7+
8+
9+
def DoMain(*args):
10+
cc = os.environ.get('CC', 'gcc')
11+
stdin, stderr = os.pipe()
12+
subprocess.call([cc, '-v'], stderr=stderr)
13+
output = os.read(stdin, 4096)
14+
match = re.search("\ngcc version (\d+\.\d+\.\d+)", output)
15+
if match:
16+
print(match.group(1))
17+
18+
19+
if __name__ == '__main__':
20+
DoMain(*sys.argv)

‎trunk/src/rt/libuv/common.gypi

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,11 @@
114114
],
115115
}],
116116
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
117-
'cflags': [ '-Wall', '-pthread', ],
117+
'variables': {
118+
'gcc_version%': '<!(python build/gcc_version.py)>)',
119+
},
120+
'cflags': [ '-Wall' ],
118121
'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
119-
'ldflags': [ '-pthread', ],
120122
'conditions': [
121123
[ 'host_arch != target_arch and target_arch=="ia32"', {
122124
'cflags': [ '-m32' ],
@@ -125,7 +127,14 @@
125127
[ 'OS=="linux"', {
126128
'cflags': [ '-ansi' ],
127129
}],
128-
[ 'visibility=="hidden"', {
130+
[ 'OS=="solaris"', {
131+
'cflags': [ '-pthreads' ],
132+
'ldflags': [ '-pthreads' ],
133+
}, {
134+
'cflags': [ '-pthread' ],
135+
'ldflags': [ '-pthread' ],
136+
}],
137+
[ 'visibility=="hidden" and gcc_version >= "4.0.0"', {
129138
'cflags': [ '-fvisibility=hidden' ],
130139
}],
131140
],
@@ -143,7 +152,6 @@
143152
'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
144153
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
145154
'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics
146-
'GCC_VERSION': '4.2',
147155
'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', # -Wnewline-eof
148156
'MACOSX_DEPLOYMENT_TARGET': '10.4', # -mmacosx-version-min=10.4
149157
'PREBINDING': 'NO', # No -Wl,-prebind

‎trunk/src/rt/libuv/config-unix.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ CPPFLAGS += -D_LARGEFILE_SOURCE
2828
CPPFLAGS += -D_FILE_OFFSET_BITS=64
2929

3030
OBJS += src/unix/core.o
31+
OBJS += src/unix/dl.o
3132
OBJS += src/unix/fs.o
3233
OBJS += src/unix/cares.o
3334
OBJS += src/unix/udp.o

‎trunk/src/rt/libuv/include/uv-private/uv-unix.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ typedef struct {
4343

4444
typedef int uv_file;
4545

46+
/* Platform-specific definitions for uv_dlopen support. */
47+
typedef void* uv_lib_t;
48+
#define UV_DYNAMIC /* empty */
49+
4650
#define UV_LOOP_PRIVATE_FIELDS \
4751
ares_channel channel; \
4852
/* \
@@ -195,6 +199,16 @@ typedef int uv_file;
195199
uv_fs_event_cb cb; \
196200
int fflags; \
197201

202+
#elif defined(__sun)
203+
204+
#include <sys/port.h>
205+
#include <port.h>
206+
207+
#define UV_FS_EVENT_PRIVATE_FIELDS \
208+
ev_io event_watcher; \
209+
uv_fs_event_cb cb; \
210+
file_obj_t fo; \
211+
198212
#else
199213

200214
/* Stub for platforms where the file watcher isn't implemented yet. */

‎trunk/src/rt/libuv/include/uv-private/uv-win.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ typedef struct uv_buf_t {
137137

138138
typedef int uv_file;
139139

140+
/* Platform-specific definitions for uv_dlopen support. */
141+
typedef HMODULE uv_lib_t;
142+
#define UV_DYNAMIC FAR WINAPI
143+
140144
RB_HEAD(uv_timer_tree_s, uv_timer_s);
141145

142146
#define UV_LOOP_PRIVATE_FIELDS \
@@ -243,6 +247,7 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s);
243247

244248
#define uv_tcp_server_fields \
245249
uv_tcp_accept_t* accept_reqs; \
250+
unsigned int processed_accepts; \
246251
uv_tcp_accept_t* pending_accepts; \
247252
LPFN_ACCEPTEX func_acceptex;
248253

0 commit comments

Comments
 (0)