Unify core passes

With libc_headers step before pass-1, there is no need to distinguish
pass-1 and pass-2; they are configured identically (note that with the
current configuration, core pass-2 is only used for win32 - hence, uses
build_libgcc=yes and mode=static).

Signed-off-by: Alexey Neyman <stilor@att.net>

8 files changed, 8 insertions, 11 deletions

diff --git a/config/cc.in b/config/cc.in
index 0890cc20..3a168055 100644
--- a/config/cc.in
+++ b/config/cc.in
@@ -2,10 +2,7 @@
 
 menu "C compiler"
 
-config CC_CORE_PASS_1_NEEDED
-    bool
-
-config CC_CORE_PASS_2_NEEDED
+config CC_CORE_NEEDED
     bool
 
 config CC_SUPPORT_CXX
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 742d563f..a708bb82 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -55,7 +55,7 @@ config CC_GCC_ENABLE_CXX_FLAGS
 config CC_GCC_CORE_EXTRA_CONFIG_ARRAY
     string "Core gcc extra config"
     default ""
-    depends on CC_CORE_PASS_1_NEEDED || CC_CORE_PASS_2_NEEDED
+    depends on CC_CORE_NEEDED
     help
       Extra flags to pass onto ./configure when configuring the core gcc.
       
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 39c2c20b..3da38bdb 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -3,7 +3,7 @@
 
 ## depends on ! WINDOWS && ! BARE_METAL && ARCH_USE_MMU
 ## select LIBC_SUPPORT_THREADS_NATIVE
-## select CC_CORE_PASS_1_NEEDED
+## select CC_CORE_NEEDED
 # TBD: select GETTEXT for build only, not for host
 ## select GETTEXT_NEEDED
 ## select BINUTILS_FORCE_LD_BFD_DEFAULT
diff --git a/config/libc/mingw-w64.in b/config/libc/mingw-w64.in
index 1880f082..2531fef7 100644
--- a/config/libc/mingw-w64.in
+++ b/config/libc/mingw-w64.in
@@ -4,7 +4,7 @@
 ##
 ## select LIBC_SUPPORT_THREADS_NATIVE
 ## select LIBC_SUPPORT_THREADS_POSIX
-## select CC_CORE_PASS_2_NEEDED
+## select CC_CORE_NEEDED
 ## select BINUTILS_FORCE_LD_BFD_DEFAULT
 ##
 ## help The de-facto standard for Mingw distributions.
diff --git a/config/libc/moxiebox.in b/config/libc/moxiebox.in
index aa6ff534..07fc3335 100644
--- a/config/libc/moxiebox.in
+++ b/config/libc/moxiebox.in
@@ -10,7 +10,7 @@
 ## select LIBC_SUPPORT_THREADS_NONE
 ## select COMP_TOOLS_AUTOCONF if !CONFIGURE_has_autoconf_2_65_or_newer || !CONFIGURE_has_autoreconf_2_64_or_newer
 ## select COMP_TOOLS_AUTOMAKE if !CONFIGURE_has_automake_1_15_or_newer
-## select CC_CORE_PASS_1_NEEDED
+## select CC_CORE_NEEDED
 ## select LIBELF_NEEDED
 ##
 ## help Secure execution runtime for Moxie architecture.
diff --git a/config/libc/musl.in b/config/libc/musl.in
index 0ea388e4..db7abb7a 100644
--- a/config/libc/musl.in
+++ b/config/libc/musl.in
@@ -3,7 +3,7 @@
 ## depends on ! WINDOWS && ! BARE_METAL
 ## depends on EXPERIMENTAL
 ## select LIBC_SUPPORT_THREADS_NATIVE
-## select CC_CORE_PASS_1_NEEDED
+## select CC_CORE_NEEDED
 
 ## help Musl is a new standard library to power a new generation of Linux-based
 ## help devices. musl is lightweight, fast, simple, free, and strives to be
diff --git a/config/libc/newlib.in b/config/libc/newlib.in
index 83ae4b15..f1cb29be 100644
--- a/config/libc/newlib.in
+++ b/config/libc/newlib.in
@@ -3,7 +3,7 @@
 ## depends on BARE_METAL
 ## select LIBC_PROVIDES_CXA_ATEXIT
 ## select LIBC_SUPPORT_THREADS_NONE
-## select CC_CORE_PASS_1_NEEDED
+## select CC_CORE_NEEDED
 
 ## help Newlib is a C library intended for use on embedded systems. It is a
 ## help conglomeration of several library parts, all under free software
diff --git a/config/libc/uClibc-ng.in b/config/libc/uClibc-ng.in
index 705c0d46..dc83ca7e 100644
--- a/config/libc/uClibc-ng.in
+++ b/config/libc/uClibc-ng.in
@@ -5,7 +5,7 @@
 ## select LIBC_SUPPORT_THREADS_LT
 ## select LIBC_SUPPORT_THREADS_NONE
 ## select LIBC_SUPPORT_THREADS_NATIVE
-## select CC_CORE_PASS_1_NEEDED
+## select CC_CORE_NEEDED
 ##
 ## help The de-facto standard for embeded linux systems.
 ## help