diff options
author | Martin Stransky <stransky@redhat.com> | 2015-03-11 15:29:56 +0100 |
---|---|---|
committer | Martin Stransky <stransky@redhat.com> | 2015-03-11 15:29:56 +0100 |
commit | 4c8e8dd622ec20c209c647fad723aea6cebe1485 (patch) | |
tree | 849d89b0a02221a10bb1635abba4ae83f9952ec9 /firefox-aarch64.patch | |
parent | aarch64 build fix (diff) | |
download | librewolf-fedora-ff-4c8e8dd622ec20c209c647fad723aea6cebe1485.tar.gz librewolf-fedora-ff-4c8e8dd622ec20c209c647fad723aea6cebe1485.tar.bz2 librewolf-fedora-ff-4c8e8dd622ec20c209c647fad723aea6cebe1485.zip |
Removed wrong and unnecessary patch for aarch64
Diffstat (limited to 'firefox-aarch64.patch')
-rw-r--r-- | firefox-aarch64.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/firefox-aarch64.patch b/firefox-aarch64.patch deleted file mode 100644 index ebfa789..0000000 --- a/firefox-aarch64.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -up firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py.aarch64 firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py ---- firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py.aarch64 2015-03-11 12:58:25.871608312 +0100 -+++ firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py 2015-03-11 12:58:25.877608353 +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['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') 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['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and 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['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and 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/gfx/skia/moz.build.aarch64 firefox-36.0.1/mozilla-release/gfx/skia/moz.build ---- firefox-36.0.1/mozilla-release/gfx/skia/moz.build.aarch64 2015-03-11 12:58:25.000000000 +0100 -+++ firefox-36.0.1/mozilla-release/gfx/skia/moz.build 2015-03-11 13:14:49.627295630 +0100 -@@ -811,7 +811,7 @@ if CONFIG['INTEL_ARCHITECTURE']: - 'trunk/src/opts/SkUtils_opts_SSE2.cpp', - 'trunk/src/opts/SkXfermode_opts_SSE2.cpp', - ] --elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: -+elif (CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['GNU_CC']: - UNIFIED_SOURCES += [ - 'trunk/src/core/SkUtilsArm.cpp', - 'trunk/src/opts/SkBitmapProcState_opts_arm.cpp', -@@ -858,7 +858,7 @@ else: - # 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['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['GNU_CC']: - SOURCES += [ - 'trunk/src/opts/memset.arm.S', - ] -@@ -950,7 +950,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['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and 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']: -diff -up firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build.aarch64 firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build ---- firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build.aarch64 2015-03-05 11:28:10.000000000 +0100 -+++ firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build 2015-03-11 12:58:25.877608353 +0100 -@@ -61,7 +61,7 @@ else: - 'yuv_row_other.cpp', - ] - --if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']: -+if (CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['HAVE_ARM_NEON']: - SOURCES += [ - 'yuv_row_arm.s', - ] |