blob: 83b1587340ea72495c7606ec68362fed343a349c (
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
37
38
|
Upstream-Status: Pending
get correct compiler options for x32 gcc.
Received this patch from H.J. Lu <hjl.tools@gmail.com>
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/06
--- Mesa-7.11/bin/mklib.x32 2011-12-06 13:15:17.968695114 -0800
+++ Mesa-7.11/bin/mklib 2011-12-06 13:17:13.872152249 -0800
@@ -335,7 +335,12 @@ case $ARCH in
set ${OBJECTS}
ABI32=`file $1 | grep 32-bit`
if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
- OPTS="-m32 ${OPTS}"
+ ABIX32=`file $1 | grep x86-64`
+ if [ "${ABI32}" ]; then
+ OPTS="-mx32 ${OPTS}"
+ else
+ OPTS="-m32 ${OPTS}"
+ fi
fi
if [ "${ALTOPTS}" ] ; then
@@ -392,7 +397,12 @@ case $ARCH in
set ${OBJECTS}
ABI32=`file $1 | grep 32-bit`
if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
- OPTS="-m32 ${OPTS}"
+ ABIX32=`file $1 | grep x86-64`
+ if [ "${ABI32}" ]; then
+ OPTS="-mx32 ${OPTS}"
+ else
+ OPTS="-m32 ${OPTS}"
+ fi
fi
if [ "${ALTOPTS}" ] ; then
OPTS=${ALTOPTS}
|
