Revision 4be403c8 configure

b/configure
3694 3694

  
3695 3695
case "$target_arch2" in
3696 3696
  i386)
3697
    target_phys_bits=64
3698 3697
  ;;
3699 3698
  x86_64)
3700 3699
    TARGET_BASE_ARCH=i386
......
3702 3701
    target_long_alignment=8
3703 3702
  ;;
3704 3703
  alpha)
3705
    target_phys_bits=64
3706 3704
    target_long_alignment=8
3707 3705
    target_nptl="yes"
3708 3706
  ;;
......
3711 3709
    bflt="yes"
3712 3710
    target_nptl="yes"
3713 3711
    gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"
3714
    target_phys_bits=64
3715 3712
    target_llong_alignment=4
3716 3713
    target_libs_softmmu="$fdt_libs"
3717 3714
  ;;
3718 3715
  cris)
3719 3716
    target_nptl="yes"
3720
    target_phys_bits=32
3721 3717
  ;;
3722 3718
  lm32)
3723
    target_phys_bits=32
3724 3719
    target_libs_softmmu="$opengl_libs"
3725 3720
  ;;
3726 3721
  m68k)
3727 3722
    bflt="yes"
3728 3723
    gdb_xml_files="cf-core.xml cf-fp.xml"
3729
    target_phys_bits=32
3730 3724
    target_int_alignment=2
3731 3725
    target_long_alignment=2
3732 3726
    target_llong_alignment=2
......
3735 3729
    TARGET_ARCH=microblaze
3736 3730
    bflt="yes"
3737 3731
    target_nptl="yes"
3738
    target_phys_bits=32
3739 3732
    target_libs_softmmu="$fdt_libs"
3740 3733
  ;;
3741 3734
  mips|mipsel)
3742 3735
    TARGET_ARCH=mips
3743 3736
    echo "TARGET_ABI_MIPSO32=y" >> $config_target_mak
3744 3737
    target_nptl="yes"
3745
    target_phys_bits=64
3746 3738
  ;;
3747 3739
  mipsn32|mipsn32el)
3748 3740
    TARGET_ARCH=mipsn32
3749 3741
    TARGET_BASE_ARCH=mips
3750 3742
    echo "TARGET_ABI_MIPSN32=y" >> $config_target_mak
3751
    target_phys_bits=64
3752 3743
  ;;
3753 3744
  mips64|mips64el)
3754 3745
    TARGET_ARCH=mips64
3755 3746
    TARGET_BASE_ARCH=mips
3756 3747
    echo "TARGET_ABI_MIPSN64=y" >> $config_target_mak
3757
    target_phys_bits=64
3758 3748
    target_long_alignment=8
3759 3749
  ;;
3760 3750
  or32)
3761 3751
    TARGET_ARCH=openrisc
3762 3752
    TARGET_BASE_ARCH=openrisc
3763
    target_phys_bits=32
3764 3753
  ;;
3765 3754
  ppc)
3766 3755
    gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
3767
    target_phys_bits=64
3768 3756
    target_nptl="yes"
3769 3757
    target_libs_softmmu="$fdt_libs"
3770 3758
  ;;
......
3772 3760
    TARGET_BASE_ARCH=ppc
3773 3761
    TARGET_ABI_DIR=ppc
3774 3762
    gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
3775
    target_phys_bits=64
3776 3763
    target_nptl="yes"
3777 3764
    target_libs_softmmu="$fdt_libs"
3778 3765
  ;;
......
3780 3767
    TARGET_BASE_ARCH=ppc
3781 3768
    TARGET_ABI_DIR=ppc
3782 3769
    gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
3783
    target_phys_bits=64
3784 3770
    target_long_alignment=8
3785 3771
    target_libs_softmmu="$fdt_libs"
3786 3772
  ;;
......
3790 3776
    TARGET_ABI_DIR=ppc
3791 3777
    echo "TARGET_ABI32=y" >> $config_target_mak
3792 3778
    gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
3793
    target_phys_bits=64
3794 3779
    target_libs_softmmu="$fdt_libs"
3795 3780
  ;;
3796 3781
  sh4|sh4eb)
3797 3782
    TARGET_ARCH=sh4
3798 3783
    bflt="yes"
3799 3784
    target_nptl="yes"
3800
    target_phys_bits=32
3801 3785
  ;;
3802 3786
  sparc)
3803
    target_phys_bits=64
3804 3787
  ;;
3805 3788
  sparc64)
3806 3789
    TARGET_BASE_ARCH=sparc
3807
    target_phys_bits=64
3808 3790
    target_long_alignment=8
3809 3791
  ;;
3810 3792
  sparc32plus)
......
3812 3794
    TARGET_BASE_ARCH=sparc
3813 3795
    TARGET_ABI_DIR=sparc
3814 3796
    echo "TARGET_ABI32=y" >> $config_target_mak
3815
    target_phys_bits=64
3816 3797
  ;;
3817 3798
  s390x)
3818 3799
    target_nptl="yes"
3819
    target_phys_bits=64
3820 3800
    target_long_alignment=8
3821 3801
  ;;
3822 3802
  unicore32)
......
3824 3804
  ;;
3825 3805
  xtensa|xtensaeb)
3826 3806
    TARGET_ARCH=xtensa
3827
    target_phys_bits=32
3828 3807
  ;;
3829 3808
  *)
3830 3809
    echo "Unsupported target CPU"
......
3859 3838
case "$target_arch2" in
3860 3839
  i386|x86_64)
3861 3840
    if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
3862
      target_phys_bits=64
3863 3841
      echo "CONFIG_XEN=y" >> $config_target_mak
3864 3842
      if test "$xen_pci_passthrough" = yes; then
3865 3843
        echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak"
......
3899 3877
  echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak
3900 3878
fi
3901 3879
if test "$target_softmmu" = "yes" ; then
3902
  echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_target_mak
3903 3880
  echo "CONFIG_SOFTMMU=y" >> $config_target_mak
3904 3881
  echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
3905
  echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
3906
  echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
3882
  echo "HWDIR=../libhw" >> $config_target_mak
3883
  echo "subdir-$target: subdir-libhw" >> $config_host_mak
3907 3884
  if test "$smartcard_nss" = "yes" ; then
3908 3885
    echo "subdir-$target: subdir-libcacard" >> $config_host_mak
3909 3886
  fi
......
4145 4122
    echo "LD=$ld" >> $config_mak
4146 4123
done
4147 4124

  
4148
for hwlib in 32 64; do
4149
  d=libhw$hwlib
4150
  symlink "$source_path/Makefile.hw" "$d/Makefile"
4151
  echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak
4152
done
4125
d=libhw
4126
symlink "$source_path/Makefile.hw" "$d/Makefile"
4153 4127

  
4154 4128
d=libuser
4155 4129
symlink "$source_path/Makefile.user" "$d/Makefile"

Also available in: Unified diff