You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

33 lines
1.4 KiB

  1. From b7fa865fa6b06d97d424c500fd1c4bc44c096359 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Sun, 1 Nov 2020 22:46:18 +0100
  4. Subject: [PATCH 2/2] openpgm/pgm/checksum.c: fix build with 32 bits MMX
  5. Build with i386-pentium-mmx or i686 is broken since version 5-3-128 and
  6. https://github.com/steve-o/openpgm/commit/b276dc15be5d4e6e1143b9de25d09f63f9c85135
  7. because _mm_cvtm64_si64 is undefined resulting in the following build
  8. failure for example on zeromq:
  9. /srv/storage/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/8.3.0/../../../../i586-buildroot-linux-musl/bin/ld: /srv/storage/autobuild/run/instance-3/output-1/host/i586-buildroot-linux-musl/sysroot/usr/lib32/libpgm-5.3.so.0: undefined reference to `_mm_cvtm64_si64'
  10. So use the fallback if __x86_64__ is not defined
  11. Fixes:
  12. - http://autobuild.buildroot.org/results/01d9be37e8a743307128f53f41785654c9971e1a
  13. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  14. ---
  15. openpgm/pgm/checksum.c | 2 +-
  16. 1 file changed, 1 insertion(+), 1 deletion(-)
  17. --- a/openpgm/pgm/checksum.c
  18. +++ b/openpgm/pgm/checksum.c
  19. @@ -948,7 +948,7 @@ do_csumcpy_mmx (
  20. sum = _mm_add_pi32 (sum, lo);
  21. sum = _mm_add_pi32 (sum, hi);
  22. -#if 1
  23. +#if defined(__x86_64__)
  24. *(int64_t*)dst = _mm_cvtm64_si64 (tmp);
  25. #else
  26. ((int*)dst)[1] = _mm_cvtsi64_si32 (tmp);