summaryrefslogtreecommitdiff
path: root/libc/misc/internals
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-12-11 00:25:23 +0000
committerMike Frysinger <vapier@gentoo.org>2006-12-11 00:25:23 +0000
commite1d59aed553bce7018873da60c712d711d080f8d (patch)
treeed414ae1fdbf5030ceb79f179b163aa2acb1619a /libc/misc/internals
parent5b896451eea5183f6404d68656038299108ffc60 (diff)
create new menu so people can select what format they wish to build uClibc
Diffstat (limited to 'libc/misc/internals')
-rw-r--r--libc/misc/internals/Makefile.in2
-rw-r--r--libc/misc/internals/__uClibc_main.c16
2 files changed, 9 insertions, 9 deletions
diff --git a/libc/misc/internals/Makefile.in b/libc/misc/internals/Makefile.in
index af97b39af..b9f970876 100644
--- a/libc/misc/internals/Makefile.in
+++ b/libc/misc/internals/Makefile.in
@@ -18,7 +18,7 @@ MISC_INTERNALS_OBJ := $(patsubst %.c,$(MISC_INTERNALS_OUT)/%.o,$(CSRC))
libc-y += $(MISC_INTERNALS_OBJ)
libc-shared-y += $(MISC_INTERNALS_OUT)/__uClibc_main.oS
libc-static-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o
-libc-static-$(HAVE_SHARED_FLAT) += \
+libc-static-$(UCLIBC_FORMAT_SHARED_FLAT) += \
$(MISC_INTERNALS_OUT)/shared_flat_initfini.o \
$(MISC_INTERNALS_OUT)/shared_flat_add_library.o
libc-nomulti-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index a2fbf6c89..50f3c5cae 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -88,9 +88,9 @@ extern void weak_function _locale_init(void) attribute_hidden;
extern void weak_function __pthread_initialize_minimal(void);
#endif
-/* If __HAVE_SHARED_FLAT__, all array initialisation and finalisation
+/* If __UCLIBC_FORMAT_SHARED_FLAT__, all array initialisation and finalisation
* is handled by the routines passed to __uClibc_main(). */
-#if defined (__UCLIBC_CTOR_DTOR__) && !defined (__HAVE_SHARED_FLAT__)
+#if defined (__UCLIBC_CTOR_DTOR__) && !defined (__UCLIBC_FORMAT_SHARED_FLAT__)
extern void _dl_app_init_array(void);
extern void _dl_app_fini_array(void);
# ifndef SHARED
@@ -249,11 +249,11 @@ libc_hidden_proto(__uClibc_fini)
void __uClibc_fini(void)
{
#ifdef __UCLIBC_CTOR_DTOR__
- /* If __HAVE_SHARED_FLAT__, all array finalisation is handled
+ /* If __UCLIBC_FORMAT_SHARED_FLAT__, all array finalisation is handled
* by __app_fini. */
# ifdef SHARED
_dl_app_fini_array();
-# elif !defined (__HAVE_SHARED_FLAT__)
+# elif !defined (__UCLIBC_FORMAT_SHARED_FLAT__)
size_t i = __fini_array_end - __fini_array_start;
while (i-- > 0)
(*__fini_array_start [i]) ();
@@ -352,9 +352,9 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc,
/* Arrange for the application's dtors to run before we exit. */
__app_fini = app_fini;
- /* If __HAVE_SHARED_FLAT__, all array initialisation is handled
+ /* If __UCLIBC_FORMAT_SHARED_FLAT__, all array initialisation is handled
* by __app_init. */
-# if !defined (SHARED) && !defined (__HAVE_SHARED_FLAT__)
+# if !defined (SHARED) && !defined (__UCLIBC_FORMAT_SHARED_FLAT__)
/* For dynamically linked executables the preinit array is executed by
the dynamic linker (before initializing any shared object).
For static executables, preinit happens rights before init. */
@@ -369,11 +369,11 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc,
if (app_init!=NULL) {
app_init();
}
- /* If __HAVE_SHARED_FLAT__, all array initialisation is handled
+ /* If __UCLIBC_FORMAT_SHARED_FLAT__, all array initialisation is handled
* by __app_init. */
# ifdef SHARED
_dl_app_init_array();
-# elif !defined (__HAVE_SHARED_FLAT__)
+# elif !defined (__UCLIBC_FORMAT_SHARED_FLAT__)
{
const size_t size = __init_array_end - __init_array_start;
size_t i;