svn commit: r481773 - branches/2018Q4/devel/qt5-core/files

Jan Beich jbeich at FreeBSD.org
Wed Oct 10 22:00:25 UTC 2018


Author: jbeich
Date: Wed Oct 10 22:00:24 2018
New Revision: 481773
URL: https://svnweb.freebsd.org/changeset/ports/481773

Log:
  MFH: r481772
  
  devel/qt5-core: unbreak on armv7 after r479286
  
  global/qfloat16.cpp:149:31: error: use of undeclared identifier 'vcvt_f16_f32'
          vst1_f16(out_f16 + i, vcvt_f16_f32(vld1q_f32(in + i)));
                                ^
  global/qfloat16.cpp:159:28: error: use of undeclared identifier 'vcvt_f32_f16'
          vst1q_f32(out + i, vcvt_f32_f16(vld1_f16(in_f16 + i)));
                             ^
  
  PR:		231293
  Approved by:	maintainer timeout (1 month)
  Approved by:	ports-secteam blanket

Added:
  branches/2018Q4/devel/qt5-core/files/patch-src_corelib_global_qfloat16.cpp
     - copied unchanged from r481772, head/devel/qt5-core/files/patch-src_corelib_global_qfloat16.cpp
Modified:
Directory Properties:
  branches/2018Q4/   (props changed)

Copied: branches/2018Q4/devel/qt5-core/files/patch-src_corelib_global_qfloat16.cpp (from r481772, head/devel/qt5-core/files/patch-src_corelib_global_qfloat16.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q4/devel/qt5-core/files/patch-src_corelib_global_qfloat16.cpp	Wed Oct 10 22:00:24 2018	(r481773, copy of r481772, head/devel/qt5-core/files/patch-src_corelib_global_qfloat16.cpp)
@@ -0,0 +1,18 @@
+global/qfloat16.cpp:149:31: error: use of undeclared identifier 'vcvt_f16_f32'
+        vst1_f16(out_f16 + i, vcvt_f16_f32(vld1q_f32(in + i)));
+                              ^
+global/qfloat16.cpp:159:28: error: use of undeclared identifier 'vcvt_f32_f16'
+        vst1q_f32(out + i, vcvt_f32_f16(vld1_f16(in_f16 + i)));
+                           ^
+
+--- src/corelib/global/qfloat16.cpp.orig	2018-06-15 07:29:31 UTC
++++ src/corelib/global/qfloat16.cpp
+@@ -135,7 +135,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, con
+ #undef f16cextern
+ }
+ 
+-#elif defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__)
++#elif defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__) && (__ARM_FP & 2)
+ static inline bool hasFastF16()
+ {
+     return true;


More information about the svn-ports-branches mailing list