gwj / at91sam9263 · Commits

Commit 2408a5273fb328a63c7238d4441d8a98dfa48460

Authored by aurel32
1 parent 9bd0d294

more configure cleanups 

(Stuart Brady)


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4226 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 228 additions and 156 deletions
configure
  View file @2408a52
... ... @@ -539,15 +539,49 @@ fi
539 539 if test -z "$target_list" ; then
540 540 # these targets are portable
541 541 if [ "$softmmu" = "yes" ] ; then
542   - target_list="i386-softmmu sparc-softmmu x86_64-softmmu mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu arm-softmmu ppc-softmmu ppcemb-softmmu ppc64-softmmu m68k-softmmu sh4-softmmu sh4eb-softmmu cris-softmmu"
  542 + target_list="\
  543 +i386-softmmu \
  544 +x86_64-softmmu \
  545 +arm-softmmu \
  546 +cris-softmmu \
  547 +m68k-softmmu \
  548 +mips-softmmu \
  549 +mipsel-softmmu \
  550 +mips64-softmmu \
  551 +mips64el-softmmu \
  552 +ppc-softmmu \
  553 +ppcemb-softmmu \
  554 +ppc64-softmmu \
  555 +sh4-softmmu \
  556 +sh4eb-softmmu \
  557 +sparc-softmmu \
  558 +"
543 559 fi
544 560 # the following are Linux specific
545 561 if [ "$linux_user" = "yes" ] ; then
546   - target_list="i386-linux-user arm-linux-user armeb-linux-user sparc-linux-user sparc64-linux-user sparc32plus-linux-user mips-linux-user mipsel-linux-user m68k-linux-user alpha-linux-user sh4-linux-user sh4eb-linux-user ppc-linux-user ppc64-linux-user ppc64abi32-linux-user x86_64-linux-user cris-linux-user $target_list"
  562 + target_list="${target_list}\
  563 +i386-linux-user \
  564 +x86_64-linux-user \
  565 +alpha-linux-user \
  566 +arm-linux-user \
  567 +armeb-linux-user \
  568 +cris-linux-user \
  569 +m68k-linux-user \
  570 +mips-linux-user \
  571 +mipsel-linux-user \
  572 +ppc-linux-user \
  573 +ppc64-linux-user \
  574 +ppc64abi32-linux-user \
  575 +sh4-linux-user \
  576 +sh4eb-linux-user \
  577 +sparc-linux-user \
  578 +sparc64-linux-user \
  579 +sparc32plus-linux-user \
  580 +"
547 581 fi
548 582 # the following are Darwin specific
549 583 if [ "$darwin_user" = "yes" ] ; then
550   - target_list="i386-darwin-user ppc-darwin-user $target_list"
  584 + target_list="$target_list i386-darwin-user ppc-darwin-user"
551 585 fi
552 586 else
553 587 target_list=`echo "$target_list" | sed -e 's/,/ /g'`
... ... @@ -851,55 +885,72 @@ echo "CFLAGS=$CFLAGS" >> $config_mak
851 885 echo "LDFLAGS=$LDFLAGS" >> $config_mak
852 886 echo "EXESUF=$EXESUF" >> $config_mak
853 887 echo "AIOLIBS=$AIOLIBS" >> $config_mak
854   -if test "$cpu" = "i386" ; then
855   - echo "ARCH=i386" >> $config_mak
856   - echo "#define HOST_I386 1" >> $config_h
857   -elif test "$cpu" = "x86_64" ; then
858   - echo "ARCH=x86_64" >> $config_mak
859   - echo "#define HOST_X86_64 1" >> $config_h
860   -elif test "$cpu" = "alpha" ; then
861   - echo "ARCH=alpha" >> $config_mak
862   - echo "#define HOST_ALPHA 1" >> $config_h
863   -elif test "$cpu" = "armv4b" ; then
864   - echo "ARCH=arm" >> $config_mak
865   - echo "#define HOST_ARM 1" >> $config_h
866   -elif test "$cpu" = "armv4l" ; then
867   - echo "ARCH=arm" >> $config_mak
868   - echo "#define HOST_ARM 1" >> $config_h
869   -elif test "$cpu" = "cris" ; then
870   - echo "ARCH=cris" >> $config_mak
871   - echo "#define HOST_CRIS 1" >> $config_h
872   -elif test "$cpu" = "hppa" ; then
873   - echo "ARCH=hppa" >> $config_mak
874   - echo "#define HOST_HPPA 1" >> $config_h
875   -elif test "$cpu" = "ia64" ; then
876   - echo "ARCH=ia64" >> $config_mak
877   - echo "#define HOST_IA64 1" >> $config_h
878   -elif test "$cpu" = "m68k" ; then
879   - echo "ARCH=m68k" >> $config_mak
880   - echo "#define HOST_M68K 1" >> $config_h
881   -elif test "$cpu" = "mips" ; then
882   - echo "ARCH=mips" >> $config_mak
883   - echo "#define HOST_MIPS 1" >> $config_h
884   -elif test "$cpu" = "mips64" ; then
885   - echo "ARCH=mips64" >> $config_mak
886   - echo "#define HOST_MIPS64 1" >> $config_h
887   -elif test "$cpu" = "powerpc" ; then
888   - echo "ARCH=ppc" >> $config_mak
889   - echo "#define HOST_PPC 1" >> $config_h
890   -elif test "$cpu" = "s390" ; then
891   - echo "ARCH=s390" >> $config_mak
892   - echo "#define HOST_S390 1" >> $config_h
893   -elif test "$cpu" = "sparc" ; then
894   - echo "ARCH=sparc" >> $config_mak
895   - echo "#define HOST_SPARC 1" >> $config_h
896   -elif test "$cpu" = "sparc64" ; then
897   - echo "ARCH=sparc64" >> $config_mak
898   - echo "#define HOST_SPARC64 1" >> $config_h
899   -else
900   - echo "Unsupported CPU = $cpu"
901   - exit 1
902   -fi
  888 +case "$cpu" in
  889 + i386)
  890 + echo "ARCH=i386" >> $config_mak
  891 + echo "#define HOST_I386 1" >> $config_h
  892 + ;;
  893 + x86_64)
  894 + echo "ARCH=x86_64" >> $config_mak
  895 + echo "#define HOST_X86_64 1" >> $config_h
  896 + ;;
  897 + alpha)
  898 + echo "ARCH=alpha" >> $config_mak
  899 + echo "#define HOST_ALPHA 1" >> $config_h
  900 + ;;
  901 + armv4b)
  902 + echo "ARCH=arm" >> $config_mak
  903 + echo "#define HOST_ARM 1" >> $config_h
  904 + ;;
  905 + armv4l)
  906 + echo "ARCH=arm" >> $config_mak
  907 + echo "#define HOST_ARM 1" >> $config_h
  908 + ;;
  909 + cris)
  910 + echo "ARCH=cris" >> $config_mak
  911 + echo "#define HOST_CRIS 1" >> $config_h
  912 + ;;
  913 + hppa)
  914 + echo "ARCH=hppa" >> $config_mak
  915 + echo "#define HOST_HPPA 1" >> $config_h
  916 + ;;
  917 + ia64)
  918 + echo "ARCH=ia64" >> $config_mak
  919 + echo "#define HOST_IA64 1" >> $config_h
  920 + ;;
  921 + m68k)
  922 + echo "ARCH=m68k" >> $config_mak
  923 + echo "#define HOST_M68K 1" >> $config_h
  924 + ;;
  925 + mips)
  926 + echo "ARCH=mips" >> $config_mak
  927 + echo "#define HOST_MIPS 1" >> $config_h
  928 + ;;
  929 + mips64)
  930 + echo "ARCH=mips64" >> $config_mak
  931 + echo "#define HOST_MIPS64 1" >> $config_h
  932 + ;;
  933 + powerpc)
  934 + echo "ARCH=ppc" >> $config_mak
  935 + echo "#define HOST_PPC 1" >> $config_h
  936 + ;;
  937 + s390)
  938 + echo "ARCH=s390" >> $config_mak
  939 + echo "#define HOST_S390 1" >> $config_h
  940 + ;;
  941 + sparc)
  942 + echo "ARCH=sparc" >> $config_mak
  943 + echo "#define HOST_SPARC 1" >> $config_h
  944 + ;;
  945 + sparc64)
  946 + echo "ARCH=sparc64" >> $config_mak
  947 + echo "#define HOST_SPARC64 1" >> $config_h
  948 + ;;
  949 + *)
  950 + echo "Unsupported CPU = $cpu"
  951 + exit 1
  952 + ;;
  953 +esac
903 954 if test "$bigendian" = "yes" ; then
904 955 echo "WORDS_BIGENDIAN=yes" >> $config_mak
905 956 echo "#define WORDS_BIGENDIAN 1" >> $config_h
... ... @@ -1139,110 +1190,131 @@ elfload32="no"
1139 1190 interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`
1140 1191 echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
1141 1192  
1142   -if test "$target_cpu" = "i386" ; then
1143   - echo "TARGET_ARCH=i386" >> $config_mak
1144   - echo "#define TARGET_ARCH \"i386\"" >> $config_h
1145   - echo "#define TARGET_I386 1" >> $config_h
1146   - if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "i386" ; then
1147   - echo "#define USE_KQEMU 1" >> $config_h
1148   - fi
1149   -elif test "$target_cpu" = "x86_64" ; then
1150   - echo "TARGET_ARCH=x86_64" >> $config_mak
1151   - echo "#define TARGET_ARCH \"x86_64\"" >> $config_h
1152   - echo "#define TARGET_I386 1" >> $config_h
1153   - echo "#define TARGET_X86_64 1" >> $config_h
1154   - if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64" ; then
1155   - echo "#define USE_KQEMU 1" >> $config_h
1156   - fi
1157   -elif test "$target_cpu" = "alpha" ; then
1158   - echo "TARGET_ARCH=alpha" >> $config_mak
1159   - echo "#define TARGET_ARCH \"alpha\"" >> $config_h
1160   - echo "#define TARGET_ALPHA 1" >> $config_h
1161   -elif test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then
1162   - echo "TARGET_ARCH=arm" >> $config_mak
1163   - echo "CONFIG_NO_DYNGEN_OP=yes" >> $config_mak
1164   - echo "#define TARGET_ARCH \"arm\"" >> $config_h
1165   - echo "#define TARGET_ARM 1" >> $config_h
1166   - echo "#define CONFIG_NO_DYNGEN_OP 1" >> $config_h
1167   - bflt="yes"
1168   -elif test "$target_cpu" = "cris" ; then
1169   - echo "TARGET_ARCH=cris" >> $config_mak
1170   - echo "#define TARGET_ARCH \"cris\"" >> $config_h
1171   - echo "#define TARGET_CRIS 1" >> $config_h
1172   - echo "CONFIG_SOFTFLOAT=yes" >> $config_mak
1173   - echo "#define CONFIG_SOFTFLOAT 1" >> $config_h
1174   -elif test "$target_cpu" = "m68k" ; then
1175   - echo "TARGET_ARCH=m68k" >> $config_mak
1176   - echo "#define TARGET_ARCH \"m68k\"" >> $config_h
1177   - echo "#define TARGET_M68K 1" >> $config_h
1178   - bflt="yes"
1179   -elif test "$target_cpu" = "mips" -o "$target_cpu" = "mipsel" ; then
1180   - echo "TARGET_ARCH=mips" >> $config_mak
1181   - echo "#define TARGET_ARCH \"mips\"" >> $config_h
1182   - echo "#define TARGET_MIPS 1" >> $config_h
1183   - echo "#define TARGET_ABI_MIPSO32 1" >> $config_h
1184   -elif test "$target_cpu" = "mipsn32" -o "$target_cpu" = "mipsn32el" ; then
1185   - echo "TARGET_ARCH=mipsn32" >> $config_mak
1186   - echo "#define TARGET_ARCH \"mipsn32\"" >> $config_h
1187   - echo "#define TARGET_MIPS 1" >> $config_h
1188   - echo "#define TARGET_ABI_MIPSN32 1" >> $config_h
1189   -elif test "$target_cpu" = "mips64" -o "$target_cpu" = "mips64el" ; then
1190   - echo "TARGET_ARCH=mips64" >> $config_mak
1191   - echo "#define TARGET_ARCH \"mips64\"" >> $config_h
1192   - echo "#define TARGET_MIPS 1" >> $config_h
1193   - echo "#define TARGET_MIPS64 1" >> $config_h
1194   - echo "#define TARGET_ABI_MIPSN64 1" >> $config_h
1195   -elif test "$target_cpu" = "ppc" ; then
1196   - echo "TARGET_ARCH=ppc" >> $config_mak
1197   - echo "#define TARGET_ARCH \"ppc\"" >> $config_h
1198   - echo "#define TARGET_PPC 1" >> $config_h
1199   -elif test "$target_cpu" = "ppcemb" ; then
1200   - echo "TARGET_ARCH=ppcemb" >> $config_mak
1201   - echo "TARGET_ABI_DIR=ppc" >> $config_mak
1202   - echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h
1203   - echo "#define TARGET_PPC 1" >> $config_h
1204   - echo "#define TARGET_PPCEMB 1" >> $config_h
1205   -elif test "$target_cpu" = "ppc64" ; then
1206   - echo "TARGET_ARCH=ppc64" >> $config_mak
1207   - echo "TARGET_ABI_DIR=ppc" >> $config_mak
1208   - echo "#define TARGET_ARCH \"ppc64\"" >> $config_h
1209   - echo "#define TARGET_PPC 1" >> $config_h
1210   - echo "#define TARGET_PPC64 1" >> $config_h
1211   -elif test "$target_cpu" = "ppc64abi32" ; then
1212   - echo "TARGET_ARCH=ppc64" >> $config_mak
1213   - echo "TARGET_ABI_DIR=ppc" >> $config_mak
1214   - echo "TARGET_ARCH2=ppc64abi32" >> $config_mak
1215   - echo "#define TARGET_ARCH \"ppc64\"" >> $config_h
1216   - echo "#define TARGET_PPC 1" >> $config_h
1217   - echo "#define TARGET_PPC64 1" >> $config_h
1218   - echo "#define TARGET_ABI32 1" >> $config_h
1219   -elif test "$target_cpu" = "sh4" -o "$target_cpu" = "sh4eb" ; then
1220   - echo "TARGET_ARCH=sh4" >> $config_mak
1221   - echo "#define TARGET_ARCH \"sh4\"" >> $config_h
1222   - echo "#define TARGET_SH4 1" >> $config_h
1223   - bflt="yes"
1224   -elif test "$target_cpu" = "sparc" ; then
1225   - echo "TARGET_ARCH=sparc" >> $config_mak
1226   - echo "#define TARGET_ARCH \"sparc\"" >> $config_h
1227   - echo "#define TARGET_SPARC 1" >> $config_h
1228   -elif test "$target_cpu" = "sparc64" ; then
1229   - echo "TARGET_ARCH=sparc64" >> $config_mak
1230   - echo "#define TARGET_ARCH \"sparc64\"" >> $config_h
1231   - echo "#define TARGET_SPARC 1" >> $config_h
1232   - echo "#define TARGET_SPARC64 1" >> $config_h
1233   - elfload32="yes"
1234   -elif test "$target_cpu" = "sparc32plus" ; then
1235   - echo "TARGET_ARCH=sparc64" >> $config_mak
1236   - echo "TARGET_ABI_DIR=sparc" >> $config_mak
1237   - echo "TARGET_ARCH2=sparc32plus" >> $config_mak
1238   - echo "#define TARGET_ARCH \"sparc64\"" >> $config_h
1239   - echo "#define TARGET_SPARC 1" >> $config_h
1240   - echo "#define TARGET_SPARC64 1" >> $config_h
1241   - echo "#define TARGET_ABI32 1" >> $config_h
1242   -else
1243   - echo "Unsupported target CPU"
1244   - exit 1
1245   -fi
  1193 +case "$target_cpu" in
  1194 + i386)
  1195 + echo "TARGET_ARCH=i386" >> $config_mak
  1196 + echo "#define TARGET_ARCH \"i386\"" >> $config_h
  1197 + echo "#define TARGET_I386 1" >> $config_h
  1198 + if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "i386"
  1199 + then
  1200 + echo "#define USE_KQEMU 1" >> $config_h
  1201 + fi
  1202 + ;;
  1203 + x86_64)
  1204 + echo "TARGET_ARCH=x86_64" >> $config_mak
  1205 + echo "#define TARGET_ARCH \"x86_64\"" >> $config_h
  1206 + echo "#define TARGET_I386 1" >> $config_h
  1207 + echo "#define TARGET_X86_64 1" >> $config_h
  1208 + if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64"
  1209 + then
  1210 + echo "#define USE_KQEMU 1" >> $config_h
  1211 + fi
  1212 + ;;
  1213 + alpha)
  1214 + echo "TARGET_ARCH=alpha" >> $config_mak
  1215 + echo "#define TARGET_ARCH \"alpha\"" >> $config_h
  1216 + echo "#define TARGET_ALPHA 1" >> $config_h
  1217 + ;;
  1218 + arm|armeb)
  1219 + echo "TARGET_ARCH=arm" >> $config_mak
  1220 + echo "CONFIG_NO_DYNGEN_OP=yes" >> $config_mak
  1221 + echo "#define TARGET_ARCH \"arm\"" >> $config_h
  1222 + echo "#define TARGET_ARM 1" >> $config_h
  1223 + echo "#define CONFIG_NO_DYNGEN_OP 1" >> $config_h
  1224 + bflt="yes"
  1225 + ;;
  1226 + cris)
  1227 + echo "TARGET_ARCH=cris" >> $config_mak
  1228 + echo "#define TARGET_ARCH \"cris\"" >> $config_h
  1229 + echo "#define TARGET_CRIS 1" >> $config_h
  1230 + echo "CONFIG_SOFTFLOAT=yes" >> $config_mak
  1231 + echo "#define CONFIG_SOFTFLOAT 1" >> $config_h
  1232 + ;;
  1233 + m68k)
  1234 + echo "TARGET_ARCH=m68k" >> $config_mak
  1235 + echo "#define TARGET_ARCH \"m68k\"" >> $config_h
  1236 + echo "#define TARGET_M68K 1" >> $config_h
  1237 + bflt="yes"
  1238 + ;;
  1239 + mips|mipsel)
  1240 + echo "TARGET_ARCH=mips" >> $config_mak
  1241 + echo "#define TARGET_ARCH \"mips\"" >> $config_h
  1242 + echo "#define TARGET_MIPS 1" >> $config_h
  1243 + echo "#define TARGET_ABI_MIPSO32 1" >> $config_h
  1244 + ;;
  1245 + mipsn32|mipsn32el)
  1246 + echo "TARGET_ARCH=mipsn32" >> $config_mak
  1247 + echo "#define TARGET_ARCH \"mipsn32\"" >> $config_h
  1248 + echo "#define TARGET_MIPS 1" >> $config_h
  1249 + echo "#define TARGET_ABI_MIPSN32 1" >> $config_h
  1250 + ;;
  1251 + mips64|mips64el)
  1252 + echo "TARGET_ARCH=mips64" >> $config_mak
  1253 + echo "#define TARGET_ARCH \"mips64\"" >> $config_h
  1254 + echo "#define TARGET_MIPS 1" >> $config_h
  1255 + echo "#define TARGET_MIPS64 1" >> $config_h
  1256 + echo "#define TARGET_ABI_MIPSN64 1" >> $config_h
  1257 + ;;
  1258 + ppc)
  1259 + echo "TARGET_ARCH=ppc" >> $config_mak
  1260 + echo "#define TARGET_ARCH \"ppc\"" >> $config_h
  1261 + echo "#define TARGET_PPC 1" >> $config_h
  1262 + ;;
  1263 + ppcemb)
  1264 + echo "TARGET_ARCH=ppcemb" >> $config_mak
  1265 + echo "TARGET_ABI_DIR=ppc" >> $config_mak
  1266 + echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h
  1267 + echo "#define TARGET_PPC 1" >> $config_h
  1268 + echo "#define TARGET_PPCEMB 1" >> $config_h
  1269 + ;;
  1270 + ppc64)
  1271 + echo "TARGET_ARCH=ppc64" >> $config_mak
  1272 + echo "TARGET_ABI_DIR=ppc" >> $config_mak
  1273 + echo "#define TARGET_ARCH \"ppc64\"" >> $config_h
  1274 + echo "#define TARGET_PPC 1" >> $config_h
  1275 + echo "#define TARGET_PPC64 1" >> $config_h
  1276 + ;;
  1277 + ppc64abi32)
  1278 + echo "TARGET_ARCH=ppc64" >> $config_mak
  1279 + echo "TARGET_ABI_DIR=ppc" >> $config_mak
  1280 + echo "TARGET_ARCH2=ppc64abi32" >> $config_mak
  1281 + echo "#define TARGET_ARCH \"ppc64\"" >> $config_h
  1282 + echo "#define TARGET_PPC 1" >> $config_h
  1283 + echo "#define TARGET_PPC64 1" >> $config_h
  1284 + echo "#define TARGET_ABI32 1" >> $config_h
  1285 + ;;
  1286 + sh4|sh4eb)
  1287 + echo "TARGET_ARCH=sh4" >> $config_mak
  1288 + echo "#define TARGET_ARCH \"sh4\"" >> $config_h
  1289 + echo "#define TARGET_SH4 1" >> $config_h
  1290 + bflt="yes"
  1291 + ;;
  1292 + sparc)
  1293 + echo "TARGET_ARCH=sparc" >> $config_mak
  1294 + echo "#define TARGET_ARCH \"sparc\"" >> $config_h
  1295 + echo "#define TARGET_SPARC 1" >> $config_h
  1296 + ;;
  1297 + sparc64)
  1298 + echo "TARGET_ARCH=sparc64" >> $config_mak
  1299 + echo "#define TARGET_ARCH \"sparc64\"" >> $config_h
  1300 + echo "#define TARGET_SPARC 1" >> $config_h
  1301 + echo "#define TARGET_SPARC64 1" >> $config_h
  1302 + elfload32="yes"
  1303 + ;;
  1304 + sparc32plus)
  1305 + echo "TARGET_ARCH=sparc64" >> $config_mak
  1306 + echo "TARGET_ABI_DIR=sparc" >> $config_mak
  1307 + echo "TARGET_ARCH2=sparc32plus" >> $config_mak
  1308 + echo "#define TARGET_ARCH \"sparc64\"" >> $config_h
  1309 + echo "#define TARGET_SPARC 1" >> $config_h
  1310 + echo "#define TARGET_SPARC64 1" >> $config_h
  1311 + echo "#define TARGET_ABI32 1" >> $config_h
  1312 + ;;
  1313 + *)
  1314 + echo "Unsupported target CPU"
  1315 + exit 1
  1316 + ;;
  1317 +esac
1246 1318 if test "$target_bigendian" = "yes" ; then
1247 1319 echo "TARGET_WORDS_BIGENDIAN=yes" >> $config_mak
1248 1320 echo "#define TARGET_WORDS_BIGENDIAN 1" >> $config_h
... ...