No OneTemporary
Actions

Size

35 KB

Subscribers

None

View Options

	diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
	index 14803fbee..5c72933a9 100644
	--- a/contrib/guix/manifest.scm
	+++ b/contrib/guix/manifest.scm
	@@ -1,604 +1,607 @@
	(use-modules (gnu packages)
	(gnu packages autotools)
	((gnu packages bash) #:select (bash-minimal))
	(gnu packages bison)
	((gnu packages certs) #:select (nss-certs))
	((gnu packages cdrom) #:select (xorriso))
	((gnu packages cmake) #:select (cmake-minimal))
	(gnu packages commencement)
	(gnu packages compression)
	(gnu packages cross-base)
	(gnu packages curl)
	(gnu packages file)
	(gnu packages gawk)
	(gnu packages gcc)
	(gnu packages gperf)
	((gnu packages installers) #:select (nsis-x86_64))
	((gnu packages linux) #:select (linux-libre-headers-6.1 util-linux))
	(gnu packages llvm)
	(gnu packages mingw)
	(gnu packages moreutils)
	(gnu packages ninja)
	(gnu packages perl)
	(gnu packages pkg-config)
	((gnu packages python) #:select (python-minimal))
	((gnu packages python-build) #:select (python-tomli))
	((gnu packages python-crypto) #:select (python-asn1crypto))
	((gnu packages python-web) #:select (python-requests))
	((gnu packages python-xyz) #:select (python-altgraph))
	((gnu packages tls) #:select (openssl))
	((gnu packages version-control) #:select (git-minimal))
	(guix build-system cmake)
	(guix build-system gnu)
	(guix build-system python)
	(guix build-system trivial)
	(guix gexp)
	(guix git-download)
	((guix licenses) #:prefix license:)
	(guix packages)
	((guix utils) #:select (substitute-keyword-arguments)))

	(define-syntax-rule (search-our-patches file-name ...)
	"Return the list of absolute file names corresponding to each
	FILE-NAME found in ./patches relative to the current file."
	(parameterize
	((%patch-path (list (string-append (dirname (current-filename)) "/patches"))))
	(list (search-patch file-name) ...)))

	(define building-on (string-append "--build=" (list-ref (string-split (%current-system) #\-) 0) "-guix-linux-gnu"))

	(define (make-cross-toolchain target
	base-gcc-for-libc
	base-kernel-headers
	base-libc
	base-gcc)
	"Create a cross-compilation toolchain package for TARGET"
	(let* ((xbinutils (cross-binutils target))
	;; 1. Build a cross-compiling gcc without targeting any libc, derived
	;; from BASE-GCC-FOR-LIBC
	(xgcc-sans-libc (cross-gcc target
	#:xgcc base-gcc-for-libc
	#:xbinutils xbinutils))
	;; 2. Build cross-compiled kernel headers with XGCC-SANS-LIBC, derived
	;; from BASE-KERNEL-HEADERS
	(xkernel (cross-kernel-headers target
	#:linux-headers base-kernel-headers
	#:xgcc xgcc-sans-libc
	#:xbinutils xbinutils))
	;; 3. Build a cross-compiled libc with XGCC-SANS-LIBC and XKERNEL,
	;; derived from BASE-LIBC
	(xlibc (cross-libc target
	#:libc base-libc
	#:xgcc xgcc-sans-libc
	#:xbinutils xbinutils
	#:xheaders xkernel))
	;; 4. Build a cross-compiling gcc targeting XLIBC, derived from
	;; BASE-GCC
	(xgcc (cross-gcc target
	#:xgcc base-gcc
	#:xbinutils xbinutils
	#:libc xlibc)))
	;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and
	;; XGCC
	(package
	(name (string-append target "-toolchain"))
	(version (package-version xgcc))
	(source #f)
	(build-system trivial-build-system)
	(arguments '(#:builder (begin (mkdir %output) #t)))
	(propagated-inputs
	`(("binutils" ,xbinutils)
	("libc" ,xlibc)
	("libc:static" ,xlibc "static")
	("gcc" ,xgcc)
	("gcc-lib" ,xgcc "lib")))
	(synopsis (string-append "Complete GCC tool chain for " target))
	(description (string-append "This package provides a complete GCC tool
	chain for " target " development."))
	(home-page (package-home-page xgcc))
	(license (package-license xgcc)))))

	(define base-gcc gcc-12)
	(define base-linux-kernel-headers linux-libre-headers-6.1)

	(define* (make-bitcoin-cross-toolchain target
	#:key
	(base-gcc-for-libc linux-base-gcc)
	(base-kernel-headers base-linux-kernel-headers)
	(base-libc glibc-2.28)
	(base-gcc linux-base-gcc))
	"Convenience wrapper around MAKE-CROSS-TOOLCHAIN with default values
	desirable for building Bitcoin ABC release binaries."
	(make-cross-toolchain target
	base-gcc-for-libc
	base-kernel-headers
	base-libc
	base-gcc))

	(define (gcc-mingw-patches gcc)
	(package-with-extra-patches gcc
	- (search-our-patches "gcc-remap-guix-store.patch"
	- "vmov-alignment.patch")))
	+ (search-our-patches "gcc-remap-guix-store.patch")))
	+
	+(define (binutils-mingw-patches binutils)
	+ (package-with-extra-patches binutils
	+ (search-our-patches "binutils-unaligned-default.patch")))

	(define (make-mingw-pthreads-cross-toolchain target)
	"Create a cross-compilation toolchain package for TARGET"
	- (let* ((xbinutils (cross-binutils target))
	+ (let* ((xbinutils (binutils-mingw-patches (cross-binutils target)))
	(pthreads-xlibc mingw-w64-x86_64-winpthreads)
	(pthreads-xgcc (cross-gcc target
	#:xgcc (gcc-mingw-patches mingw-w64-base-gcc)
	#:xbinutils xbinutils
	#:libc pthreads-xlibc)))
	;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and
	;; XGCC
	(package
	(name (string-append target "-posix-toolchain"))
	(version (package-version pthreads-xgcc))
	(source #f)
	(build-system trivial-build-system)
	(arguments '(#:builder (begin (mkdir %output) #t)))
	(propagated-inputs
	`(("binutils" ,xbinutils)
	("libc" ,pthreads-xlibc)
	("gcc" ,pthreads-xgcc)
	("gcc-lib" ,pthreads-xgcc "lib")))
	(synopsis (string-append "Complete GCC tool chain for " target))
	(description (string-append "This package provides a complete GCC tool
	chain for " target " development."))
	(home-page (package-home-page pthreads-xgcc))
	(license (package-license pthreads-xgcc)))))

	;; While LIEF is packaged in Guix, we maintain our own package,
	;; to simplify building, and more easily apply updates.
	;; Moreover, the Guix's package uses cmake, which caused build
	;; failure; see https://github.com/bitcoin/bitcoin/pull/27296.
	(define-public python-lief
	(package
	(name "python-lief")
	(version "0.13.2")
	(source (origin
	(method git-fetch)
	(uri (git-reference
	(url "https://github.com/lief-project/LIEF")
	(commit version)))
	(file-name (git-file-name name version))
	(modules '((guix build utils)))
	(snippet
	'(begin
	;; Configure build for Python bindings.
	(substitute* "api/python/config-default.toml"
	(("(ninja = )true" all m)
	(string-append m "false"))
	(("(parallel-jobs = )0" all m)
	(string-append m (number->string (parallel-job-count)))))))
	(sha256
	(base32
	"0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll"))))
	(build-system python-build-system)
	(native-inputs (list cmake-minimal python-tomli))
	(arguments
	(list
	#:tests? #f ;needs network
	#:phases #~(modify-phases %standard-phases
	(add-before 'build 'change-directory
	(lambda _
	(chdir "api/python")))
	(replace 'build
	(lambda _
	(invoke "python" "setup.py" "build"))))))
	(home-page "https://github.com/lief-project/LIEF")
	(synopsis "Library to instrument executable formats")
	(description
	"@code{python-lief} is a cross platform library which can parse, modify
	and abstract ELF, PE and MachO formats.")
	(license license:asl2.0)))

	(define osslsigncode
	(package
	(name "osslsigncode")
	(version "2.5")
	(source (origin
	(method git-fetch)
	(uri (git-reference
	(url "https://github.com/mtrojnar/osslsigncode")
	(commit version)))
	(sha256
	(base32
	"1j47vwq4caxfv0xw68kw5yh00qcpbd56d7rq6c483ma3y7s96yyz"))))
	(build-system cmake-build-system)
	(inputs
	`(("openssl", openssl)))
	(home-page "https://github.com/mtrojnar/osslsigncode")
	(synopsis "Authenticode signing and timestamping tool")
	(description "osslsigncode is a small tool that implements part of the
	functionality of the Microsoft tool signtool.exe - more exactly the Authenticode
	signing and timestamping. But osslsigncode is based on OpenSSL and cURL, and
	thus should be able to compile on most platforms where these exist.")
	(license license:gpl3+))) ; license is with openssl exception

	(define-public python-elfesteem
	(let ((commit "2eb1e5384ff7a220fd1afacd4a0170acff54fe56"))
	(package
	(name "python-elfesteem")
	(version (git-version "0.1" "1" commit))
	(source
	(origin
	(method git-fetch)
	(uri (git-reference
	(url "https://github.com/LRGH/elfesteem")
	(commit commit)))
	(file-name (git-file-name name commit))
	(sha256
	(base32
	"07x6p8clh11z8s1n2kdxrqwqm2almgc5qpkcr9ckb6y5ivjdr5r6"))))
	(build-system python-build-system)
	;; There are no tests, but attempting to run python setup.py test leads to
	;; PYTHONPATH problems, just disable the test
	(arguments '(#:tests? #f))
	(home-page "https://github.com/LRGH/elfesteem")
	(synopsis "ELF/PE/Mach-O parsing library")
	(description "elfesteem parses ELF, PE and Mach-O files.")
	(license license:lgpl2.1))))

	(define-public python-oscrypto
	(package
	(name "python-oscrypto")
	(version "1.3.0")
	(source
	(origin
	(method git-fetch)
	(uri (git-reference
	(url "https://github.com/wbond/oscrypto")
	(commit version)))
	(file-name (git-file-name name version))
	(sha256
	(base32
	"1v5wkmzcyiqy39db8j2dvkdrv2nlsc48556h73x4dzjwd6kg4q0a"))
	(patches (search-our-patches "oscrypto-hard-code-openssl.patch"))))
	(build-system python-build-system)
	(native-search-paths
	(list (search-path-specification
	(variable "SSL_CERT_FILE")
	(file-type 'regular)
	(separator #f) ;single entry
	(files '("etc/ssl/certs/ca-certificates.crt")))))

	(propagated-inputs
	`(("python-asn1crypto" ,python-asn1crypto)
	("openssl" ,openssl)))
	(arguments
	`(#:phases
	(modify-phases %standard-phases
	(add-after 'unpack 'hard-code-path-to-libscrypt
	(lambda* (#:key inputs #:allow-other-keys)
	(let ((openssl (assoc-ref inputs "openssl")))
	(substitute* "oscrypto/__init__.py"
	(("@GUIX_OSCRYPTO_USE_OPENSSL@")
	(string-append openssl "/lib/libcrypto.so" "," openssl "/lib/libssl.so")))
	#t)))
	(add-after 'unpack 'disable-broken-tests
	(lambda _
	;; This test is broken as there is no keyboard interrupt.
	(substitute* "tests/test_trust_list.py"
	(("^(.*)class TrustListTests" line indent)
	(string-append indent
	"@unittest.skip(\"Disabled by Guix\")\n"
	line)))
	(substitute* "tests/test_tls.py"
	(("^(.*)class TLSTests" line indent)
	(string-append indent
	"@unittest.skip(\"Disabled by Guix\")\n"
	line)))
	#t))
	(replace 'check
	(lambda _
	(invoke "python" "run.py" "tests")
	#t)))))
	(home-page "https://github.com/wbond/oscrypto")
	(synopsis "Compiler-free Python crypto library backed by the OS")
	(description "oscrypto is a compilation-free, always up-to-date encryption library for Python.")
	(license license:expat)))

	(define-public python-oscryptotests
	(package (inherit python-oscrypto)
	(name "python-oscryptotests")
	(propagated-inputs
	`(("python-oscrypto" ,python-oscrypto)))
	(arguments
	`(#:tests? #f
	#:phases
	(modify-phases %standard-phases
	(add-after 'unpack 'hard-code-path-to-libscrypt
	(lambda* (#:key inputs #:allow-other-keys)
	(chdir "tests")
	#t)))))))

	(define-public python-certvalidator
	(let ((commit "a145bf25eb75a9f014b3e7678826132efbba6213"))
	(package
	(name "python-certvalidator")
	(version (git-version "0.1" "1" commit))
	(source
	(origin
	(method git-fetch)
	(uri (git-reference
	(url "https://github.com/achow101/certvalidator")
	(commit commit)))
	(file-name (git-file-name name commit))
	(sha256
	(base32
	"1qw2k7xis53179lpqdqyylbcmp76lj7sagp883wmxg5i7chhc96k"))))
	(build-system python-build-system)
	(propagated-inputs
	`(("python-asn1crypto" ,python-asn1crypto)
	("python-oscrypto" ,python-oscrypto)
	("python-oscryptotests", python-oscryptotests))) ;; certvalidator tests import oscryptotests
	(arguments
	`(#:phases
	(modify-phases %standard-phases
	(add-after 'unpack 'disable-broken-tests
	(lambda _
	(substitute* "tests/test_certificate_validator.py"
	(("^(.*)class CertificateValidatorTests" line indent)
	(string-append indent
	"@unittest.skip(\"Disabled by Guix\")\n"
	line)))
	(substitute* "tests/test_crl_client.py"
	(("^(.*)def test_fetch_crl" line indent)
	(string-append indent
	"@unittest.skip(\"Disabled by Guix\")\n"
	line)))
	(substitute* "tests/test_ocsp_client.py"
	(("^(.*)def test_fetch_ocsp" line indent)
	(string-append indent
	"@unittest.skip(\"Disabled by Guix\")\n"
	line)))
	(substitute* "tests/test_registry.py"
	(("^(.*)def test_build_paths" line indent)
	(string-append indent
	"@unittest.skip(\"Disabled by Guix\")\n"
	line)))
	(substitute* "tests/test_validate.py"
	(("^(.*)def test_revocation_mode_hard" line indent)
	(string-append indent
	"@unittest.skip(\"Disabled by Guix\")\n"
	line)))
	(substitute* "tests/test_validate.py"
	(("^(.*)def test_revocation_mode_soft" line indent)
	(string-append indent
	"@unittest.skip(\"Disabled by Guix\")\n"
	line)))
	#t))
	(replace 'check
	(lambda _
	(invoke "python" "run.py" "tests")
	#t)))))
	(home-page "https://github.com/wbond/certvalidator")
	(synopsis "Python library for validating X.509 certificates and paths")
	(description "certvalidator is a Python library for validating X.509
	certificates or paths. Supports various options, including: validation at a
	specific moment in time, whitelisting and revocation checks.")
	(license license:expat))))

	(define-public python-macholib
	(package
	(name "python-macholib")
	(version "1.14")
	(source
	(origin
	(method git-fetch)
	(uri (git-reference
	(url "https://github.com/ronaldoussoren/macholib")
	(commit (string-append "v" version))))
	(file-name (git-file-name name version))
	(sha256
	(base32
	"0aislnnfsza9wl4f0vp45ivzlc0pzhp9d4r08700slrypn5flg42"))))
	(build-system python-build-system)
	(propagated-inputs
	`(("python-altgraph" ,python-altgraph)))
	(arguments
	'(#:phases
	(modify-phases %standard-phases
	(add-after 'unpack 'disable-broken-tests
	(lambda _
	;; This test is broken as there is no keyboard interrupt.
	(substitute* "macholib_tests/test_command_line.py"
	(("^(.*)class TestCmdLine" line indent)
	(string-append indent
	"@unittest.skip(\"Disabled by Guix\")\n"
	line)))
	(substitute* "macholib_tests/test_dyld.py"
	(("^(.*)def test_\\S+_find" line indent)
	(string-append indent
	"@unittest.skip(\"Disabled by Guix\")\n"
	line))
	(("^(.*)def testBasic" line indent)
	(string-append indent
	"@unittest.skip(\"Disabled by Guix\")\n"
	line))
	)
	#t)))))
	(home-page "https://github.com/ronaldoussoren/macholib")
	(synopsis "Python library for analyzing and editing Mach-O headers")
	(description "macholib is a Macho-O header analyzer and editor. It's
	typically used as a dependency analysis tool, and also to rewrite dylib
	references in Mach-O headers to be @executable_path relative. Though this tool
	targets a platform specific file format, it is pure python code that is platform
	and endian independent.")
	(license license:expat)))

	(define-public python-signapple
	(let ((commit "8a945a2e7583be2665cf3a6a89d665b70ecd1ab6"))
	(package
	(name "python-signapple")
	(version (git-version "0.1" "1" commit))
	(source
	(origin
	(method git-fetch)
	(uri (git-reference
	(url "https://github.com/achow101/signapple")
	(commit commit)))
	(file-name (git-file-name name commit))
	(sha256
	(base32
	"0fr1hangvfyiwflca6jg5g8zvg3jc9qr7vd2c12ff89pznf38dlg"))))
	(build-system python-build-system)
	(propagated-inputs
	`(("python-asn1crypto" ,python-asn1crypto)
	("python-oscrypto" ,python-oscrypto)
	("python-certvalidator" ,python-certvalidator)
	("python-elfesteem" ,python-elfesteem)
	("python-requests" ,python-requests)
	("python-macholib" ,python-macholib)))
	;; There are no tests, but attempting to run python setup.py test leads to
	;; problems, just disable the test
	(arguments '(#:tests? #f))
	(home-page "https://github.com/achow101/signapple")
	(synopsis "Mach-O binary signature tool")
	(description "signapple is a Python tool for creating, verifying, and
	inspecting signatures in Mach-O binaries.")
	(license license:expat))))

	(define-public mingw-w64-base-gcc
	(package
	(inherit base-gcc)
	(arguments
	(substitute-keyword-arguments (package-arguments base-gcc)
	((#:configure-flags flags)
	`(append ,flags
	;; https://gcc.gnu.org/install/configure.html
	(list "--enable-threads=posix",
	"--enable-default-ssp=yes",
	building-on)))))))

	(define-public linux-base-gcc
	(package
	(inherit base-gcc)
	(arguments
	(substitute-keyword-arguments (package-arguments base-gcc)
	((#:configure-flags flags)
	`(append ,flags
	;; https://gcc.gnu.org/install/configure.html
	(list "--enable-initfini-array=yes",
	"--enable-default-ssp=yes",
	"--enable-default-pie=yes",
	"--enable-standard-branch-protection=yes",
	building-on)))
	((#:phases phases)
	`(modify-phases ,phases
	;; Given a XGCC package, return a modified package that replace each instance of
	;; -rpath in the default system spec that's inserted by Guix with -rpath-link
	(add-after 'pre-configure 'replace-rpath-with-rpath-link
	(lambda _
	(substitute* (cons "gcc/config/rs6000/sysv4.h"
	(find-files "gcc/config"
	"^gnu-user.*\\.h$"))
	(("-rpath=") "-rpath-link="))
	#t))))))))

	(define-public glibc-2.28
	(package
	(inherit glibc-2.31)
	(version "2.28")
	(source (origin
	(method git-fetch)
	(uri (git-reference
	(url "https://sourceware.org/git/glibc.git")
	(commit "c9e58ae23402eb82877de90fd8a18519c086ed87")))
	(file-name (git-file-name "glibc" "c9e58ae23402eb82877de90fd8a18519c086ed87"))
	(sha256
	(base32
	"0wm0if2n4z48kpn85va6yb4iac34crds2f55ddpz1hykx6jp1pb6"))
	(patches (search-our-patches "glibc-2.28-fcommon.patch"
	"glibc-2.28-guix-prefix.patch"
	"glibc-2.28-no-librt.patch"))))
	(arguments
	(substitute-keyword-arguments (package-arguments glibc)
	((#:configure-flags flags)
	`(append ,flags
	;; https://www.gnu.org/software/libc/manual/html_node/Configuring-and-compiling.html
	(list "--enable-stack-protector=all",
	"--enable-bind-now",
	"--disable-werror",
	building-on)))
	((#:phases phases)
	`(modify-phases ,phases
	(add-before 'configure 'set-etc-rpc-installation-directory
	(lambda* (#:key outputs #:allow-other-keys)
	;; Install the rpc data base file under `$out/etc/rpc'.
	;; Otherwise build will fail with "Permission denied."
	(let ((out (assoc-ref outputs "out")))
	(substitute* "sunrpc/Makefile"
	(("^\\$\$inst_sysconfdir\$/rpc(.*)$" _ suffix)
	(string-append out "/etc/rpc" suffix "\n"))
	(("^install-others =.*$")
	(string-append "install-others = " out "/etc/rpc\n"))))))))))))

	(packages->manifest
	(append
	(list ;; The Basics
	bash-minimal
	which
	coreutils-minimal
	util-linux
	gperf
	;; File(system) inspection
	file
	grep
	diffutils
	findutils
	;; File transformation
	patch
	gawk
	sed
	moreutils
	;; Compression and archiving
	tar
	bzip2
	gzip
	xz
	zlib
	;; Build tools
	cmake-minimal
	ninja
	gnu-make
	libtool
	autoconf-2.71
	automake
	pkg-config
	bison
	(list gcc "lib")
	;; Scripting
	python-minimal ;; (3.10)
	perl
	;; Git
	git-minimal
	;; Tests
	python-lief
	;; Web
	curl
	nss-certs)
	(let ((target (getenv "HOST")))
	(cond ((string-suffix? "-mingw32" target)
	(list ;; Native GCC 12 toolchain
	gcc-toolchain-12
	clang-10
	zip
	(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
	nsis-x86_64
	nss-certs
	osslsigncode))
	((string-contains target "-linux-")
	(list ;; Native GCC 12 toolchain
	gcc-toolchain-12
	(list gcc-toolchain-12 "static")
	(make-bitcoin-cross-toolchain target)
	clang-10))
	((string-contains target "darwin")
	(list ;; Native GCC 11 toolchain
	gcc-toolchain-11
	binutils
	clang-toolchain-15
	python-signapple
	xorriso))
	(else '())))))
	diff --git a/contrib/guix/patches/binutils-unaligned-default.patch b/contrib/guix/patches/binutils-unaligned-default.patch
	new file mode 100644
	index 000000000..d1bc71aee
	--- /dev/null
	+++ b/contrib/guix/patches/binutils-unaligned-default.patch
	@@ -0,0 +1,22 @@
	+commit 6537181f59ed186a341db621812a6bc35e22eaf6
	+Author: fanquake <fanquake@gmail.com>
	+Date: Wed Apr 10 12:15:52 2024 +0200
	+
	+ build: turn on -muse-unaligned-vector-move by default
	+
	+ This allows us to avoid (more invasively) patching GCC, to avoid
	+ unaligned instruction use.
	+
	+diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
	+index e0632681477..14a9653abdf 100644
	+--- a/gas/config/tc-i386.c
	++++ b/gas/config/tc-i386.c
	+@@ -801,7 +801,7 @@ static unsigned int no_cond_jump_promotion = 0;
	+ static unsigned int sse2avx;
	+
	+ /* Encode aligned vector move as unaligned vector move. */
	+-static unsigned int use_unaligned_vector_move;
	++static unsigned int use_unaligned_vector_move = 1;
	+
	+ /* Encode scalar AVX instructions with specific vector length. */
	+ static enum
	diff --git a/contrib/guix/patches/vmov-alignment.patch b/contrib/guix/patches/vmov-alignment.patch
	deleted file mode 100644
	index 96e1cb7cd..000000000
	--- a/contrib/guix/patches/vmov-alignment.patch
	+++ /dev/null
	@@ -1,288 +0,0 @@
	-Description: Use unaligned VMOV instructions
	-Author: Stephen Kitt <skitt@debian.org>
	-Bug-Debian: https://bugs.debian.org/939559
	-See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412
	-
	-Based on a patch originally by Claude Heiland-Allen <claude@mathr.co.uk>
	-
	---- a/gcc/config/i386/sse.md
	-+++ b/gcc/config/i386/sse.md
	-@@ -1058,17 +1058,11 @@
	- {
	- if (FLOAT_MODE_P (GET_MODE_INNER (<MODE>mode)))
	- {
	-- if (misaligned_operand (operands[1], <MODE>mode))
	-- return "vmovu<ssemodesuffix>\t{%1, %0%{%3%}%N2\|%0%{%3%}%N2, %1}";
	-- else
	-- return "vmova<ssemodesuffix>\t{%1, %0%{%3%}%N2\|%0%{%3%}%N2, %1}";
	-+ return "vmovu<ssemodesuffix>\t{%1, %0%{%3%}%N2\|%0%{%3%}%N2, %1}";
	- }
	- else
	- {
	-- if (misaligned_operand (operands[1], <MODE>mode))
	-- return "vmovdqu<ssescalarsize>\t{%1, %0%{%3%}%N2\|%0%{%3%}%N2, %1}";
	-- else
	-- return "vmovdqa<ssescalarsize>\t{%1, %0%{%3%}%N2\|%0%{%3%}%N2, %1}";
	-+ return "vmovdqu<ssescalarsize>\t{%1, %0%{%3%}%N2\|%0%{%3%}%N2, %1}";
	- }
	- }
	- [(set_attr "type" "ssemov")
	-@@ -1184,17 +1178,11 @@
	- {
	- if (FLOAT_MODE_P (GET_MODE_INNER (<MODE>mode)))
	- {
	-- if (misaligned_operand (operands[0], <MODE>mode))
	-- return "vmovu<ssemodesuffix>\t{%1, %0%{%2%}\|%0%{%2%}, %1}";
	-- else
	-- return "vmova<ssemodesuffix>\t{%1, %0%{%2%}\|%0%{%2%}, %1}";
	-+ return "vmovu<ssemodesuffix>\t{%1, %0%{%2%}\|%0%{%2%}, %1}";
	- }
	- else
	- {
	-- if (misaligned_operand (operands[0], <MODE>mode))
	-- return "vmovdqu<ssescalarsize>\t{%1, %0%{%2%}\|%0%{%2%}, %1}";
	-- else
	-- return "vmovdqa<ssescalarsize>\t{%1, %0%{%2%}\|%0%{%2%}, %1}";
	-+ return "vmovdqu<ssescalarsize>\t{%1, %0%{%2%}\|%0%{%2%}, %1}";
	- }
	- }
	- [(set_attr "type" "ssemov")
	-@@ -7806,7 +7794,7 @@
	- "TARGET_SSE && !(MEM_P (operands[0]) && MEM_P (operands[1]))"
	- "@
	- %vmovlps\t{%1, %0\|%q0, %1}
	-- %vmovaps\t{%1, %0\|%0, %1}
	-+ %vmovups\t{%1, %0\|%0, %1}
	- %vmovlps\t{%1, %d0\|%d0, %q1}"
	- [(set_attr "type" "ssemov")
	- (set_attr "prefix" "maybe_vex")
	-@@ -13997,29 +13985,15 @@
	- switch (<MODE>mode)
	- {
	- case E_V8DFmode:
	-- if (misaligned_operand (operands[2], <ssequartermode>mode))
	-- return "vmovupd\t{%2, %x0\|%x0, %2}";
	-- else
	-- return "vmovapd\t{%2, %x0\|%x0, %2}";
	-+ return "vmovupd\t{%2, %x0\|%x0, %2}";
	- case E_V16SFmode:
	-- if (misaligned_operand (operands[2], <ssequartermode>mode))
	-- return "vmovups\t{%2, %x0\|%x0, %2}";
	-- else
	-- return "vmovaps\t{%2, %x0\|%x0, %2}";
	-+ return "vmovups\t{%2, %x0\|%x0, %2}";
	- case E_V8DImode:
	-- if (misaligned_operand (operands[2], <ssequartermode>mode))
	-- return which_alternative == 2 ? "vmovdqu64\t{%2, %x0\|%x0, %2}"
	-+ return which_alternative == 2 ? "vmovdqu64\t{%2, %x0\|%x0, %2}"
	- : "vmovdqu\t{%2, %x0\|%x0, %2}";
	-- else
	-- return which_alternative == 2 ? "vmovdqa64\t{%2, %x0\|%x0, %2}"
	-- : "vmovdqa\t{%2, %x0\|%x0, %2}";
	- case E_V16SImode:
	-- if (misaligned_operand (operands[2], <ssequartermode>mode))
	-- return which_alternative == 2 ? "vmovdqu32\t{%2, %x0\|%x0, %2}"
	-+ return which_alternative == 2 ? "vmovdqu32\t{%2, %x0\|%x0, %2}"
	- : "vmovdqu\t{%2, %x0\|%x0, %2}";
	-- else
	-- return which_alternative == 2 ? "vmovdqa32\t{%2, %x0\|%x0, %2}"
	-- : "vmovdqa\t{%2, %x0\|%x0, %2}";
	- default:
	- gcc_unreachable ();
	- }
	-@@ -21225,63 +21199,27 @@
	- switch (get_attr_mode (insn))
	- {
	- case MODE_V16SF:
	-- if (misaligned_operand (operands[1], <ssehalfvecmode>mode))
	-- return "vmovups\t{%1, %t0\|%t0, %1}";
	-- else
	-- return "vmovaps\t{%1, %t0\|%t0, %1}";
	-+ return "vmovups\t{%1, %t0\|%t0, %1}";
	- case MODE_V8DF:
	-- if (misaligned_operand (operands[1], <ssehalfvecmode>mode))
	-- return "vmovupd\t{%1, %t0\|%t0, %1}";
	-- else
	-- return "vmovapd\t{%1, %t0\|%t0, %1}";
	-+ return "vmovupd\t{%1, %t0\|%t0, %1}";
	- case MODE_V8SF:
	-- if (misaligned_operand (operands[1], <ssehalfvecmode>mode))
	-- return "vmovups\t{%1, %x0\|%x0, %1}";
	-- else
	-- return "vmovaps\t{%1, %x0\|%x0, %1}";
	-+ return "vmovups\t{%1, %x0\|%x0, %1}";
	- case MODE_V4DF:
	-- if (misaligned_operand (operands[1], <ssehalfvecmode>mode))
	-- return "vmovupd\t{%1, %x0\|%x0, %1}";
	-- else
	-- return "vmovapd\t{%1, %x0\|%x0, %1}";
	-+ return "vmovupd\t{%1, %x0\|%x0, %1}";
	- case MODE_XI:
	-- if (misaligned_operand (operands[1], <ssehalfvecmode>mode))
	-- {
	-- if (which_alternative == 2)
	-- return "vmovdqu\t{%1, %t0\|%t0, %1}";
	-- else if (GET_MODE_SIZE (<ssescalarmode>mode) == 8)
	-- return "vmovdqu64\t{%1, %t0\|%t0, %1}";
	-- else
	-- return "vmovdqu32\t{%1, %t0\|%t0, %1}";
	-- }
	-+ if (which_alternative == 2)
	-+ return "vmovdqu\t{%1, %t0\|%t0, %1}";
	-+ else if (GET_MODE_SIZE (<ssescalarmode>mode) == 8)
	-+ return "vmovdqu64\t{%1, %t0\|%t0, %1}";
	- else
	-- {
	-- if (which_alternative == 2)
	-- return "vmovdqa\t{%1, %t0\|%t0, %1}";
	-- else if (GET_MODE_SIZE (<ssescalarmode>mode) == 8)
	-- return "vmovdqa64\t{%1, %t0\|%t0, %1}";
	-- else
	-- return "vmovdqa32\t{%1, %t0\|%t0, %1}";
	-- }
	-+ return "vmovdqu32\t{%1, %t0\|%t0, %1}";
	- case MODE_OI:
	-- if (misaligned_operand (operands[1], <ssehalfvecmode>mode))
	-- {
	-- if (which_alternative == 2)
	-- return "vmovdqu\t{%1, %x0\|%x0, %1}";
	-- else if (GET_MODE_SIZE (<ssescalarmode>mode) == 8)
	-- return "vmovdqu64\t{%1, %x0\|%x0, %1}";
	-- else
	-- return "vmovdqu32\t{%1, %x0\|%x0, %1}";
	-- }
	-+ if (which_alternative == 2)
	-+ return "vmovdqu\t{%1, %x0\|%x0, %1}";
	-+ else if (GET_MODE_SIZE (<ssescalarmode>mode) == 8)
	-+ return "vmovdqu64\t{%1, %x0\|%x0, %1}";
	- else
	-- {
	-- if (which_alternative == 2)
	-- return "vmovdqa\t{%1, %x0\|%x0, %1}";
	-- else if (GET_MODE_SIZE (<ssescalarmode>mode) == 8)
	-- return "vmovdqa64\t{%1, %x0\|%x0, %1}";
	-- else
	-- return "vmovdqa32\t{%1, %x0\|%x0, %1}";
	-- }
	-+ return "vmovdqu32\t{%1, %x0\|%x0, %1}";
	- default:
	- gcc_unreachable ();
	- }
	---- a/gcc/config/i386/i386.cc
	-+++ b/gcc/config/i386/i386.cc
	-@@ -5418,17 +5418,15 @@ ix86_get_ssemov (rtx *operands, unsigned size,
	- {
	- case opcode_int:
	- if (scalar_mode == E_HFmode)
	-- opcode = (misaligned_p
	-- ? (TARGET_AVX512BW ? "vmovdqu16" : "vmovdqu64")
	-- : "vmovdqa64");
	-+ opcode = TARGET_AVX512BW ? "vmovdqu16" : "vmovdqu64";
	- else
	-- opcode = misaligned_p ? "vmovdqu32" : "vmovdqa32";
	-+ opcode = "vmovdqu32";
	- break;
	- case opcode_float:
	-- opcode = misaligned_p ? "vmovups" : "vmovaps";
	-+ opcode = "vmovups";
	- break;
	- case opcode_double:
	-- opcode = misaligned_p ? "vmovupd" : "vmovapd";
	-+ opcode = "vmovupd";
	- break;
	- }
	- }
	-@@ -5438,29 +5436,21 @@ ix86_get_ssemov (rtx *operands, unsigned size,
	- {
	- case E_HFmode:
	- if (evex_reg_p)
	-- opcode = (misaligned_p
	-- ? (TARGET_AVX512BW
	-- ? "vmovdqu16"
	-- : "vmovdqu64")
	-- : "vmovdqa64");
	-+ opcode = TARGET_AVX512BW ? "vmovdqu16" : "vmovdqu64";
	- else
	-- opcode = (misaligned_p
	-- ? (TARGET_AVX512BW
	-- ? "vmovdqu16"
	-- : "%vmovdqu")
	-- : "%vmovdqa");
	-+ opcode = TARGET_AVX512BW ? "vmovdqu16" : "%vmovdqu";
	- break;
	- case E_SFmode:
	-- opcode = misaligned_p ? "%vmovups" : "%vmovaps";
	-+ opcode = "%vmovups";
	- break;
	- case E_DFmode:
	-- opcode = misaligned_p ? "%vmovupd" : "%vmovapd";
	-+ opcode = "%vmovupd";
	- break;
	- case E_TFmode:
	- if (evex_reg_p)
	-- opcode = misaligned_p ? "vmovdqu64" : "vmovdqa64";
	-+ opcode = "vmovdqu64";
	- else
	-- opcode = misaligned_p ? "%vmovdqu" : "%vmovdqa";
	-+ opcode = "%vmovdqu";
	- break;
	- default:
	- gcc_unreachable ();
	-@@ -5472,48 +5462,32 @@ ix86_get_ssemov (rtx *operands, unsigned size,
	- {
	- case E_QImode:
	- if (evex_reg_p)
	-- opcode = (misaligned_p
	-- ? (TARGET_AVX512BW
	-- ? "vmovdqu8"
	-- : "vmovdqu64")
	-- : "vmovdqa64");
	-+ opcode = TARGET_AVX512BW ? "vmovdqu8" : "vmovdqu64";
	- else
	-- opcode = (misaligned_p
	-- ? (TARGET_AVX512BW
	-- ? "vmovdqu8"
	-- : "%vmovdqu")
	-- : "%vmovdqa");
	-+ opcode = TARGET_AVX512BW ? "vmovdqu8" : "%vmovdqu";
	- break;
	- case E_HImode:
	- if (evex_reg_p)
	-- opcode = (misaligned_p
	-- ? (TARGET_AVX512BW
	-- ? "vmovdqu16"
	-- : "vmovdqu64")
	-- : "vmovdqa64");
	-+ opcode = TARGET_AVX512BW ? "vmovdqu16" : "vmovdqu64";
	- else
	-- opcode = (misaligned_p
	-- ? (TARGET_AVX512BW
	-- ? "vmovdqu16"
	-- : "%vmovdqu")
	-- : "%vmovdqa");
	-+ opcode = TARGET_AVX512BW ? "vmovdqu16" : "%vmovdqu";
	- break;
	- case E_SImode:
	- if (evex_reg_p)
	-- opcode = misaligned_p ? "vmovdqu32" : "vmovdqa32";
	-+ opcode = "vmovdqu32";
	- else
	-- opcode = misaligned_p ? "%vmovdqu" : "%vmovdqa";
	-+ opcode = "%vmovdqu";
	- break;
	- case E_DImode:
	- case E_TImode:
	- case E_OImode:
	- if (evex_reg_p)
	-- opcode = misaligned_p ? "vmovdqu64" : "vmovdqa64";
	-+ opcode = "vmovdqu64";
	- else
	-- opcode = misaligned_p ? "%vmovdqu" : "%vmovdqa";
	-+ opcode = "%vmovdqu";
	- break;
	- case E_XImode:
	-- opcode = misaligned_p ? "vmovdqu64" : "vmovdqa64";
	-+ opcode = "vmovdqu64";
	- break;
	- default:
	- gcc_unreachable ();

File Metadata

Mime Type: text/x-diff
Expires: Wed, May 21, 21:26 (1 d, 15 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5865950
Default Alt Text: (35 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions