summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-03-13 23:43:02 +0000
committerEric Andersen <andersen@codepoet.org>2002-03-13 23:43:02 +0000
commit9121e41f4629b82bf628456b10ab211f5c1e33aa (patch)
tree0a2d539b21952992d899925978a55aa110c4e3b6
parent94e5ab630be58fa6d008fbfa735492bd6ce2a568 (diff)
Build our own crti.o and crtn.o with a cross arch method that I
can live with much better the what glibc does. -Erik
-rwxr-xr-xextra/scripts/initfini.pl140
-rw-r--r--libc/Makefile4
-rw-r--r--libc/sysdeps/linux/arm/Makefile2
-rw-r--r--libc/sysdeps/linux/common/.cvsignore3
-rw-r--r--libc/sysdeps/linux/common/Makefile18
-rw-r--r--libc/sysdeps/linux/common/initfini.c134
-rw-r--r--libc/sysdeps/linux/h8300/Makefile2
-rw-r--r--libc/sysdeps/linux/i386/Makefile2
-rw-r--r--libc/sysdeps/linux/m68k/Makefile2
-rw-r--r--libc/sysdeps/linux/mips/Makefile2
-rw-r--r--libc/sysdeps/linux/powerpc/Makefile2
-rw-r--r--libc/sysdeps/linux/sh/Makefile2
-rw-r--r--libc/sysdeps/linux/sparc/Makefile2
-rw-r--r--libc/sysdeps/linux/v850/Makefile2
14 files changed, 304 insertions, 13 deletions
diff --git a/extra/scripts/initfini.pl b/extra/scripts/initfini.pl
new file mode 100755
index 000000000..9a5c3ba09
--- /dev/null
+++ b/extra/scripts/initfini.pl
@@ -0,0 +1,140 @@
+#!/usr/bin/perl
+
+use strict;
+use Getopt::Long;
+
+my($initfini) = "initfini.s";
+my($crti) = "crti.S";
+my($crtn) = "crtn.S";
+my($alignval) = "";
+my($endp) = 0;
+my($end) = 0;
+my($omitcrti) = 0;
+my($omitcrtn) = 0;
+my($line);
+
+# Get commandline parameters
+Getopt::Long::Configure("no_ignore_case", "bundling");
+&GetOptions( "initfini=s" => \$initfini,
+ "crti=s" => \$crti,
+ "crtn=s" => \$crtn,
+ );
+
+chomp($initfini);
+chomp($crti);
+chomp($crtn);
+
+
+if ($initfini) {
+ open(INITFINI,"<$initfini") or
+ die "(fatal) Can't open $initfini$!";
+} else {
+ die "(fatal) Please give me an --initfini argument$!";
+}
+while($line = <INITFINI>) {
+ if ($line =~ /^\w\.endp/) {
+ $endp=1;
+ next;
+ }
+ if ($line =~ /^\w\.end/) {
+ $end=1;
+ next;
+ }
+ if ($line =~ /\w\.align\(.*\)/) {
+ $alignval=$1;
+ next;
+ }
+}
+close(INITFINI);
+
+
+
+
+
+if ($initfini) {
+ open(INITFINI,"<$initfini") or
+ die "(fatal) Can't open $initfini$!";
+} else {
+ die "(fatal) Please give me an --initfini argument$!";
+}
+
+if ($crti) {
+ open(CRTI,">$crti") or
+ die "(fatal) Can't open $crti$!";
+} else {
+ die "(fatal) Please give me a --asm argument$!";
+}
+if ($crtn) {
+ open(CRTN,">$crtn") or
+ die "(fatal) Can't open $crtn$!";
+} else {
+ die "(fatal) Please give me a --asm argument$!";
+}
+
+while(<INITFINI>) {
+ if (/HEADER_ENDS/) {
+ $omitcrti = 1;
+ $omitcrtn = 1;
+ next;
+ }
+ if (/PROLOG_BEGINS/) {
+ $omitcrti = 0;
+ next;
+ }
+ if (/PROLOG_ENDS/) {
+ $omitcrti = 1;
+ next;
+ }
+ if (/EPILOG_BEGINS/) {
+ $omitcrtn = 0;
+ next;
+ }
+ if (/EPILOG_ENDS/) {
+ $omitcrtn = 1;
+ next;
+ }
+ if (/TRAILER_BEGINS/) {
+ $omitcrti = 0;
+ $omitcrtn = 0;
+ next;
+ }
+ if (/END_INIT/) {
+ if ($endp) {
+ s/END_INIT/.endp _init/;
+ } else {
+ if($end) {
+ s/END_INIT/.end _init/;
+ } else {
+ s/END_INIT//;
+ }
+ }
+ }
+ if (/END_FINI/) {
+ if ($endp) {
+ s/END_FINI/.endp _fini/;
+ } else {
+ if($end) {
+ s/END_FINI/.end _fini/;
+ } else {
+ s/END_FINI//;
+ }
+ }
+ }
+ if (/ALIGN/) {
+ if($alignval) {
+ s/ALIGN/.align $alignval/;
+ } else {
+ s/ALIGN//;
+ }
+ }
+ if (!$omitcrti) {
+ print CRTI;
+ }
+ if (!$omitcrtn) {
+ print CRTN;
+ }
+}
+close(INITFINI);
+close(CRTI);
+close(CRTN);
+
diff --git a/libc/Makefile b/libc/Makefile
index a393b6d9f..a4cb61396 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -38,7 +38,7 @@ $(LIBNAME): subdirs
$(CROSS)ranlib $(LIBNAME)
install -d $(TOPDIR)lib
rm -f $(TOPDIR)lib/$(LIBNAME)
- install -m 644 crt0.o $(LIBNAME) $(TOPDIR)lib
+ install -m 644 $(LIBNAME) $(TOPDIR)lib
shared: $(TOPDIR)lib/$(LIBNAME)
@rm -rf tmp
@@ -58,7 +58,7 @@ shared: $(TOPDIR)lib/$(LIBNAME)
halfclean:
- @rm -f $(LIBNAME) crt0.o uClibc_config.h
+ @rm -f $(LIBNAME) uClibc_config.h
@rm -f $(SHARED_FULLNAME) $(SHARED_MAJORNAME) uClibc-0.* libc.so*
tags:
diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile
index a4a4a720c..c5a96dea8 100644
--- a/libc/sysdeps/linux/arm/Makefile
+++ b/libc/sysdeps/linux/arm/Makefile
@@ -45,7 +45,7 @@ $(LIBC): ar-target
ar-target: $(OBJS) $(CRT0_OBJ)
$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
- cp $(CRT0_OBJ) $(TOPDIR)libc/$(CRT0_OBJ)
+ cp $(CRT0_OBJ) $(TOPDIR)lib/$(CRT0_OBJ)
$(CRT0_OBJ): $(CRT0)
$(CC) $(CFLAGS) -c $< -o $@
diff --git a/libc/sysdeps/linux/common/.cvsignore b/libc/sysdeps/linux/common/.cvsignore
new file mode 100644
index 000000000..2afad25b2
--- /dev/null
+++ b/libc/sysdeps/linux/common/.cvsignore
@@ -0,0 +1,3 @@
+crti.S
+crtn.S
+initfini.s
diff --git a/libc/sysdeps/linux/common/Makefile b/libc/sysdeps/linux/common/Makefile
index 8b23a5fad..009d0740d 100644
--- a/libc/sysdeps/linux/common/Makefile
+++ b/libc/sysdeps/linux/common/Makefile
@@ -42,7 +42,7 @@ all: $(STR_SYSCALLS) $(OBJ) $(LIBC)
$(LIBC): ar-target
-ar-target: $(OBJ)
+ar-target: $(OBJ) crti.o crtn.o
$(AR) $(ARFLAGS) $(LIBC) $(OBJ)
$(MOBJ): $(MSRC)
@@ -53,6 +53,20 @@ $(COBJS): %.o : %.c
$(CC) $(CFLAGS) -c $< -o $@
$(STRIPTOOL) -x -R .note -R .comment $*.o
+initfini.s: initfini.c
+ $(CC) $(CFLAGS) -c initfini.c -S -o initfini.s
+
+crti.S crtn.S: initfini.s
+ $(TOPDIR)/extra/scripts/initfini.pl
+
+crti.o: crti.S
+ $(CC) $(CFLAGS) -c crti.S -o crti.o
+ cp crti.o $(TOPDIR)lib/
+
+crtn.o: crtn.S
+ $(CC) $(CFLAGS) -c crtn.S -o crtn.o
+ cp crtn.o $(TOPDIR)lib/
+
clean:
- rm -f *.[oa] *~ core
+ rm -f *.[oa] *~ core crti.* crtn.* initfini.s
diff --git a/libc/sysdeps/linux/common/initfini.c b/libc/sysdeps/linux/common/initfini.c
new file mode 100644
index 000000000..147de8748
--- /dev/null
+++ b/libc/sysdeps/linux/common/initfini.c
@@ -0,0 +1,134 @@
+/* Special .init and .fini section support.
+ Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ In addition to the permissions in the GNU Lesser General Public
+ License, the Free Software Foundation gives you unlimited
+ permission to link the compiled version of this file with other
+ programs, and to distribute those programs without any restriction
+ coming from the use of this file. (The GNU Lesser General Public
+ License restrictions do apply in other respects; for example, they
+ cover modification of the file, and distribution when not linked
+ into another program.)
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+/* This file is compiled into assembly code which is then munged by a sed
+ script into two files: crti.s and crtn.s.
+
+ * crti.s puts a function prologue at the beginning of the
+ .init and .fini sections and defines global symbols for
+ those addresses, so they can be called as functions.
+
+ * crtn.s puts the corresponding function epilogues
+ in the .init and .fini sections. */
+
+#include <stdlib.h>
+
+#undef GMON_SUPPORT
+
+/* We use embedded asm for .section unconditionally, as this makes it
+ easier to insert the necessary directives into crtn.S. */
+#define SECTION(x) asm (".section " x )
+
+/* The initial common code ends here. */
+asm ("\n/*@HEADER_ENDS*/");
+
+/* To determine whether we need .end and .align: */
+//asm ("\n/*@TESTS_BEGIN*/");
+extern void dummy (void (*foo) (void));
+void
+dummy (void (*foo) (void))
+{
+ if (foo)
+ (*foo) ();
+}
+//asm ("\n/*@TESTS_END*/");
+
+/* The beginning of _init: */
+asm ("\n/*@_init_PROLOG_BEGINS*/");
+
+#ifdef GMON_SUPPORT
+static void
+call_gmon_start(void)
+{
+ extern void __gmon_start__ (void) __attribute__ ((weak)); /*weak_extern (__gmon_start__);*/
+ void (*gmon_start) (void) = __gmon_start__;
+
+ if (gmon_start)
+ gmon_start ();
+}
+#endif
+
+SECTION (".init");
+extern void _init (void);
+void
+_init (void)
+{
+#ifdef GMON_SUPPORT
+ /* We cannot use the normal constructor mechanism in gcrt1.o because it
+ appears before crtbegin.o in the link, so the header elt of .ctors
+ would come after the elt for __gmon_start__. One approach is for
+ gcrt1.o to reference a symbol which would be defined by some library
+ module which has a constructor; but then user code's constructors
+ would come first, and not be profiled. */
+ call_gmon_start ();
+#endif
+
+ asm ("ALIGN");
+ asm("END_INIT");
+ /* Now the epilog. */
+ asm ("\n/*@_init_PROLOG_ENDS*/");
+ asm ("\n/*@_init_EPILOG_BEGINS*/");
+ SECTION(".init");
+}
+asm ("END_INIT");
+
+/* End of the _init epilog, beginning of the _fini prolog. */
+asm ("\n/*@_init_EPILOG_ENDS*/");
+asm ("\n/*@_fini_PROLOG_BEGINS*/");
+
+SECTION (".fini");
+extern void _fini (void);
+void
+_fini (void)
+{
+
+ /* End of the _fini prolog. */
+ asm ("ALIGN");
+ asm ("END_FINI");
+ asm ("\n/*@_fini_PROLOG_ENDS*/");
+
+ {
+ /* Let GCC know that _fini is not a leaf function by having a dummy
+ function call here. We arrange for this call to be omitted from
+ either crt file. */
+ extern void i_am_not_a_leaf (void);
+ i_am_not_a_leaf ();
+ }
+
+ /* Beginning of the _fini epilog. */
+ asm ("\n/*@_fini_EPILOG_BEGINS*/");
+ SECTION (".fini");
+}
+asm ("END_FINI");
+
+/* End of the _fini epilog. Any further generated assembly (e.g. .ident)
+ is shared between both crt files. */
+asm ("\n/*@_fini_EPILOG_ENDS*/");
+asm ("\n/*@TRAILER_BEGINS*/");
+
+/* End of file. */
diff --git a/libc/sysdeps/linux/h8300/Makefile b/libc/sysdeps/linux/h8300/Makefile
index d6c7a8a1a..68093e132 100644
--- a/libc/sysdeps/linux/h8300/Makefile
+++ b/libc/sysdeps/linux/h8300/Makefile
@@ -45,7 +45,7 @@ $(LIBC): ar-target
ar-target: $(OBJS) $(CRT0_OBJ)
$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
- cp $(CRT0_OBJ) $(TOPDIR)libc/$(CRT0_OBJ)
+ cp $(CRT0_OBJ) $(TOPDIR)lib/$(CRT0_OBJ)
$(CRT0_OBJ): %.o : %.S
$(CC) $(CFLAGS) -c $< -o $@
diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile
index cda41533a..c15751ee1 100644
--- a/libc/sysdeps/linux/i386/Makefile
+++ b/libc/sysdeps/linux/i386/Makefile
@@ -54,7 +54,7 @@ $(LIBC): ar-target
ar-target: $(OBJS) $(CRT0_OBJ)
$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
- cp $(CRT0_OBJ) $(TOPDIR)libc/$(CRT0_OBJ)
+ cp $(CRT0_OBJ) $(TOPDIR)lib/$(CRT0_OBJ)
ifeq ($(USE_CRT0_C),true)
$(CRT0_OBJ): %.o : %.c
diff --git a/libc/sysdeps/linux/m68k/Makefile b/libc/sysdeps/linux/m68k/Makefile
index b8abb2a09..5954b8df4 100644
--- a/libc/sysdeps/linux/m68k/Makefile
+++ b/libc/sysdeps/linux/m68k/Makefile
@@ -52,7 +52,7 @@ $(LIBC): ar-target
ar-target: $(OBJS) $(CRT0_OBJ)
$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
- cp $(CRT0_OBJ) $(TOPDIR)libc/$(CRT0_OBJ)
+ cp $(CRT0_OBJ) $(TOPDIR)lib/$(CRT0_OBJ)
ifeq ($(HAS_MMU),true)
$(CRT0_OBJ): %.o : %.c
diff --git a/libc/sysdeps/linux/mips/Makefile b/libc/sysdeps/linux/mips/Makefile
index 91d81c305..175271c9e 100644
--- a/libc/sysdeps/linux/mips/Makefile
+++ b/libc/sysdeps/linux/mips/Makefile
@@ -45,7 +45,7 @@ $(LIBC): ar-target
ar-target: $(OBJS) $(CRT0_OBJ)
$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
- cp $(CRT0_OBJ) $(TOPDIR)libc
+ cp $(CRT0_OBJ) $(TOPDIR)lib/
$(CRT0_OBJ): %.o : %.S
diff --git a/libc/sysdeps/linux/powerpc/Makefile b/libc/sysdeps/linux/powerpc/Makefile
index 83b70d5a2..a351fe1f9 100644
--- a/libc/sysdeps/linux/powerpc/Makefile
+++ b/libc/sysdeps/linux/powerpc/Makefile
@@ -52,7 +52,7 @@ $(LIBC): ar-target
ar-target: $(OBJS) $(CRT0_OBJ)
$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
- cp $(CRT0_OBJ) $(TOPDIR)libc
+ cp $(CRT0_OBJ) $(TOPDIR)lib/
ifeq ($(USE_CRT0_C),y)
diff --git a/libc/sysdeps/linux/sh/Makefile b/libc/sysdeps/linux/sh/Makefile
index 87fbbbfcd..6ff7f87e3 100644
--- a/libc/sysdeps/linux/sh/Makefile
+++ b/libc/sysdeps/linux/sh/Makefile
@@ -47,7 +47,7 @@ $(LIBC): ar-target
ar-target: $(OBJS) $(CRT0_OBJ)
$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
- cp $(CRT0_OBJ) $(TOPDIR)libc/$(CRT0_OBJ)
+ cp $(CRT0_OBJ) $(TOPDIR)lib/$(CRT0_OBJ)
$(CRT0_OBJ): %.o : %.S
$(CC) $(SFLAGS) -c $< -o $@
diff --git a/libc/sysdeps/linux/sparc/Makefile b/libc/sysdeps/linux/sparc/Makefile
index 150a421ac..d57e1ea5e 100644
--- a/libc/sysdeps/linux/sparc/Makefile
+++ b/libc/sysdeps/linux/sparc/Makefile
@@ -45,7 +45,7 @@ $(LIBC): ar-target
ar-target: $(OBJS) $(CRT0_OBJ)
$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
- cp $(CRT0_OBJ) $(TOPDIR)libc/$(CRT0_OBJ)
+ cp $(CRT0_OBJ) $(TOPDIR)lib/$(CRT0_OBJ)
$(CRT0_OBJ): %.o : %.c
$(CC) $(CFLAGS) -c $< -o $@
diff --git a/libc/sysdeps/linux/v850/Makefile b/libc/sysdeps/linux/v850/Makefile
index bed12d8d9..8ef679b92 100644
--- a/libc/sysdeps/linux/v850/Makefile
+++ b/libc/sysdeps/linux/v850/Makefile
@@ -48,7 +48,7 @@ $(LIBC): ar-target
ar-target: $(OBJS) $(CRT0_OBJ)
$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
- cp $(CRT0_OBJ) $(TOPDIR)libc/$(CRT0_OBJ)
+ cp $(CRT0_OBJ) $(TOPDIR)lib/$(CRT0_OBJ)
$(CRT0_OBJ): %.o : %.S
$(CC) $(SFLAGS) -c $< -o $@