5253N/ACan probably send upstream.

5253N/A

5525N/Adiff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in

5525N/A--- a/media/libvpx/Makefile.in

5525N/A+++ b/media/libvpx/Makefile.in

5525N/A@@ -14,6 +14,10 @@

5525N/A ASFLAGS += -D__ANDROID__

5525N/A endif

5253N/A

5253N/A+ifeq ($(OS_TARGET),SunOS)

5253N/A+ASFLAGS+=-DSOLARIS=1

5525N/A+endif

5253N/A+

5253N/A ifdef VPX_ARM_ASM

5253N/A # Building on an ARM platform with a supported assembler, include

5253N/A # the optimized assembly in the build.

5525N/A@@ -121,7 +125,7 @@

5253N/A # Workaround a bug of Sun Studio (CR 6963410)

5253N/A ifdef SOLARIS_SUNPRO_CC

5253N/A ifeq (86,$(findstring 86,$(OS_TEST)))

5253N/A-filter.o: filter.c Makefile.in

5253N/A+filter.o: vp8/common/filter.c Makefile.in

5253N/A $(REPORT_BUILD)

5253N/A @$(MAKE_DEPS_AUTO_CC)

5253N/A $(CC) -o $@ -c $(patsubst -xO[45],-xO3,$(COMPILE_CFLAGS)) $<

5525N/Adiff --git a/media/libvpx/vpx_ports/x86_abi_support.asm b/media/libvpx/vpx_ports/x86_abi_support.asm

5525N/A--- a/media/libvpx/vpx_ports/x86_abi_support.asm

5525N/A+++ b/media/libvpx/vpx_ports/x86_abi_support.asm

5253N/A@@ -225,9 +225,13 @@

5253N/A %ifdef CHROMIUM

5253N/A %ifidn __OUTPUT_FORMAT__,macho32

5253N/A %define HIDDEN_DATA(x) x:private_extern

5253N/A+ %elifidn SOLARIS,1

5253N/A+ %define HIDDEN_DATA(x) x:data hidden

5253N/A %else

5253N/A %define HIDDEN_DATA(x) x

5253N/A %endif

5253N/A+ %elifidn SOLARIS,1

5253N/A+ %define HIDDEN_DATA(x) x:data hidden

5253N/A %else

5253N/A %define HIDDEN_DATA(x) x

5253N/A %endif

5253N/A@@ -244,9 +248,13 @@

5253N/A %elifidn __OUTPUT_FORMAT__,macho64

5253N/A %ifdef CHROMIUM

5253N/A %define HIDDEN_DATA(x) x:private_extern

5253N/A+ %elifidn SOLARIS,1

5253N/A+ %define HIDDEN_DATA(x) x:data hidden

5253N/A %else

5253N/A %define HIDDEN_DATA(x) x

5253N/A %endif

5253N/A+ %elifidn SOLARIS,1

5253N/A+ %define HIDDEN_DATA(x) x:data hidden

5253N/A %else

5253N/A %define HIDDEN_DATA(x) x

5253N/A %endif