|
1 Can probably send upstream. |
|
2 |
|
3 diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in |
|
4 --- a/media/libvpx/Makefile.in |
|
5 +++ b/media/libvpx/Makefile.in |
|
6 @@ -14,6 +14,10 @@ |
|
7 ASFLAGS += -D__ANDROID__ |
|
8 endif |
|
9 |
|
10 +ifeq ($(OS_TARGET),SunOS) |
|
11 +ASFLAGS+=-DSOLARIS=1 |
|
12 +endif |
|
13 + |
|
14 ifdef VPX_ARM_ASM |
|
15 # Building on an ARM platform with a supported assembler, include |
|
16 # the optimized assembly in the build. |
|
17 @@ -121,7 +125,7 @@ |
|
18 # Workaround a bug of Sun Studio (CR 6963410) |
|
19 ifdef SOLARIS_SUNPRO_CC |
|
20 ifeq (86,$(findstring 86,$(OS_TEST))) |
|
21 -filter.o: filter.c Makefile.in |
|
22 +filter.o: vp8/common/filter.c Makefile.in |
|
23 $(REPORT_BUILD) |
|
24 @$(MAKE_DEPS_AUTO_CC) |
|
25 $(CC) -o $@ -c $(patsubst -xO[45],-xO3,$(COMPILE_CFLAGS)) $< |
|
26 diff --git a/media/libvpx/vpx_ports/x86_abi_support.asm b/media/libvpx/vpx_ports/x86_abi_support.asm |
|
27 --- a/media/libvpx/vpx_ports/x86_abi_support.asm |
|
28 +++ b/media/libvpx/vpx_ports/x86_abi_support.asm |
|
29 @@ -225,9 +225,13 @@ |
|
30 %ifdef CHROMIUM |
|
31 %ifidn __OUTPUT_FORMAT__,macho32 |
|
32 %define HIDDEN_DATA(x) x:private_extern |
|
33 + %elifidn SOLARIS,1 |
|
34 + %define HIDDEN_DATA(x) x:data hidden |
|
35 %else |
|
36 %define HIDDEN_DATA(x) x |
|
37 %endif |
|
38 + %elifidn SOLARIS,1 |
|
39 + %define HIDDEN_DATA(x) x:data hidden |
|
40 %else |
|
41 %define HIDDEN_DATA(x) x |
|
42 %endif |
|
43 @@ -244,9 +248,13 @@ |
|
44 %elifidn __OUTPUT_FORMAT__,macho64 |
|
45 %ifdef CHROMIUM |
|
46 %define HIDDEN_DATA(x) x:private_extern |
|
47 + %elifidn SOLARIS,1 |
|
48 + %define HIDDEN_DATA(x) x:data hidden |
|
49 %else |
|
50 %define HIDDEN_DATA(x) x |
|
51 %endif |
|
52 + %elifidn SOLARIS,1 |
|
53 + %define HIDDEN_DATA(x) x:data hidden |
|
54 %else |
|
55 %define HIDDEN_DATA(x) x |
|
56 %endif |