From 5da2a1efae05a012daf72e61f6f131d104ce52c2 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 10 Mar 2015 20:29:26 +0100 Subject: aarch64 fixes --- mozilla-build-arm.patch | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'mozilla-build-arm.patch') diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch index 9dd243a..86e6f2e 100644 --- a/mozilla-build-arm.patch +++ b/mozilla-build-arm.patch @@ -1,45 +1,3 @@ -diff -up firefox-29.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-29.0/mozilla-release/gfx/ycbcr/moz.build ---- firefox-29.0/mozilla-release/gfx/ycbcr/moz.build.arm 2014-04-22 07:27:47.000000000 +0200 -+++ firefox-29.0/mozilla-release/gfx/ycbcr/moz.build 2014-04-22 16:40:34.862849368 +0200 -@@ -61,7 +61,7 @@ else: - 'yuv_row_other.cpp', - ] - --if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']: -+if CONFIG['HAVE_ARM_NEON']: - SOURCES += [ - 'yuv_row_arm.s', - ] -diff -up firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py.arm firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py ---- firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py.arm 2015-03-09 10:02:17.000000000 +0100 -+++ firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py 2015-03-10 09:16:18.532740641 +0100 -@@ -27,7 +27,7 @@ footer = """ - # can we find a better way of dealing with asm sources? - - # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with --if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: -+if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC']: - SOURCES += [ - 'trunk/src/opts/memset.arm.S', - ] -@@ -123,7 +123,7 @@ if CONFIG['INTEL_ARCHITECTURE'] and CONF - SOURCES['trunk/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['trunk/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['trunk/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] --elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']: -+elif CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']: - DEFINES['__ARM_HAVE_OPTIONAL_NEON_SUPPORT'] = 1 - DEFINES['USE_ANDROID_NDK_CPU_FEATURES'] = 0 - elif CONFIG['CLANG_CL']: -@@ -440,7 +440,7 @@ def write_mozbuild(includes, sources): - f.write("if CONFIG['INTEL_ARCHITECTURE']:\n") - write_sources(f, sources['intel'], 4) - -- f.write("elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:\n") -+ f.write("elif CONFIG['GNU_CC']:\n") - write_sources(f, sources['arm'], 4) - - f.write(" if CONFIG['BUILD_ARM_NEON']:\n") diff -up firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi.arm firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi --- firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi.arm 2015-03-05 11:28:19.000000000 +0100 +++ firefox-36.0.1/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi 2015-03-09 10:02:17.875243261 +0100 -- cgit