(CFLAGS-initfini.s): Correctly fix moving function definition.

[kopensolaris-gnu/glibc.git] / csu / Makefile

diff --git a/csu/Makefile b/csu/Makefile
index fdeaee0..cb9e6eb 100644 (file)
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -1,6 +1,6 @@
 # Makefile for csu code for GNU C library.
 
 # Makefile for csu code for GNU C library.
 

-# Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997 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
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or


@@ -14,9 +14,9 @@
 # Library General Public License for more details.
 
 # You should have received a copy of the GNU Library General Public
 # Library General Public License for more details.
 
 # You should have received a copy of the GNU Library General Public

-# License along with the GNU C Library; see the file COPYING.LIB.  If
-# not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-# Cambridge, MA 02139, USA.
+# License along with the GNU C Library; see the file COPYING.LIB.  If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.

 
 # This directory contains the C startup code (that which calls main).  This
 # consists of the startfile, built from start.c and installed as crt0.o
 
 # This directory contains the C startup code (that which calls main).  This
 # consists of the startfile, built from start.c and installed as crt0.o


@@ -27,6 +27,7 @@
 
 subdir := csu
 
 
 subdir := csu
 

+routines = init-first

 csu-dummies = $(filter-out $(start-installed-name),crt1.o Mcrt1.o)
 extra-objs = start.o gmon-start.o \
             $(start-installed-name) g$(start-installed-name) \
 csu-dummies = $(filter-out $(start-installed-name),crt1.o Mcrt1.o)
 extra-objs = start.o gmon-start.o \
             $(start-installed-name) g$(start-installed-name) \


@@ -35,27 +36,17 @@ omit-deps = $(patsubst %.o,%,$(start-installed-name) g$(start-installed-name) \
                             $(csu-dummies))
 install-lib = $(start-installed-name) g$(start-installed-name) \
              $(csu-dummies)
                             $(csu-dummies))
 install-lib = $(start-installed-name) g$(start-installed-name) \
              $(csu-dummies)

-distribute = initfini.c gmon-start.c start.c
+distribute = initfini.c gmon-start.c start.c defs.awk abi-note.S

 
 all: # Make this the default target; it will be defined in Rules.
 
 include ../Makeconfig
 
 
 all: # Make this the default target; it will be defined in Rules.
 
 include ../Makeconfig
 

-ifneq ($(elf),yes)
-
-# When not using ELF, there is just one startfile, called crt0.o.
-start-installed-name = crt0.o
-
-else
-
-# In the ELF universe, crt0.o is called crt1.o, and there are
-# some additional bizarre files.
-start-installed-name = crt1.o
-have-initfini = yes
-
+ifeq ($(elf),yes)
+before-compile = $(objpfx)abi-tag.h

 endif
 
 endif
 

-ifeq (yes,$(have-initfini))
+ifeq ($(have-initfini),yes)

 
 CPPFLAGS += -DHAVE_INITFINI
 
 
 CPPFLAGS += -DHAVE_INITFINI
 


@@ -66,45 +57,69 @@ crtstuff = crti crtn
 
 install-lib += $(crtstuff:=.o)
 extra-objs += $(crtstuff:=.o)
 
 install-lib += $(crtstuff:=.o)
 extra-objs += $(crtstuff:=.o)

-generated += $(crtstuff:=.s)
+generated += $(crtstuff:=.S) initfini.s defs.h

 omit-deps += $(crtstuff)
 
 omit-deps += $(crtstuff)
 

-# Compile initfini.c to assembly code, which contains embedded shell
-# commands that prodice crti.s-new and crtn.s-new when run.  We need to
-# disable emission of .size directives and debugging information, since
-# they will get confused by the splitting of the output we do.
-$(objpfx)cr%i.s $(objpfx)cr%n.s: initfini.c; $(initfini)
-
-define initfini
--rm -f $(objpfx)crtcommon.tmp
-(echo 'cat > crtcommon.tmp <<\EOF_common'; \
- $(CC) $< $(CPPFLAGS) $(CFLAGS) \
-       -fPIC -finhibit-size-directive -g0 -S -o -; \
- echo 'EOF_common') | (cd $(@D); $(SHELL))
-cat $(objpfx)crtcommon.tmp >> $(objpfx)crti.s-new
-cat $(objpfx)crtcommon.tmp >> $(objpfx)crtn.s-new
-rm -f $(objpfx)crtcommon.tmp
-mv -f $(objpfx)crti.s-new $(subst crtn,crti,$@)
-mv -f $(objpfx)crtn.s-new $(subst crti,crtn,$@)
-endef
+# Special rules for the building of crti.o and crtn.o
+$(objpfx)crt%.o: $(objpfx)crt%.S $(objpfx)defs.h
+       $(compile.S) -g0 $(ASFLAGS-.os) -o $@
+
+CFLAGS-initfini.s = -g0 -fPIC -fno-inline-functions
+
+$(objpfx)initfini.s: initfini.c
+       $(compile.c) -S $(CFLAGS-initfini.s) -finhibit-size-directive \
+               $(no-exceptions) -o $@
+
+# We only have one kind of startup code files.  Static binaries and
+# shared libraries are build using the PIC version.
+$(objpfx)crti.S: $(objpfx)initfini.s
+       sed -n -e '1,/@HEADER_ENDS/p' \
+              -e '/@_.*_PROLOG_BEGINS/,/@_.*_PROLOG_ENDS/p' \
+              -e '/@TRAILER_BEGINS/,$$p' $< > $@

 
 

+$(objpfx)crtn.S: $(objpfx)initfini.s
+       sed -n -e '1,/@HEADER_ENDS/p' \
+              -e '/@_.*_EPILOG_BEGINS/,/@_.*_EPILOG_ENDS/p' \
+              -e '/@TRAILER_BEGINS/,$$p' $< > $@
+
+$(objpfx)defs.h: $(objpfx)initfini.s
+       sed -n -e '/@TESTS_BEGIN/,/@TESTS_END/p' $< | \
+               awk -f defs.awk > $@
+
+endif
+
+ifeq (yes,$(elf))
+extra-objs += abi-note.o
+asm-CPPFLAGS += -I$(objpfx).

 endif
 
 include ../Rules
 
 endif
 
 include ../Rules
 

+define link-relocatable
+$(CC) -nostdlib -nostartfiles -r -o $@ $^
+endef
+

 ifndef start-installed-name-rule
 ifndef start-installed-name-rule

+ifeq (yes,$(elf))
+# We link the ELF startfile along with a SHT_NOTE section indicating
+# the the kernel ABI the binaries linked with this library will require.
+$(objpfx)$(start-installed-name): $(objpfx)start.o $(objpfx)abi-note.o
+       $(link-relocatable)
+else

 # The startfile is installed under different names, so we just call our
 # source file `start.c' and copy to the installed name after compiling.
 $(objpfx)$(start-installed-name): $(objpfx)start.o
 # The startfile is installed under different names, so we just call our
 # source file `start.c' and copy to the installed name after compiling.
 $(objpfx)$(start-installed-name): $(objpfx)start.o

-       -rm -f $@
+       rm -f $@

        ln $< $@
 endif
        ln $< $@
 endif

+endif

 
 # The profiling startfile is made by linking together the normal
 # startfile with gmon-start.o, which defines a constructor function
 # to turn on profiling code at startup.
 
 # The profiling startfile is made by linking together the normal
 # startfile with gmon-start.o, which defines a constructor function
 # to turn on profiling code at startup.

-$(objpfx)g$(start-installed-name): $(objpfx)start.o $(objpfx)gmon-start.o
-       $(CC) -nostdlib -nostartfiles -r -o $@ $^
+$(objpfx)g$(start-installed-name): $(objpfx)$(start-installed-name) \
+                                  $(objpfx)gmon-start.o
+       $(link-relocatable)

 
 # These extra files are sometimes expected by system standard linking
 # procedures, but we have nothing for them to do.  So compile empty files.
 
 # These extra files are sometimes expected by system standard linking
 # procedures, but we have nothing for them to do.  So compile empty files.


@@ -113,3 +128,15 @@ $(addprefix $(objpfx),$(filter-out $(start-installed-name),$(csu-dummies))):
        $(COMPILE.c) $(@:.o=.c) $(OUTPUT_OPTION)
        rm -f $(@:.o=.c)
 
        $(COMPILE.c) $(@:.o=.c) $(OUTPUT_OPTION)
        rm -f $(@:.o=.c)
 

+/ := $$/# bite me.
+$(objpfx)abi-tag.h: $(..)abi-tags
+       $(make-target-directory)
+       rm -f $@.new
+       sed 's/#.*$//;/^[       ]*$$/d' $< | while read conf tag; do \
+         test `expr '$(config-machine)-$(config-vendor)-$(config-os)' \
+                    : "$$conf"` != 0 || continue; \
+         echo "$$tag" | sed > $@.new \
+              's/[^0-9xXa-fA-F]/ /g;s/ *$//;s/ /,/g;s/^ */#define ABI_TAG /';\
+       done
+       if test -r $@.new; then mv -f $@.new $@; \
+       else echo >&2 'This configuration not matched in $<'; exit 1; fi