[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-241-g2294642

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  d9b5bbca017a8e578434e62ab6daeec24f2c11e1 (commit)

- Log -----------------------------------------------------------------
2294642 core: make cpuid code compile cleanly with 32bit PIC
-----------------------------------------------------------------------

Summary of changes:
 src/pulsecore/core-util.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------

commit 22946427624afde1d53973fa5a2e9e2041ffc5b7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Nov 11 04:50:32 2009 +0100

    core: make cpuid code compile cleanly with 32bit PIC

diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 93ddf30..d596c48 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -117,6 +117,7 @@
 #include <pulsecore/strbuf.h>
 #include <pulsecore/usergroup.h>
 #include <pulsecore/strlist.h>
+#include <pulsecore/cpu-x86.h>
 
 #include "core-util.h"
 
@@ -3085,10 +3086,13 @@ pa_bool_t pa_running_in_vm(void) {
     pa_zero(sig);
 
     __asm__ __volatile__ (
-        "  xor %%ebx, %%ebx          \n\t"
+        /* ebx/rbx is being used for PIC! */
+        "  push %%"PA_REG_b"         \n\t"
         "  cpuid                     \n\t"
+        "  mov %%ebx, %1             \n\t"
+        "  pop %%"PA_REG_b"          \n\t"
 
-        : "=a" (eax), "=b" (sig.sig32[0]), "=c" (sig.sig32[1]), "=d" (sig.sig32[2])
+        : "=a" (eax), "=r" (sig.sig32[0]), "=c" (sig.sig32[1]), "=d" (sig.sig32[2])
         : "0" (eax)
     );
 

-- 
hooks/post-receive
PulseAudio Sound Server