Merge branch 'master' of https://framagit.org/simgrid/simgrid

diff --combined src/smpi/internals/smpi_global.cpp
index 2991121,766a09a..25cbf62
--- 1/src/smpi/internals/smpi_global.cpp
--- 2/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@@ -33,7 -33,7 +33,7 @@@
  #   define MAC_OS_X_VERSION_10_12 101200
  # endif
  constexpr bool HAVE_WORKING_MMAP = (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12);
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__sun)
  constexpr bool HAVE_WORKING_MMAP = false;
  #else
  constexpr bool HAVE_WORKING_MMAP = true;
@@@ -214,7 -214,7 +214,7 @@@ void smpi_comm_copy_buffer_callback(sim
    XBT_DEBUG("Copying %zu bytes from %p to %p", buff_size, tmpbuff, comm->dst_buff_);
    memcpy_private(comm->dst_buff_, tmpbuff, private_blocks);
  
 -  if (comm->detached_) {
 +  if (comm->detached()) {
      // if this is a detached send, the source buffer was duplicated by SMPI
      // sender to make the original buffer available to the application ASAP
      xbt_free(buff);