From 0880f90744ae50255c37c227b622947d88ddab8e Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 22 Jun 2010 01:07:35 -0400 Subject: [PATCH] Backed out changeset e9ee970f085a because that backout doesn't seem to be necessary --- .hgtags | 2 -- media/libvpx/update.sh | 7 +++++++ testing/mozmill/installmozmill.py | 0 .../addons/toolbar@google.com/testToolbarInstalled.js | 0 testing/mozmill/tests/scripts/update.py | 0 testing/mozmill/virtualenv/virtualenv.py | 0 6 files changed, 7 insertions(+), 2 deletions(-) mode change 100644 => 100755 testing/mozmill/installmozmill.py mode change 100644 => 100755 testing/mozmill/tests/addons/toolbar@google.com/testToolbarInstalled.js mode change 100644 => 100755 testing/mozmill/tests/scripts/update.py mode change 100644 => 100755 testing/mozmill/virtualenv/virtualenv.py diff --git a/.hgtags b/.hgtags index ca6f4bd4f252..75cb27deebfe 100644 --- a/.hgtags +++ b/.hgtags @@ -38,5 +38,3 @@ fe9cc55b8db7f56f7e68a246acba363743854979 UPDATE_PACKAGING_R8 138f593553b66c9f815e8f57870c19d6347f7702 UPDATE_PACKAGING_R9 138f593553b66c9f815e8f57870c19d6347f7702 UPDATE_PACKAGING_R10 138f593553b66c9f815e8f57870c19d6347f7702 UPDATE_PACKAGING_R11 -b2f7bc2aa0bcd02460d457472a0157ec42f0b23f FIREFOX_3_7a5_BUILD1 -b2f7bc2aa0bcd02460d457472a0157ec42f0b23f FIREFOX_3_7a5_RELEASE diff --git a/media/libvpx/update.sh b/media/libvpx/update.sh index 152f4ab6aeb3..11777e847c2f 100755 --- a/media/libvpx/update.sh +++ b/media/libvpx/update.sh @@ -213,6 +213,11 @@ 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 @@ -238,3 +243,5 @@ done 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 diff --git a/testing/mozmill/installmozmill.py b/testing/mozmill/installmozmill.py old mode 100644 new mode 100755 diff --git a/testing/mozmill/tests/addons/toolbar@google.com/testToolbarInstalled.js b/testing/mozmill/tests/addons/toolbar@google.com/testToolbarInstalled.js old mode 100644 new mode 100755 diff --git a/testing/mozmill/tests/scripts/update.py b/testing/mozmill/tests/scripts/update.py old mode 100644 new mode 100755 diff --git a/testing/mozmill/virtualenv/virtualenv.py b/testing/mozmill/virtualenv/virtualenv.py old mode 100644 new mode 100755