Backed out changeset e9ee970f085a because that backout doesn't seem to be necessary
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 22 Jun 2010 01:07:35 -0400
changeset 44118 1e0907aafaa0ae38ca4c1a16e96d7b4a2aa90e35
parent 44117 e9ee970f085a16be6bdf9be339eb53c7ce4eb98d
child 44120 4b1370faa94d42987657201592d31b326d24c65a
push idunknown
push userunknown
push dateunknown
milestone1.9.3a6pre
backs oute9ee970f085a16be6bdf9be339eb53c7ce4eb98d
Backed out changeset e9ee970f085a because that backout doesn't seem to be necessary
.hgtags
media/libvpx/update.sh
testing/mozmill/installmozmill.py
testing/mozmill/tests/addons/toolbar@google.com/testToolbarInstalled.js
testing/mozmill/tests/scripts/update.py
testing/mozmill/virtualenv/virtualenv.py
--- a/.hgtags
+++ b/.hgtags
@@ -33,10 +33,8 @@ f817a4378f32b1ad0a7c4b5a9949586dba816da5
 5c1e7c779b6edc8ff912001990edc579f80597f4 FENNEC_B1
 fe9cc55b8db7f56f7e68a246acba363743854979 UPDATE_PACKAGING_R8
 6fd4bb500d425c406c1b52f66e5b195b20ae5e0a chromium-import-r15462
 6fd4bb500d425c406c1b52f66e5b195b20ae5e0a chromium-import-latest
 376b78fc72230aaf2ca4e279a8f4ef1efd4a1d9f GECKO_1_9_2_BASE
 138f593553b66c9f815e8f57870c19d6347f7702 UPDATE_PACKAGING_R9
 138f593553b66c9f815e8f57870c19d6347f7702 UPDATE_PACKAGING_R10
 138f593553b66c9f815e8f57870c19d6347f7702 UPDATE_PACKAGING_R11
-b2f7bc2aa0bcd02460d457472a0157ec42f0b23f FIREFOX_3_7a5_BUILD1
-b2f7bc2aa0bcd02460d457472a0157ec42f0b23f FIREFOX_3_7a5_RELEASE
--- a/media/libvpx/update.sh
+++ b/media/libvpx/update.sh
@@ -208,16 +208,21 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h 
 # Should be same for all platforms...
 cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h
 
 # Config files for x86-linux-gcc
 cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c
 cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm
 cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h
 
+# Config files for x86_64-linux-gcc
+cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c
+cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm
+cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h
+
 # Copy config files for mac...
 cp $1/objdir/x86-darwin9-gcc/vpx_config.c vpx_config_x86-darwin9-gcc.c
 cp $1/objdir/x86-darwin9-gcc/vpx_config.asm vpx_config_x86-darwin9-gcc.asm
 cp $1/objdir/x86-darwin9-gcc/vpx_config.h vpx_config_x86-darwin9-gcc.h
 
 # Copy config files for Mac64
 cp $1/objdir/x86_64-darwin9-gcc/vpx_config.c vpx_config_x86_64-darwin9-gcc.c
 cp $1/objdir/x86_64-darwin9-gcc/vpx_config.asm vpx_config_x86_64-darwin9-gcc.asm
@@ -233,8 +238,10 @@ do
   mkdir -p -v `dirname $f`
   cp -v $1/$f $f
 done
 
 # Patch to reduce compiler warnings, so we can compile with -Werror in mozilla.
 patch -p3 < reduce-warnings-1.patch
 patch -p3 < splitmv-bounds.patch
 patch -p3 < subpixel-qword.patch
+# Patch to make asm globals symbol hidden so linking succeeds on x86-64.
+patch -p3 < subpixel-hidden.patch
old mode 100644
new mode 100755
old mode 100644
new mode 100755
old mode 100644
new mode 100755
old mode 100644
new mode 100755