From nobody Tue Oct 04 16:04:48 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MhjFr2Wdvz4f8s1; Tue, 4 Oct 2022 16:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MhjFr1vWbz40gZ; Tue, 4 Oct 2022 16:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664899488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lQMEwmLHQK/kHQTVJl4IL2oLLqlTxY9lTsLdj6MATxw=; b=wYJFD440/fVOCfMC/8vOJDBaNmIO16XEmgZ4YTLm2NP29KBPbuTSWgBRSfVeZ+JESyTSiz FoOZSfZIQTOX5tb1g5ttxDWe0flN4mCaBzViAD71egaqMJNsEA/cTQ4Zskm/hiS9ye8nOE hH6MdqXXgSUzNr3D75N15We+Mn09do7GFEDYmeYwvQJbIiEav5MfTSEi4EM/NCU6CG3Ec0 gmerFEizh2iIbl9KaPQCAOT+j8Yk0MOdllsfETRW4INNR/3/X8s/Vr7p39N+cTu3V88A3M qwA2pQ+iGmVI6teQ7ZJsUA5Iykhp1VEQ6da2B+Qt2o8jP+JyI0fmbWodlQ7VLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MhjFr0wZCzcLq; Tue, 4 Oct 2022 16:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 294G4m6C022699; Tue, 4 Oct 2022 16:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 294G4mRJ022698; Tue, 4 Oct 2022 16:04:48 GMT (envelope-from git) Date: Tue, 4 Oct 2022 16:04:48 GMT Message-Id: <202210041604.294G4mRJ022698@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 5701f4ab6e2f - main - emulators/aranym: Fix build on armv7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5701f4ab6e2f746abd7287ab3c9da233ea61e854 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664899488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lQMEwmLHQK/kHQTVJl4IL2oLLqlTxY9lTsLdj6MATxw=; b=u7JFhEvoQG16gniseCD76IxL6ZLhcm7HfffQUkCeXkgNt8Omge02JlyoAwP3acXNZf4wvZ 4y7eHaEhAb1V9JUZPXGG9HeM0MGepAgYrRE3clkNoQB7RQHiqHNWGICojj9nsNaXtvnvCa G5I8OZXEiHfmMRquvaQOOnwHLYgv/gN9A54Qg205nU+QLMbi8IP24JDGV9OZ+tBwtMGQdH rv9LBEvzNxGjxv9NCbYX0rNl6pZ4+/FJ6NocOpsMRESWldG2x+13XMk/Apx/wHbbRcKl4T L/vOY6eJv6wTEY/V01TmdKQKPM7AE3fyJN+itx7PEaacZexiNwgBHq3KMHvdwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664899488; a=rsa-sha256; cv=none; b=SFXSCQ1qzLQtAVlccsAPzwqmJ/hshZnhuejLHEjsYSn4z2xqw8Qt57m8Sigkumt4ka1za2 01TPCt4yJk+/GTKuob3+uE/sHSe8BNr5Ip+KmB45bvEDcQz/rXOABnAWiumcOGdYdJY/IB rhm5qhEwfNM5BtS1gA2gZzYLwDXC92TYISvrErk6TXFIIM8jTd5C2xXv7nQ85KtptlJPX9 faulJKqWAOEH7jKq0yrvjpFZLnJzOi3+o1u9Yp/atGWMgX+VhCdhMv7UqknQaLc4GL7eGZ a6sKW4iF8sqfpH2gA+Hvqsda8AnYFfWugogOFjDuLuD2/HnctD9zYILwi0wxlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=5701f4ab6e2f746abd7287ab3c9da233ea61e854 commit 5701f4ab6e2f746abd7287ab3c9da233ea61e854 Author: Robert Clausecker AuthorDate: 2022-10-04 14:31:18 +0000 Commit: Yuri Victorovich CommitDate: 2022-10-04 16:04:45 +0000 emulators/aranym: Fix build on armv7 PR: 266816 --- emulators/aranym/files/patch-src_uae__cpu_m68k.h | 74 ++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/emulators/aranym/files/patch-src_uae__cpu_m68k.h b/emulators/aranym/files/patch-src_uae__cpu_m68k.h new file mode 100644 index 000000000000..657e16c40dc6 --- /dev/null +++ b/emulators/aranym/files/patch-src_uae__cpu_m68k.h @@ -0,0 +1,74 @@ +--- src/uae_cpu/m68k.h.orig 2022-10-04 08:41:56 UTC ++++ src/uae_cpu/m68k.h +@@ -561,7 +561,7 @@ static inline int cctrue(int cc) + "mrs %[nzcv],cpsr\n\t" \ + "bic %[nzcv],#0x30000000\n\t" \ + : [nzcv] "=r" (regflags.nzcv) \ +- : [rv] "0" (v) \ ++ : [rv] "0" ((uint32)v) \ + : "cc"); \ + }while(0) + +@@ -571,7 +571,7 @@ static inline int cctrue(int cc) + "mrs %[nzcv],cpsr\n\t" \ + "bic %[nzcv],#0x30000000\n\t" \ + : [nzcv] "=r" (regflags.nzcv) \ +- : [rv] "0" (v) \ ++ : [rv] "0" ((uint32)v) \ + : "cc"); \ + }while(0) + +@@ -581,7 +581,7 @@ static inline int cctrue(int cc) + "adds %[rd],%[rd],%[rs]\n\t" \ + "mrs %[nzcv],cpsr\n\t" \ + : [nzcv] "=r" (regflags.nzcv), [rv] "=r" (v) \ +- : [rs] "ri" (s), [rd] "1" (d) \ ++ : [rs] "ri" (s), [rd] "1" ((uint32)d) \ + : "cc"); \ + COPY_CARRY(); \ + } while(0) +@@ -592,7 +592,7 @@ static inline int cctrue(int cc) + "adds %[rd],%[rd],%[rs]\n\t" \ + "mrs %[nzcv],cpsr\n\t" \ + : [nzcv] "=r" (regflags.nzcv), [rv] "=r" (v) \ +- : [rs] "ri" (s), [rd] "1" (d) \ ++ : [rs] "ri" (s), [rd] "1" ((uint32)d) \ + : "cc"); \ + COPY_CARRY(); \ + } while(0) +@@ -604,7 +604,7 @@ static inline int cctrue(int cc) + "mrs %[nzcv],cpsr\n\t" \ + "eor %[nzcv],#0x20000000\n\t" \ + : [nzcv] "=r" (regflags.nzcv), [rv] "=r" (v) \ +- : [rs] "ri" (s), [rd] "1" (d) \ ++ : [rs] "ri" (s), [rd] "1" ((uint32)d) \ + : "cc"); \ + COPY_CARRY(); \ + } while(0) +@@ -616,7 +616,7 @@ static inline int cctrue(int cc) + "mrs %[nzcv],cpsr\n\t" \ + "eor %[nzcv],#0x20000000\n\t" \ + : [nzcv] "=r" (regflags.nzcv), [rv] "=r" (v) \ +- : [rs] "ri" (s), [rd] "1" (d) \ ++ : [rs] "ri" (s), [rd] "1" ((uint32)d) \ + : "cc"); \ + COPY_CARRY(); \ + } while(0) +@@ -628,7 +628,7 @@ static inline int cctrue(int cc) + "mrs %[nzcv],cpsr\n\t" \ + "eor %[nzcv],#0x20000000\n\t" \ + : [nzcv] "=r" (regflags.nzcv) \ +- : [rs] "ri" (s), [rd] "0" (d) \ ++ : [rs] "ri" (s), [rd] "0" ((uint32)d) \ + : "cc"); \ + } while(0) + +@@ -639,7 +639,7 @@ static inline int cctrue(int cc) + "mrs %[nzcv],cpsr\n\t" \ + "eor %[nzcv],#0x20000000\n\t" \ + : [nzcv] "=r" (regflags.nzcv) \ +- : [rs] "ri" (s), [rd] "0" (d) \ ++ : [rs] "ri" (s), [rd] "0" ((uint32)d) \ + : "cc"); \ + } while(0) +