1.1 --- a/config/arch/arm.in	Sat Sep 11 12:38:12 2010 +0200
     1.2 +++ b/config/arch/arm.in	Sat Sep 11 12:42:22 2010 +0200
     1.3 @@ -14,55 +14,3 @@
     1.4      help
     1.5        The ARM architecture, as defined by:
     1.6          http://www.arm.com/
     1.7 -
     1.8 -config ARCH_ARM_MODE
     1.9 -    string
    1.10 -    default "arm"   if ARCH_ARM_MODE_ARM
    1.11 -    default "thumb" if ARCH_ARM_MODE_THUMB
    1.12 -
    1.13 -choice
    1.14 -    bool
    1.15 -    prompt "Default instruction set mode"
    1.16 -    default ARCH_ARM_MODE_ARM
    1.17 -
    1.18 -config ARCH_ARM_MODE_ARM
    1.19 -    bool
    1.20 -    prompt "arm"
    1.21 -    help
    1.22 -      Defaults to emitting instructions in the ARM mode.
    1.23 -
    1.24 -config ARCH_ARM_MODE_THUMB
    1.25 -    bool
    1.26 -    prompt "thumb (EXPERIMENTAL)"
    1.27 -    depends on EXPERIMENTAL
    1.28 -    help
    1.29 -      Defaults to emitting instructions in the THUMB mode.
    1.30 -
    1.31 -endchoice
    1.32 -
    1.33 -config ARCH_ARM_INTERWORKING
    1.34 -    bool
    1.35 -    prompt "Use Thumb-interworking (READ HELP)"
    1.36 -    default n
    1.37 -    depends on EXPERIMENTAL
    1.38 -    help
    1.39 -      Excerpt from the gcc manual:
    1.40 -      
    1.41 -      > Generate code which supports calling between the ARM and Thumb
    1.42 -      > instruction sets. Without this option the two instruction sets
    1.43 -      > cannot be reliably used inside one program. The default is
    1.44 -      > [not to use interwork], since slightly larger code is generated
    1.45 -      > when [interwork] is specified.
    1.46 -
    1.47 -config ARCH_ARM_EABI
    1.48 -    bool
    1.49 -    prompt "Use EABI"
    1.50 -    default y
    1.51 -    help
    1.52 -      Set up the toolchain so that it generates EABI-compliant binaries.
    1.53 -
    1.54 -config ARCH_ARM_ABI_OK
    1.55 -    bool
    1.56 -    default y
    1.57 -    depends on ! ARCH_ARM_EABI
    1.58 -    select ARCH_SUPPORT_ABI

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/config/arch/arm.in.2	Sat Sep 11 12:42:22 2010 +0200
     2.3 @@ -0,0 +1,53 @@
     2.4 +# ARM specific configuration file
     2.5 +
     2.6 +config ARCH_ARM_MODE
     2.7 +    string
     2.8 +    default "arm"   if ARCH_ARM_MODE_ARM
     2.9 +    default "thumb" if ARCH_ARM_MODE_THUMB
    2.10 +
    2.11 +choice
    2.12 +    bool
    2.13 +    prompt "Default instruction set mode"
    2.14 +    default ARCH_ARM_MODE_ARM
    2.15 +
    2.16 +config ARCH_ARM_MODE_ARM
    2.17 +    bool
    2.18 +    prompt "arm"
    2.19 +    help
    2.20 +      Defaults to emitting instructions in the ARM mode.
    2.21 +
    2.22 +config ARCH_ARM_MODE_THUMB
    2.23 +    bool
    2.24 +    prompt "thumb (EXPERIMENTAL)"
    2.25 +    depends on EXPERIMENTAL
    2.26 +    help
    2.27 +      Defaults to emitting instructions in the THUMB mode.
    2.28 +
    2.29 +endchoice
    2.30 +
    2.31 +config ARCH_ARM_INTERWORKING
    2.32 +    bool
    2.33 +    prompt "Use Thumb-interworking (READ HELP)"
    2.34 +    default n
    2.35 +    depends on EXPERIMENTAL
    2.36 +    help
    2.37 +      Excerpt from the gcc manual:
    2.38 +      
    2.39 +      > Generate code which supports calling between the ARM and Thumb
    2.40 +      > instruction sets. Without this option the two instruction sets
    2.41 +      > cannot be reliably used inside one program. The default is
    2.42 +      > [not to use interwork], since slightly larger code is generated
    2.43 +      > when [interwork] is specified.
    2.44 +
    2.45 +config ARCH_ARM_EABI
    2.46 +    bool
    2.47 +    prompt "Use EABI"
    2.48 +    default y
    2.49 +    help
    2.50 +      Set up the toolchain so that it generates EABI-compliant binaries.
    2.51 +
    2.52 +config ARCH_ARM_ABI_OK
    2.53 +    bool
    2.54 +    default y
    2.55 +    depends on ! ARCH_ARM_EABI
    2.56 +    select ARCH_SUPPORT_ABI