Changeset 2807

Timestamp:

Sep 2, 2006, 8:08:34 AM (19 years ago)

Author:

bird

Message:

some init code.

Location:

trunk/libc

Files:

• Makefile.kmk (modified) (2 diffs)
• include/emx/startup.h (modified) (3 diffs)
• src/libc/startup/nt (added)
• src/libc/startup/nt/x86 (added)
• src/libc/startup/nt/x86/crt0.s (added)

trunk/libc/Makefile.kmk

@@ -266 +266 @@
 startupobjs_TEMPLATE = usr.lib
 startupobjs_SOURCES :=
+ifeq ($(BUILD_TARGET),os2)
 define def_startup
 $(PATH_TARGET)/crt0$(i).o: src/libc/startup/os2/x86/crt0.s | $(call DIRDEP,$(PATH_TARGET))
@@ -345 +346 @@
 resp \
 ,$(eval $(def_startup)))
+endif # os2
+
+ifeq ($(BUILD_TARGET),nt)
+startupobjs_SOURCES += $(PATH_TARGET)/crt0.o
+$(PATH_TARGET)/crt0.o: src/libc/startup/nt/x86/crt0.s
+        $(RM) -f $@
+        gcc -c -Iinclude -x assembler-with-cpp \
+                -o $@ \
+                $<
+endif
 
 # binmode

trunk/libc/include/emx/startup.h

@@ -20 +20 @@
  * @{
  */
+#ifdef __OS2__
 /** Array of CRT init functions. */
 extern int __crtinit1__;
@@ -32 +33 @@
 /** Array of destructors. */
 extern int __DTOR_LIST__;
+
+#elif defined(__NT__)
+/** Array of CRT init functions. */
+extern int __crtinit1__;
+/** Array of CRT exit functions. */
+extern int __crtexit1__;
+#endif
 /** @} */
 
@@ -43 +51 @@
 #define _ARG_NONZERO  0x80          /* Always set, to avoid end of string   */
 
-/* Arrange that FUN will be called by _CRT_init(). */
+/** @def _CRT_INIT1
+ * Arrange that FUN will be called by _CRT_init(). */
+/** @def _CRT_TERM1
+ * Arrange that FUN will be called by _CRT_term(). */
+#ifdef __OS2__
+# define _CRT_INIT1(fun) __asm__ (".stabs \"___crtinit1__\", 23, 0, 0, _" #fun);
+# define _CRT_EXIT1(fun) __asm__ (".stabs \"___crtexit1__\", 23, 0, 0, _" #fun);
+#elif defined(__NT__)
+# define _CRT_INIT1(fun) void *__crtinit1__##fun##__  __attribute__((__section__("crtinit1"))) = (void *)fun;
+# define _CRT_EXIT1(fun) void *__crtexit1__##fun##__  __attribute__((__section__("crtexit1"))) = (void *)fun;
+#else
+# error "port me"
+#endif
 
-#define _CRT_INIT1(fun) __asm__ (".stabs \"___crtinit1__\", 23, 0, 0, _" #fun);
 
-/* Arrange that FUN will be called by _CRT_term(). */
-
-#define _CRT_EXIT1(fun) __asm__ (".stabs \"___crtexit1__\", 23, 0, 0, _" #fun);
 
 extern char ** _org_environ;