diff mbox

configure: factor out adding disas configure

Message ID 1437200703-12161-1-git-send-email-crosthwaite.peter@gmail.com
State New
Headers show

Commit Message

Peter Crosthwaite July 18, 2015, 6:25 a.m. UTC 
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>
---
Prepares support for multi-arch where the disas configury for
multi-arch will also need to be added where 3 more LOC are added
for each DISAS configury.
---
 configure | 65 ++++++++++++++++++++++++---------------------------------------
 1 file changed, 25 insertions(+), 40 deletions(-)

Comments

Peter Maydell July 18, 2015, 9:09 a.m. UTC | #1 
On 18 July 2015 at 07:25, Peter Crosthwaite <crosthwaitepeter@gmail.com> wrote:
> 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>
> ---
> Prepares support for multi-arch where the disas configury for
> multi-arch will also need to be added where 3 more LOC are added
> for each DISAS configury.
> ---
>  configure | 65 ++++++++++++++++++++++++---------------------------------------
>  1 file changed, 25 insertions(+), 40 deletions(-)
>
> diff --git a/configure b/configure
> index cc0338d..096977b 100755
> --- a/configure
> +++ b/configure
> @@ -5466,91 +5466,76 @@ fi
>  cflags=""
>  ldflags=""
>
> +disas_config() {
> +  echo "$@" >> $config_target_mak
> +  echo "$@" >> config-all-disas.mak
> +}

If we're calling it disas_config maybe we should make
the argument just be ALPHA, not 'CONFIG_ALPHA_DIS=y' ?

-- PMM
Peter Crosthwaite Aug. 29, 2015, 10:32 a.m. UTC | #2 
On Sat, Jul 18, 2015 at 2:09 AM, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 18 July 2015 at 07:25, Peter Crosthwaite <crosthwaitepeter@gmail.com> wrote:
>> 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>
>> ---
>> Prepares support for multi-arch where the disas configury for
>> multi-arch will also need to be added where 3 more LOC are added
>> for each DISAS configury.
>> ---
>>  configure | 65 ++++++++++++++++++++++++---------------------------------------
>>  1 file changed, 25 insertions(+), 40 deletions(-)
>>
>> diff --git a/configure b/configure
>> index cc0338d..096977b 100755
>> --- a/configure
>> +++ b/configure
>> @@ -5466,91 +5466,76 @@ fi
>>  cflags=""
>>  ldflags=""
>>
>> +disas_config() {
>> +  echo "$@" >> $config_target_mak
>> +  echo "$@" >> config-all-disas.mak
>> +}
>
> If we're calling it disas_config maybe we should make
> the argument just be ALPHA, not 'CONFIG_ALPHA_DIS=y' ?
>

Fixed.

Regards,
Peter

> -- PMM
diff mbox

Patch

diff --git a/configure b/configure
index cc0338d..096977b 100755
--- a/configure
+++ b/configure
@@ -5466,91 +5466,76 @@  fi
 cflags=""
 ldflags=""
 
+disas_config() {
+  echo "$@" >> $config_target_mak
+  echo "$@" >> 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 "CONFIG_ALPHA_DIS=y"
   ;;
   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 "CONFIG_ARM_A64_DIS=y"
     fi
   ;;
   arm)
-    echo "CONFIG_ARM_DIS=y"  >> $config_target_mak
-    echo "CONFIG_ARM_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_ARM_DIS=y"
     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 "CONFIG_ARM_A64_DIS=y"
     fi
   ;;
   cris)
-    echo "CONFIG_CRIS_DIS=y"  >> $config_target_mak
-    echo "CONFIG_CRIS_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_CRIS_DIS=y"
   ;;
   hppa)
-    echo "CONFIG_HPPA_DIS=y"  >> $config_target_mak
-    echo "CONFIG_HPPA_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_HPPA_DIS=y"
   ;;
   i386|x86_64|x32)
-    echo "CONFIG_I386_DIS=y"  >> $config_target_mak
-    echo "CONFIG_I386_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_I386_DIS=y"
   ;;
   ia64*)
-    echo "CONFIG_IA64_DIS=y"  >> $config_target_mak
-    echo "CONFIG_IA64_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_IA64_DIS=y"
   ;;
   lm32)
-    echo "CONFIG_LM32_DIS=y"  >> $config_target_mak
-    echo "CONFIG_LM32_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_LM32_DIS=y"
   ;;
   m68k)
-    echo "CONFIG_M68K_DIS=y"  >> $config_target_mak
-    echo "CONFIG_M68K_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_M68K_DIS=y"
   ;;
   microblaze*)
-    echo "CONFIG_MICROBLAZE_DIS=y"  >> $config_target_mak
-    echo "CONFIG_MICROBLAZE_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_MICROBLAZE_DIS=y"
   ;;
   mips*)
-    echo "CONFIG_MIPS_DIS=y"  >> $config_target_mak
-    echo "CONFIG_MIPS_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_MIPS_DIS=y"
   ;;
   moxie*)
-    echo "CONFIG_MOXIE_DIS=y"  >> $config_target_mak
-    echo "CONFIG_MOXIE_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_MOXIE_DIS=y"
   ;;
   or32)
-    echo "CONFIG_OPENRISC_DIS=y"  >> $config_target_mak
-    echo "CONFIG_OPENRISC_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_OPENRISC_DIS=y"
   ;;
   ppc*)
-    echo "CONFIG_PPC_DIS=y"  >> $config_target_mak
-    echo "CONFIG_PPC_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_PPC_DIS=y"
   ;;
   s390*)
-    echo "CONFIG_S390_DIS=y"  >> $config_target_mak
-    echo "CONFIG_S390_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_S390_DIS=y"
   ;;
   sh4)
-    echo "CONFIG_SH4_DIS=y"  >> $config_target_mak
-    echo "CONFIG_SH4_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_SH4_DIS=y"
   ;;
   sparc*)
-    echo "CONFIG_SPARC_DIS=y"  >> $config_target_mak
-    echo "CONFIG_SPARC_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_SPARC_DIS=y"
   ;;
   xtensa*)
-    echo "CONFIG_XTENSA_DIS=y"  >> $config_target_mak
-    echo "CONFIG_XTENSA_DIS=y"  >> config-all-disas.mak
+    disas_config "CONFIG_XTENSA_DIS=y"
   ;;
   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 "CONFIG_TCI_DIS=y"
 fi
 
 case "$ARCH" in