summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch20
1 files changed, 17 insertions, 3 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch b/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
index 22a2339ad9..dfd67fe55c 100644
--- a/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
+++ b/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
@@ -4,10 +4,10 @@ get correct compiler options for x32 gcc.
4 4
5Received this patch from H.J. Lu <hjl.tools@gmail.com> 5Received this patch from H.J. Lu <hjl.tools@gmail.com>
6 6
7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01 7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/06
8 8
9--- Mesa-7.11/bin/mklib.x32 2011-11-30 14:29:14.976465283 -0800 9--- Mesa-7.11/bin/mklib.x32 2011-12-06 13:15:17.968695114 -0800
10+++ Mesa-7.11/bin/mklib 2011-11-30 14:32:48.591525193 -0800 10+++ Mesa-7.11/bin/mklib 2011-12-06 13:17:13.872152249 -0800
11@@ -335,7 +335,12 @@ case $ARCH in 11@@ -335,7 +335,12 @@ case $ARCH in
12 set ${OBJECTS} 12 set ${OBJECTS}
13 ABI32=`file $1 | grep 32-bit` 13 ABI32=`file $1 | grep 32-bit`
@@ -22,3 +22,17 @@ Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
22 fi 22 fi
23 23
24 if [ "${ALTOPTS}" ] ; then 24 if [ "${ALTOPTS}" ] ; then
25@@ -392,7 +397,12 @@ case $ARCH in
26 set ${OBJECTS}
27 ABI32=`file $1 | grep 32-bit`
28 if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
29- OPTS="-m32 ${OPTS}"
30+ ABIX32=`file $1 | grep x86-64`
31+ if [ "${ABI32}" ]; then
32+ OPTS="-mx32 ${OPTS}"
33+ else
34+ OPTS="-m32 ${OPTS}"
35+ fi
36 fi
37 if [ "${ALTOPTS}" ] ; then
38 OPTS=${ALTOPTS}