Skip to content

Commit 8e3d2c3

Browse files
committed
configure: Only use -m32 on x86-* 32 bit systems
1 parent 2a63e44 commit 8e3d2c3

File tree

1 file changed

+36
-16
lines changed

1 file changed

+36
-16
lines changed

configure

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,51 +1043,71 @@ do
10431043

10441044
case "$CFG_CC" in
10451045
("ccache clang")
1046-
LLVM_CXX_32="ccache clang++ -m32 -Qunused-arguments"
1047-
LLVM_CC_32="ccache clang -m32 -Qunused-arguments"
1046+
LLVM_CXX_32="ccache clang++ -Qunused-arguments"
1047+
LLVM_CC_32="ccache clang -Qunused-arguments"
10481048

10491049
LLVM_CXX_64="ccache clang++ -Qunused-arguments"
10501050
LLVM_CC_64="ccache clang -Qunused-arguments"
10511051
;;
10521052
("clang")
1053-
LLVM_CXX_32="clang++ -m32 -Qunused-arguments"
1054-
LLVM_CC_32="clang -m32 -Qunused-arguments"
1053+
LLVM_CXX_32="clang++ -Qunused-arguments"
1054+
LLVM_CC_32="clang -Qunused-arguments"
10551055

10561056
LLVM_CXX_64="clang++ -Qunused-arguments"
10571057
LLVM_CC_64="clang -Qunused-arguments"
10581058
;;
10591059
("ccache gcc")
1060-
LLVM_CXX_32="ccache g++ -m32"
1061-
LLVM_CC_32="ccache gcc -m32"
1060+
LLVM_CXX_32="ccache g++"
1061+
LLVM_CC_32="ccache gcc"
10621062

10631063
LLVM_CXX_64="ccache g++"
10641064
LLVM_CC_64="ccache gcc"
10651065
;;
10661066
("gcc")
1067-
LLVM_CXX_32="g++ -m32"
1068-
LLVM_CC_32="gcc -m32"
1067+
LLVM_CXX_32="g++"
1068+
LLVM_CC_32="gcc"
10691069

10701070
LLVM_CXX_64="g++"
10711071
LLVM_CC_64="gcc"
10721072
;;
10731073

10741074
(*)
10751075
msg "inferring LLVM_CXX/CC from CXX/CC = $CXX/$CC"
1076-
LLVM_CXX_32="$CXX -m32"
1077-
LLVM_CC_32="$CC -m32"
1076+
LLVM_CXX_32="$CXX"
1077+
LLVM_CC_32="$CC"
10781078

10791079
LLVM_CXX_64="$CXX"
10801080
LLVM_CC_64="$CC"
10811081
;;
10821082
esac
10831083

1084-
LLVM_CFLAGS_32="-m32"
1085-
LLVM_CXXFLAGS_32="-m32"
1086-
LLVM_LDFLAGS_32="-m32"
1084+
case "$CFG_CPUTYPE" in
1085+
(x86*)
1086+
LLVM_CXX_32="$LLVM_CXX_32 -m32"
1087+
LLVM_CC_32="$LLVM_CC_32 -m32"
10871088

1088-
LLVM_CFLAGS_64=""
1089-
LLVM_CXXFLAGS_64=""
1090-
LLVM_LDFLAGS_64=""
1089+
LLVM_CFLAGS_32="-m32"
1090+
LLVM_CXXFLAGS_32="-m32"
1091+
LLVM_LDFLAGS_32="-m32"
1092+
1093+
LLVM_CFLAGS_64=""
1094+
LLVM_CXXFLAGS_64=""
1095+
LLVM_LDFLAGS_64=""
1096+
1097+
LLVM_CXX_32="$LLVM_CXX_32 -m32"
1098+
LLVM_CC_32="$LLVM_CC_32 -m32"
1099+
;;
1100+
1101+
(*)
1102+
LLVM_CFLAGS_32=""
1103+
LLVM_CXXFLAGS_32=""
1104+
LLVM_LDFLAGS_32=""
1105+
1106+
LLVM_CFLAGS_64=""
1107+
LLVM_CXXFLAGS_64=""
1108+
LLVM_LDFLAGS_64=""
1109+
;;
1110+
esac
10911111

10921112
if echo $t | grep -q x86_64
10931113
then

0 commit comments

Comments
 (0)