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