configure: factor out adding disas configure
Every arch adds its disas configury to both its own config as well config_disas_all. Make a small function do to both at once. Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> Message-Id: <1440844439-19391-1-git-send-email-crosthwaite.peter@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
		
							parent
							
								
									f42bf6a262
								
							
						
					
					
						commit
						c765fcac96
					
				| 
						 | 
				
			
			@ -5483,91 +5483,76 @@ fi
 | 
			
		|||
cflags=""
 | 
			
		||||
ldflags=""
 | 
			
		||||
 | 
			
		||||
disas_config() {
 | 
			
		||||
  echo "CONFIG_${1}_DIS=y" >> $config_target_mak
 | 
			
		||||
  echo "CONFIG_${1}_DIS=y" >> config-all-disas.mak
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
for i in $ARCH $TARGET_BASE_ARCH ; do
 | 
			
		||||
  case "$i" in
 | 
			
		||||
  alpha)
 | 
			
		||||
    echo "CONFIG_ALPHA_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_ALPHA_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "ALPHA"
 | 
			
		||||
  ;;
 | 
			
		||||
  aarch64)
 | 
			
		||||
    if test -n "${cxx}"; then
 | 
			
		||||
      echo "CONFIG_ARM_A64_DIS=y"  >> $config_target_mak
 | 
			
		||||
      echo "CONFIG_ARM_A64_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
      disas_config "ARM_A64"
 | 
			
		||||
    fi
 | 
			
		||||
  ;;
 | 
			
		||||
  arm)
 | 
			
		||||
    echo "CONFIG_ARM_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_ARM_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "ARM"
 | 
			
		||||
    if test -n "${cxx}"; then
 | 
			
		||||
      echo "CONFIG_ARM_A64_DIS=y"  >> $config_target_mak
 | 
			
		||||
      echo "CONFIG_ARM_A64_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
      disas_config "ARM_A64"
 | 
			
		||||
    fi
 | 
			
		||||
  ;;
 | 
			
		||||
  cris)
 | 
			
		||||
    echo "CONFIG_CRIS_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_CRIS_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "CRIS"
 | 
			
		||||
  ;;
 | 
			
		||||
  hppa)
 | 
			
		||||
    echo "CONFIG_HPPA_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_HPPA_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "HPPA"
 | 
			
		||||
  ;;
 | 
			
		||||
  i386|x86_64|x32)
 | 
			
		||||
    echo "CONFIG_I386_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_I386_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "I386"
 | 
			
		||||
  ;;
 | 
			
		||||
  ia64*)
 | 
			
		||||
    echo "CONFIG_IA64_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_IA64_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "IA64"
 | 
			
		||||
  ;;
 | 
			
		||||
  lm32)
 | 
			
		||||
    echo "CONFIG_LM32_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_LM32_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "LM32"
 | 
			
		||||
  ;;
 | 
			
		||||
  m68k)
 | 
			
		||||
    echo "CONFIG_M68K_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_M68K_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "M68K"
 | 
			
		||||
  ;;
 | 
			
		||||
  microblaze*)
 | 
			
		||||
    echo "CONFIG_MICROBLAZE_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_MICROBLAZE_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "MICROBLAZE"
 | 
			
		||||
  ;;
 | 
			
		||||
  mips*)
 | 
			
		||||
    echo "CONFIG_MIPS_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_MIPS_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "MIPS"
 | 
			
		||||
  ;;
 | 
			
		||||
  moxie*)
 | 
			
		||||
    echo "CONFIG_MOXIE_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_MOXIE_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "MOXIE"
 | 
			
		||||
  ;;
 | 
			
		||||
  or32)
 | 
			
		||||
    echo "CONFIG_OPENRISC_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_OPENRISC_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "OPENRISC"
 | 
			
		||||
  ;;
 | 
			
		||||
  ppc*)
 | 
			
		||||
    echo "CONFIG_PPC_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_PPC_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "PPC"
 | 
			
		||||
  ;;
 | 
			
		||||
  s390*)
 | 
			
		||||
    echo "CONFIG_S390_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_S390_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "S390"
 | 
			
		||||
  ;;
 | 
			
		||||
  sh4)
 | 
			
		||||
    echo "CONFIG_SH4_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_SH4_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "SH4"
 | 
			
		||||
  ;;
 | 
			
		||||
  sparc*)
 | 
			
		||||
    echo "CONFIG_SPARC_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_SPARC_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "SPARC"
 | 
			
		||||
  ;;
 | 
			
		||||
  xtensa*)
 | 
			
		||||
    echo "CONFIG_XTENSA_DIS=y"  >> $config_target_mak
 | 
			
		||||
    echo "CONFIG_XTENSA_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
    disas_config "XTENSA"
 | 
			
		||||
  ;;
 | 
			
		||||
  esac
 | 
			
		||||
done
 | 
			
		||||
if test "$tcg_interpreter" = "yes" ; then
 | 
			
		||||
  echo "CONFIG_TCI_DIS=y"  >> $config_target_mak
 | 
			
		||||
  echo "CONFIG_TCI_DIS=y"  >> config-all-disas.mak
 | 
			
		||||
  disas_config "TCI"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
case "$ARCH" in
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue