diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2012-02-27 11:50:07 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-28 12:14:51 +0000 |
| commit | 09dcd878a55b5aec5427288c4faf3c4d64a30a72 (patch) | |
| tree | 6aad0b8f4dc68809d6c1c0d987a3a14dd080ae60 /meta/recipes-connectivity | |
| parent | d3bc674dc7ec46b215df50236b95d3b0aed2ee4a (diff) | |
| download | openembedded-core-contrib-09dcd878a55b5aec5427288c4faf3c4d64a30a72.tar.gz | |
bluez4: Fix build on x86/amd64 with gcc 4.7
gcc figures an impossible asm contraint
in inline asm which it is correct about
"i" requires the operand to be a compile-time constant
but memory location of a multi-dimensional array isn't constant
at compile time.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/bluez/bluez4-4.98/sbc_mmx.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez/bluez4_4.98.bb | 6 |
2 files changed, 28 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.98/sbc_mmx.patch b/meta/recipes-connectivity/bluez/bluez4-4.98/sbc_mmx.patch new file mode 100644 index 0000000000..98fab458b0 --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4-4.98/sbc_mmx.patch @@ -0,0 +1,24 @@ +on x86 and x86_64 gcc 4.7 complains + +sbc/sbc_primitives_mmx.c: In function 'sbc_calc_scalefactors_mmx': +sbc/sbc_primitives_mmx.c:294:4: warning: asm operand 2 probably doesn't match constraints [enabled by default] +sbc/sbc_primitives_mmx.c:294:4: error: impossible constraint in 'asm' + +This patch is taken from https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/911871 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending +Index: bluez-4.98/sbc/sbc_primitives_mmx.c +=================================================================== +--- bluez-4.98.orig/sbc/sbc_primitives_mmx.c 2011-12-21 14:53:54.000000000 -0800 ++++ bluez-4.98/sbc/sbc_primitives_mmx.c 2012-02-24 10:07:03.422073800 -0800 +@@ -318,7 +318,7 @@ + "movl %k0, 4(%3)\n" + : "+r" (blk) + : "r" (&sb_sample_f[0][ch][sb]), +- "i" ((char *) &sb_sample_f[1][0][0] - ++ "r" ((char *) &sb_sample_f[1][0][0] - + (char *) &sb_sample_f[0][0][0]), + "r" (&scale_factor[ch][sb]), + "r" (&consts), diff --git a/meta/recipes-connectivity/bluez/bluez4_4.98.bb b/meta/recipes-connectivity/bluez/bluez4_4.98.bb index 62de1feb48..2412b1b160 100644 --- a/meta/recipes-connectivity/bluez/bluez4_4.98.bb +++ b/meta/recipes-connectivity/bluez/bluez4_4.98.bb @@ -1,8 +1,10 @@ require bluez4.inc -PR = "r0" +PR = "r1" -SRC_URI += "file://bluetooth.conf" +SRC_URI += "file://bluetooth.conf \ + file://sbc_mmx.patch \ + " SRC_URI[md5sum] = "362864b716950baa04797de735fc237b" SRC_URI[sha256sum] = "9a5b655bada7c7a1921cb3bac83b8a32bbe49893e4c7a1377cdc1b0d35f7d233" |