Date: Sat, 4 Feb 2017 09:48:23 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r433294 - branches/2017Q1/www/firefox/files Message-ID: <201702040948.v149mNnG000747@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Feb 4 09:48:23 2017 New Revision: 433294 URL: https://svnweb.freebsd.org/changeset/ports/433294 Log: MFH: r433293 www/firefox: attempt to unbreak aarch64 after r431737 gfx/skia/skia/src/core/SkBitmapProcState_matrixProcs.cpp:(.text._ZN17SkBitmapProcState16chooseMatrixProcEb+0xc4): undefined reference to `RepeatX_RepeatY_Procs_neon' gfx/skia/skia/src/core/SkBitmapProcState_matrixProcs.cpp:(.text._ZN17SkBitmapProcState16chooseMatrixProcEb+0x144): undefined reference to `ClampX_ClampY_Procs_neon' gfx/skia/skia/src/core/SkBlitter_RGB16.cpp:(.text._ZN22SkRGB16_Opaque_Blitter5blitVEiiih+0x3c): undefined reference to `SkRGB16BlitterBlitV_neon(unsigned short*, int, unsigned long, unsigned int, unsigned int)' [...] /usr/bin/ld: libxul.so: hidden symbol `_Z24SkRGB16BlitterBlitV_neonPtimjj' isn't defined /usr/bin/ld: final link failed: Bad value c++: error: linker command failed with exit code 1 (use -v to see invocation) Reported by: pkg-fallout Approved by: ports-secteam blanket Added: branches/2017Q1/www/firefox/files/patch-bug1142056 - copied unchanged from r433293, head/www/firefox/files/patch-bug1142056 Modified: Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/www/firefox/files/patch-bug1142056 (from r433293, head/www/firefox/files/patch-bug1142056) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/firefox/files/patch-bug1142056 Sat Feb 4 09:48:23 2017 (r433294, copy of r433293, head/www/firefox/files/patch-bug1142056) @@ -0,0 +1,64 @@ +commit ef0d953d9e2d +Author: Makoto Kato <m_kato@ga2.so-net.ne.jp> +Date: Tue Aug 23 16:54:06 2016 +0900 + + Bug 1142056 - Add aarch64 configuration on Skia's moz.build. r=gw280 + + MozReview-Commit-ID: 60iAZjFg6W6 + + --HG-- + extra : histedit_source : b3bb5a3e556393ba49f43dc4ab8bdaa9be40fb0c +--- + gfx/skia/generate_mozbuild.py | 6 ++++-- + gfx/skia/moz.build | 12 ++++++++++-- + 2 files changed, 14 insertions(+), 4 deletions(-) + +diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py +index 2088b729d476..1eb04c1d7f57 100755 +--- gfx/skia/generate_mozbuild.py ++++ gfx/skia/generate_mozbuild.py +@@ -429,10 +429,12 @@ def write_mozbuild(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'] in ('arm', 'aarch64') and CONFIG['GNU_CC']:\n") + write_sources(f, sources['arm'], 4) + +- f.write(" if CONFIG['BUILD_ARM_NEON']:\n") ++ f.write(" if CONFIG['CPU_ARCH'] == 'aarch64':\n") ++ write_sources(f, sources['neon'], 8) ++ f.write(" elif CONFIG['BUILD_ARM_NEON']:\n") + write_list(f, 'SOURCES', sources['neon'], 8) + write_cflags(f, sources['neon'], 'neon', "CONFIG['NEON_FLAGS']", 8) + +diff --git gfx/skia/moz.build gfx/skia/moz.build +index b33f1cdbee54..9dba87978dd3 100644 +--- gfx/skia/moz.build ++++ gfx/skia/moz.build +@@ -519,7 +519,7 @@ if CONFIG['INTEL_ARCHITECTURE']: + 'skia/src/opts/SkOpts_sse41.cpp', + 'skia/src/opts/SkOpts_ssse3.cpp', + ] +-elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: ++elif CONFIG['CPU_ARCH'] in ('arm', 'aarch64') and CONFIG['GNU_CC']: + UNIFIED_SOURCES += [ + 'skia/src/core/SkUtilsArm.cpp', + 'skia/src/opts/SkBitmapProcState_opts_arm.cpp', +@@ -528,7 +528,15 @@ elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: + SOURCES += [ + 'skia/src/opts/SkBlitRow_opts_arm.cpp', + ] +- if CONFIG['BUILD_ARM_NEON']: ++ if CONFIG['CPU_ARCH'] == 'aarch64': ++ SOURCES += [ ++ 'skia/src/opts/SkBitmapProcState_arm_neon.cpp', ++ 'skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp', ++ 'skia/src/opts/SkBlitMask_opts_arm_neon.cpp', ++ 'skia/src/opts/SkBlitRow_opts_arm_neon.cpp', ++ 'skia/src/opts/SkOpts_neon.cpp', ++ ] ++ elif CONFIG['BUILD_ARM_NEON']: + SOURCES += [ + 'skia/src/opts/SkBitmapProcState_arm_neon.cpp', + 'skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702040948.v149mNnG000747>