1.1 --- a/config/arch/ia64.in Thu Mar 26 18:47:34 2009 +0000
1.2 +++ b/config/arch/ia64.in Thu Mar 26 18:58:13 2009 +0000
1.3 @@ -1,5 +1,5 @@
1.4 # ia64 specific config options
1.5 -# EXPERIMENTAL
1.6 +# depends on EXPERIMENTAL
1.7
1.8 config ARCH_ia64
1.9 select ARCH_64
2.1 --- a/config/arch/powerpc64.in Thu Mar 26 18:47:34 2009 +0000
2.2 +++ b/config/arch/powerpc64.in Thu Mar 26 18:58:13 2009 +0000
2.3 @@ -1,5 +1,5 @@
2.4 # powerpc specific configuration file
2.5 -# EXPERIMENTAL
2.6 +# depends on EXPERIMENTAL
2.7
2.8 config ARCH_powerpc64
2.9 select ARCH_64
3.1 --- a/config/arch/sh.in Thu Mar 26 18:47:34 2009 +0000
3.2 +++ b/config/arch/sh.in Thu Mar 26 18:58:13 2009 +0000
3.3 @@ -1,5 +1,5 @@
3.4 # Super-H specific configuration file
3.5 -# EXPERIMENTAL
3.6 +# depends on EXPERIMENTAL
3.7
3.8 config ARCH_sh
3.9 select ARCH_SUPPORTS_BOTH_ENDIAN
4.1 --- a/config/config.mk Thu Mar 26 18:47:34 2009 +0000
4.2 +++ b/config/config.mk Thu Mar 26 18:58:13 2009 +0000
4.3 @@ -87,12 +87,10 @@
4.4 _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;'); \
4.5 echo "config $(3)_$${_entry}"; \
4.6 echo " bool"; \
4.7 - printf " prompt \"$${entry}"; \
4.8 - if $(grep) -E '^# +EXPERIMENTAL$$' $${file} >/dev/null 2>&1; then \
4.9 - echo " (EXPERIMENTAL)\""; \
4.10 - echo " depends on EXPERIMENTAL"; \
4.11 - else \
4.12 - echo "\""; \
4.13 + echo " prompt \"$${entry}\""; \
4.14 + dep_val=$$($(grep) -E '^# depends on ' $${file} 2>/dev/null); \
4.15 + if [ -n "$${dep_val}" ]; then \
4.16 + echo " $${dep_val#\# }"; \
4.17 fi; \
4.18 echo ""; \
4.19 done; \
4.20 @@ -134,12 +132,10 @@
4.21 _entry=$$(echo "$${entry}" |$(sed) -r -s -e 's/[-.+]/_/g;'); \
4.22 echo "menuconfig $(3)_$${_entry}"; \
4.23 echo " bool"; \
4.24 - printf " prompt \"$${entry}"; \
4.25 - if $(grep) -E '^# +EXPERIMENTAL$$' $${file} >/dev/null 2>&1; then \
4.26 - echo " (EXPERIMENTAL)\""; \
4.27 - echo " depends on EXPERIMENTAL"; \
4.28 - else \
4.29 - echo "\""; \
4.30 + echo " prompt \"$${entry}\""; \
4.31 + dep_val=$$($(grep) -E '^# depends on ' $${file} 2>/dev/null); \
4.32 + if [ -n "$${dep_val}" ]; then \
4.33 + echo " $${dep_val#\# }"; \
4.34 fi; \
4.35 echo "if $(3)_$${_entry}"; \
4.36 echo "source $${file}"; \
5.1 --- a/config/debug/gdb.in Thu Mar 26 18:47:34 2009 +0000
5.2 +++ b/config/debug/gdb.in Thu Mar 26 18:58:13 2009 +0000
5.3 @@ -87,6 +87,11 @@
5.4 In case you have trouble with dynamic loading of shared libraries,
5.5 you will find that a static gdbserver comes in handy.
5.6
5.7 +if BARE_METAL
5.8 +comment "In bare-metal, you'll need to "
5.9 +comment "provide your own gdbserver stub."
5.10 +endif # BARE_METAL
5.11 +
5.12 choice
5.13 bool
5.14 prompt "gdb version"
6.1 --- a/config/libc.in Thu Mar 26 18:47:34 2009 +0000
6.2 +++ b/config/libc.in Thu Mar 26 18:58:13 2009 +0000
6.3 @@ -4,8 +4,6 @@
6.4 string
6.5 default "none" if BARE_METAL
6.6
6.7 -if ! BARE_METAL
6.8 -
6.9 menu "C-library"
6.10
6.11 config LIBC_VERSION
6.12 @@ -64,5 +62,3 @@
6.13 endchoice
6.14
6.15 endmenu
6.16 -
6.17 -endif # ! BARE_METAL
7.1 --- a/config/libc/eglibc.in Thu Mar 26 18:47:34 2009 +0000
7.2 +++ b/config/libc/eglibc.in Thu Mar 26 18:58:13 2009 +0000
7.3 @@ -1,5 +1,5 @@
7.4 -# EXPERIMENTAL
7.5 # eglibc options
7.6 +# depends on EXPERIMENTAL && ! BARE_METAL
7.7
7.8 config LIBC_eglibc
7.9 select LIBC_SUPPORT_NPTL
8.1 --- a/config/libc/glibc.in Thu Mar 26 18:47:34 2009 +0000
8.2 +++ b/config/libc/glibc.in Thu Mar 26 18:58:13 2009 +0000
8.3 @@ -1,4 +1,5 @@
8.4 # glibc options
8.5 +# depends on ! BARE_METAL
8.6
8.7 config LIBC_glibc
8.8 select LIBC_SUPPORT_NPTL
9.1 --- a/config/libc/uClibc.in Thu Mar 26 18:47:34 2009 +0000
9.2 +++ b/config/libc/uClibc.in Thu Mar 26 18:58:13 2009 +0000
9.3 @@ -1,4 +1,5 @@
9.4 # uClibc options
9.5 +# depends on ! BARE_METAL
9.6
9.7 config LIBC_uClibc
9.8 select LIBC_SUPPORT_LINUXTHREADS
10.1 --- a/scripts/build/cc/gcc.sh Thu Mar 26 18:47:34 2009 +0000
10.2 +++ b/scripts/build/cc/gcc.sh Thu Mar 26 18:58:13 2009 +0000
10.3 @@ -228,6 +228,10 @@
10.4 CT_DoLog EXTRA "Installing ${mode} core C compiler"
10.5 CT_DoExecLog ALL make ${install_rules}
10.6
10.7 + # Create a symlink ${CT_TARGET}-cc to ${CT_TARGET}-gcc to always be able
10.8 + # to call the C compiler with the same, somewhat canonical name.
10.9 + CT_DoExecLog ALL ln -sv "${CT_TARGET}"-gcc "${core_prefix_dir}/bin/${CT_TARGET}"-cc
10.10 +
10.11 CT_EndStep
10.12 }
10.13