Bug 1018402 - Disable -Gw for the offset files since the extractor doesn't understand it. r=glandium

--HG--
extra : rebase_source : 5351a7166400930d35e3145228dd8d4b4fe3d805

content/media/gtest/TestVideoTrackEncoder.cpp

@@ -246,9 +246,6 @@ TEST(VP8VideoTrackEncoder, FetchMetaData)
 }
 
 // Encode test
-// XXX(bug 1018402): Disable this test when compiled with VS2013 because it
-// crashes.
-#if !defined(_MSC_VER) || _MSC_VER < 1800
 TEST(VP8VideoTrackEncoder, FrameEncode)
 {
   // Initiate VP8 encoder
@@ -278,7 +275,6 @@ TEST(VP8VideoTrackEncoder, FrameEncode)
   EncodedFrameContainer container;
   EXPECT_TRUE(NS_SUCCEEDED(encoder.GetEncodedTrack(container)));
 }
-#endif // _MSC_VER
 
 // EOS test
 TEST(VP8VideoTrackEncoder, EncodeComplete)

media/libvpx/Makefile.in

@@ -110,6 +110,10 @@ vp8_asm_enc_offsets.asm: vp8_asm_enc_offsets.$(OBJ_SUFFIX) $(HOST_PROGRAM)
 # It was generated solely so it could be parsed by obj_int_extract.
 OBJS := $(filter-out vp8_asm_enc_offsets.$(OBJ_SUFFIX),$(OBJS))
 
+# obj_int_extract doesn't understand files produced with the -Gw optimization.
+vpx_scale_asm_offsets.$(OBJ_SUFFIX) vp8_asm_enc_offsets.$(OBJ_SUFFIX): \
+    COMPILE_CFLAGS := $(filter-out -Gw,$(COMPILE_CFLAGS))
+
 endif
 
 # Workaround a bug of Sun Studio (CR 6963410)