aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/libmad-armv7-thumb-pt2.patch
blob: bb450967e672254dc73edb092eb8f8ab1b4c00fc (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
Copied from Debian.

From: Dave Martin
Subject: "rsc" doesnt exist anymore in thumb2

diff --git a/fixed.h b/fixed.h
index 4b58abf..ba4bc26 100644
--- a/fixed.h
+++ b/fixed.h
@@ -275,12 +275,25 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
 	 : "+r" (lo), "+r" (hi)  \
 	 : "%r" (x), "r" (y))
 
+#ifdef __thumb__
+/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero
+	operand.  If needed this code can also support Thumb-1 
+	(simply append "s" to the end of the second two instructions). */
+#  define MAD_F_MLN(hi, lo)  \
+    asm ("rsbs        %0, %0, #0\n\t"  \
+	 "sbc   %1, %1, %1\n\t"  \
+	 "sub   %1, %1, %2"  \
+	 : "+&r" (lo), "=&r" (hi)  \
+	 : "r" (hi)  \
+	 : "cc")
+#else /* ! __thumb__ */
 #  define MAD_F_MLN(hi, lo)  \
     asm ("rsbs	%0, %2, #0\n\t"  \
 	 "rsc	%1, %3, #0"  \
-	 : "=r" (lo), "=r" (hi)  \
+	 : "=&r" (lo), "=r" (hi)  \
 	 : "0" (lo), "1" (hi)  \
 	 : "cc")
+#endif /* __thumb__ */
 
 #  define mad_f_scale64(hi, lo)  \
     ({ mad_fixed_t __result;  \
]: New field. * gnu/services/web.scm (httpd-service-type)[description]: New field. (fcgiwrap-service-type)[description]: New field. (agate-service-type)[description]: New field. [name]: Fix. 2022-03-17Revert "services: nfs: Define rpcbind-shepherd-service at the top level."Maxim Cournoyer This reverts commit 0a9e82b43080275a2755624f3208287056dc9f95, which didn't end up fixing anything. The problem was elsewhere; namely, using 'operating-system-services' instead of 'operating-system-user-services'. 2022-03-17services: nfs: Define rpcbind-shepherd-service at the top level.Maxim Cournoyer Attempting to use the 'nfs-service-type' as part of a computed operating-system definition, the following exception would be thrown: ice-9/boot-9.scm:1685:16: In procedure raise-exception: ERROR: 1. &ambiguous-target-service-error: service: #<<service> type: #<service-type rpcbind 7f7529853780> value: #<<rpcbind-configuration> rpcbind: #<package rpcbind@1.2.6 gnu/packages/onc-rpc.scm:87 7f75389e78f0> warm-start?: #t>> target-type: #<service-type shepherd-root 7f7529396080> 2. &message: "more than one target service of type 'shepherd-root'" The problem was that the rpcbind shepherd-service object was dynamically instantiated every time the rpcbind-service-type would be called, causing multiple objects in some situations, resulting in the above condition. * gnu/services/nfs.scm (rpcbind-service-type): Refactor and adjust in a way to extract... (rpcbind-shepherd-service): ... this new procedure. 2021-12-23services: nfs: Fix statd and mountd ports.Mathieu Othacehe * gnu/services/nfs.scm (nfs-shepherd-services): Fix rpcstatd-port and rpcmountd-port arguments. 2021-02-05gnu: services: Fix the NFS service.Maxim Cournoyer * gnu/services/nfs.scm (rpcbind-service-type): Adjust for the file name change of the rpcbind command. 2020-05-29services: nfs: Expose configuration options for TCP and UDP.Maxim Cournoyer * gnu/services/nfs.scm (<nfs-configuration>)[nfsd-tcp?, nfsd-udp?]: New fields. (nfs-shepherd-services)[rpc.nfsd]: Populate the --{no-,}tcp and --{no-,}udp command line options based on the values of the nfsd-tcp? and nfsd-upd? fields. * doc/guix.texi (Network File System): Add doc. 2020-03-27services/nfs: Replace nfs-version with nfs-versions.Ricardo Wurmus Instead of accepting a string for just one protocol version accept a list of supported versions. * gnu/services/nfs.scm (<nfs-configuration>)[nfs-version]: Remove field and replace... [nfs-versions]: ...with this new field. (nfs-shepherd-services): Pass as many "--nfs-version" options as there are supported versions. * doc/guix.texi (Network File System): Document nfs-versions. 2020-03-25services/nfs: Mount nfsd pseudo file system.Ricardo Wurmus * gnu/services/nfs.scm (nfs-shepherd-services): Add shepherd-service providing /proc/fs/nfsd and make other shepherd services require it. 2020-03-16services: nfs: Remove unnecessary "mount" invocation.Ludovic Courtès * gnu/services/nfs.scm (%nfs-activation): Remove unnecessary "mount" invocation (/proc/fs/nfsd is automatically mounted, somehow). Remove unnecessary 'mkdir-p' call. 2020-03-16services: nfs: Move activation snippet out of line.Ludovic Courtès * gnu/services/nfs.scm (%nfs-activation): New variable. (nfs-service-type)[extensions]: Refer to %NFS-ACTIVATION. 2020-03-08services: nfs: Run rpc.mountd in foreground.Maxim Cournoyer Fixes <https://bugs.gnu.org/39708>. Shepherd doesn't keep track of processes that fork themselves and would disable the process after restarting it a couple times. * gnu/services/nfs.scm (nfs-shepherd-services): Invoke rpc.mountd with the '--foreground' option. 2020-01-08services: nfs: Add nfs-service-type.Ricardo Wurmus * gnu/services/nfs.scm (<nfs-configuration>): New record. (nfs-configuration, nfs-configuration?, nfs-configuration-nfs-utils, nfs-configuration-nfs-version, nfs-configuration-exports, nfs-configuration-rpcmountd-port, nfs-configuration-rpcstatd-port, nfs-configuration-rpcbind, nfs-configuration-idmap-domain, nfs-configuration-nfsd-port, nfs-configuration-nfsd-threads, nfs-configuration-pipefs-directory, nfs-configuration-debug, nfs-shepherd-services): New procedures. (nfs-service-type): New variable. * doc/guix.texi (Network File System): Document it. * gnu/tests/nfs.scm (%test-nfs-server): New variable. (%base-os): Use default value of rpcbind-service-type. 2020-01-08services: nfs: Allow gss-service-type to be extended.Ricardo Wurmus * gnu/services/nfs.scm (gss-service-type): Rewrite using SERVICE-TYPE to add ability to extend the service. 2020-01-08services: nfs: Add verbosity control to idmap-service-type.Ricardo Wurmus * gnu/services/nfs.scm (<idmap-configuration>)[verbosity]: New field. (idmap-configuration-verbosity): New procedure. (idmap-service-type): Use it. * doc/guix.texi (Network File System): Document it. 2020-01-08services: nfs: Allow idmap-service-type to be extended.Ricardo Wurmus * gnu/services/nfs.scm (idmap-service-type): Rewrite using SERVICE-TYPE to add ability to extend the service. 2020-01-08services: nfs: Fix indentation and typo.Ricardo Wurmus * gnu/services/nfs.scm (<gss-configuration>, <idmap-configuration>): Fix indentation. (<idmap-configuration>): Rename accessor for NFS-UTILS field to IDMAP-CONFIGURATION-NFS-UTILS. (idmap-service-type): Use IDMAP-CONFIGURATION-NFS-UTILS. 2020-01-08services: nfs: Allow pipefs-service-type to be extended.Ricardo Wurmus * gnu/services/nfs.scm (pipefs-service-type): Rewrite using SERVICE-TYPE to add ability to extend the service. 2020-01-08services: nfs: Allow rpcbind-service-type to be extended.Ricardo Wurmus * gnu/services/nfs.scm (rpcbind-service-type): Rewrite using SERVICE-TYPE to add ability to extend the service. 2020-01-08services: nfs: Fix name of package variable.Ricardo Wurmus * gnu/services/nfs.scm (rpcbind-service-type): Correct name from nfs-utils to rpcbind.