about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-02-21 06:02:58 +0000
committerRoland McGrath <roland@gnu.org>1995-02-21 06:02:58 +0000
commit37f91d336d8d93b1416c121627ffe88e548b251d (patch)
treea97e2e6f7a060d404c43bbc9ae12f0685f35f1fd
parent41d43dbce0b5df750abf709a793195471b4c55e8 (diff)
downloadglibc-37f91d336d8d93b1416c121627ffe88e548b251d.tar.gz
glibc-37f91d336d8d93b1416c121627ffe88e548b251d.tar.xz
glibc-37f91d336d8d93b1416c121627ffe88e548b251d.zip
Tue Feb 21 00:10:50 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
	* csu/Makefile (crtstuff): New variable consolidates crti, crtn;
 	add crti_s, crtn_s.
	(install-lib, extra-objs, generated-, omit-deps): Use that.
	(initfini): New canned sequence, broken out of crt[in].s rule.
	(crt[in].s rule): Use it.
	(crt[in]_s.s): New rule.
	* csu/initfini.c (GLOBAL): New macro; define it to empty if undefined.
	(_init, _fini): Use GLOBAL as storage class.
	Add self reference to avoid GCC optimizing out the functions.

	* Makefile (headers): Remove $(stddef.h).
	* Makeconfig (stddef.h): Variable removed; now require gcc version
 	>= 2.2.
	* stddef.h: File removed.

Mon Feb 20 19:42:31 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>

	* sysdeps/unix/bsd/ultrix4/mips/start.S: Remove `__environ'
 	definition.
	* sysdeps/unix/bsd/osf1/alpha/start.S: Likewise.

	* stdlib/strtod.c: Allow the string to start with a decimal point
 	without a leading zero.
-rw-r--r--ChangeLog26
-rw-r--r--Makeconfig6
-rw-r--r--Makefile2
-rw-r--r--csu/Makefile48
-rw-r--r--csu/initfini.c17
-rw-r--r--stdlib/strtod.c2
-rw-r--r--sysdeps/unix/bsd/Attic/osf1/alpha/start.S7
-rw-r--r--sysdeps/unix/bsd/ultrix4/mips/start.S7
-rw-r--r--sysdeps/unix/start.c12
9 files changed, 78 insertions, 49 deletions
diff --git a/ChangeLog b/ChangeLog
index c1f0563b70..3403a139ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+Tue Feb 21 00:10:50 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* csu/Makefile (crtstuff): New variable consolidates crti, crtn;
+ 	add crti_s, crtn_s.
+	(install-lib, extra-objs, generated-, omit-deps): Use that.
+	(initfini): New canned sequence, broken out of crt[in].s rule.
+	(crt[in].s rule): Use it.
+	(crt[in]_s.s): New rule.
+	* csu/initfini.c (GLOBAL): New macro; define it to empty if undefined.
+	(_init, _fini): Use GLOBAL as storage class.
+	Add self reference to avoid GCC optimizing out the functions.
+
+	* Makefile (headers): Remove $(stddef.h).
+	* Makeconfig (stddef.h): Variable removed; now require gcc version
+ 	>= 2.2.
+	* stddef.h: File removed.
+
+Mon Feb 20 19:42:31 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* sysdeps/unix/bsd/ultrix4/mips/start.S: Remove `__environ'
+ 	definition.
+	* sysdeps/unix/bsd/osf1/alpha/start.S: Likewise.
+
+	* stdlib/strtod.c: Allow the string to start with a decimal point
+ 	without a leading zero.
+
 Mon Feb 20 04:04:57 1995  Roland McGrath  <roland@duality.gnu.ai.mit.edu>
 
 	* Makefile (subdirs): Put csu first.
diff --git a/Makeconfig b/Makeconfig
index 48a4a95ef8..4cd8061e3c 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -134,12 +134,6 @@ ifndef includedir
 includedir = $(exec_prefix)/include
 endif
 
-# Define if the library should install its own <stddef.h>.
-# Do this unless you are using version 2.2 or later of GCC.
-ifndef stddef.h
-stddef.h = stddef.h
-endif
-
 # Where to install machine-independent data files.
 # These are the timezone database, and eventually the locale database.
 ifndef datadir
diff --git a/Makefile b/Makefile
index 064ce12602..9c998da1b7 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ subdirs	:= $(filter mach,$(subdirs)) $(filter hurd,$(subdirs)) \
 					      no-libc.a bin lib		\
 					      data headers others)
 
-headers := features.h errno.h sys/errno.h errnos.h limits.h $(stddef.h)
+headers := features.h errno.h sys/errno.h errnos.h limits.h
 aux	 = sysdep $(libc-init) version
 
 echo-headers: subdir_echo-headers
diff --git a/csu/Makefile b/csu/Makefile
index 6de77b768c..4943087203 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -39,33 +39,51 @@ 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
-install-lib += crti.o crtn.o
-extra-objs += crti.o crtn.o
-generated += crti.s crtn.s
-omit-deps += crti crtn
+
+# These are the special initializer/finalizer files.  They are always the
+# first and last file in the link.  crti.o ... crtn.o are used for normal
+# linking; they define the global "functions" _init and _fini to run the
+# .init and .fini sections.  crti_s.o ... crtn_s.o are for making shared
+# library objects; they put the prologue/epilogue code into the .init and
+# .fini sections, but define no global symbols.
+crtstuff = crti crtn crti_s crtn_s
+
+install-lib += $(crtstuff:=.o)
+extra-objs += $(crtstuff:=.o)
+generated += $(crtstuff:=.s)
+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
-	-rm -f $(objpfx)crtcommon.tmp
-	(echo 'cat > crtcommon.tmp <<\EOF_common'; \
-	 $(CC) $< $(CPPFLAGS) $(CFLAGS) -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 $(objpfx)crti.s
-	mv -f $(objpfx)crtn.s-new $(objpfx)crtn.s
-endif
+$(objpfx)cr%i.s $(objpfx)cr%n.s: initfini.c; $(initfini)
+$(objpfx)cr%i_s.s $(objpfx)cr%n_s.s: initfini.c; $(initfini)
+
+define initfini
+-rm -f $(objpfx)crtcommon.tmp
+(echo 'cat > crtcommon.tmp <<\EOF_common'; \
+ $(CC) $< $(CPPFLAGS) $(CFLAGS) \
+       $(patsubst %,-DGLOBAL=static,$(filter %_s.s,$@)) \
+       -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
 
+endif
 
 include ../Rules
 
diff --git a/csu/initfini.c b/csu/initfini.c
index ea16e62ffe..bfd120b7ef 100644
--- a/csu/initfini.c
+++ b/csu/initfini.c
@@ -34,11 +34,18 @@ Cambridge, MA 02139, USA.  */
 
 #include <stdlib.h>
 
+/* We are compiled with -DGLOBAL=static to generate the versions used for
+   shared libraries' .init and .fini sections, which do not have entry
+   point symbols.  */
+#ifndef GLOBAL
+#define GLOBAL
+#endif
+
 /* These declarations make the functions go in the right sections when
    we define them below.  GCC syntax does not allow the attribute
    specifications to be in the function definitions themselves.  */
-void _init (void) __attribute__ ((section (".init")));
-void _fini (void) __attribute__ ((section (".fini")));
+GLOBAL void _init (void) __attribute__ ((section (".init")));
+GLOBAL void _fini (void) __attribute__ ((section (".fini")));
 
 /* End the here document containing the initial common code.
    Then move the output file crtcommon.tmp to crti.s-new and crtn.s-new.  */
@@ -48,9 +55,10 @@ cp -f crti.s-new crtn.s-new");
 
 /* Append the .init prologue to crti.s-new.  */
 asm ("cat >> crti.s-new <<\\EOF.crti.init");
-void
+GLOBAL void
 _init (void)
 {
+  (void) &_init;		/* Don't optimize out the function! */
   /* End the here document containing the .init prologue code.
      Then fetch the .section directive just written and append that
      to crtn.s-new, followed by the function epilogue.  */
@@ -66,9 +74,10 @@ asm ("\nEOF.crtn.init\
 \n\
 cat >> crti.s-new <<\\EOF.crti.fini");
 
-void
+GLOBAL void
 _fini (void)
 {
+  (void) &_fini;		/* Don't optimize out the function! */
   /* End the here document containing the .fini prologue code.
      Then fetch the .section directive just written and append that
      to crtn.s-new, followed by the function epilogue.  */
diff --git a/stdlib/strtod.c b/stdlib/strtod.c
index 6bd2dd685a..989984e66d 100644
--- a/stdlib/strtod.c
+++ b/stdlib/strtod.c
@@ -396,7 +396,7 @@ STRTOF (nptr, endptr)
 
   /* Return 0.0 if no legal string is found.
      No character is used even if a sign was found.  */
-  if (!isdigit (c))
+  if (!isdigit (c) && (c != decimal || !isdigit (cp[1])))
     RETURN (0.0, nptr);
 
   /* Record the start of the digits, in case we will check their grouping.  */
diff --git a/sysdeps/unix/bsd/Attic/osf1/alpha/start.S b/sysdeps/unix/bsd/Attic/osf1/alpha/start.S
index 8b7109a512..52eb03667f 100644
--- a/sysdeps/unix/bsd/Attic/osf1/alpha/start.S
+++ b/sysdeps/unix/bsd/Attic/osf1/alpha/start.S
@@ -18,13 +18,6 @@ Cambridge, MA 02139, USA.  */
 
 #include <sysdep.h>
 
-#ifndef HAVE_WEAK_SYMBOLS
-#define __environ environ
-#else
-weak_alias (__environ, environ)
-#endif
-
-.comm __environ,	8
 .comm errno,		4
 
 !.sdata
diff --git a/sysdeps/unix/bsd/ultrix4/mips/start.S b/sysdeps/unix/bsd/ultrix4/mips/start.S
index ec0f9d833d..eec8ce08be 100644
--- a/sysdeps/unix/bsd/ultrix4/mips/start.S
+++ b/sysdeps/unix/bsd/ultrix4/mips/start.S
@@ -18,13 +18,6 @@ Cambridge, MA 02139, USA.  */
 
 #include <sysdep.h>
 
-#ifndef HAVE_WEAK_SYMBOLS
-#define __environ environ
-#else
-weak_alias (__environ, environ)
-#endif
-
-.comm __environ,	4
 .comm errno,		4
 
 ENTRY(__start)
diff --git a/sysdeps/unix/start.c b/sysdeps/unix/start.c
index feb5f44fb8..62c9bd9f38 100644
--- a/sysdeps/unix/start.c
+++ b/sysdeps/unix/start.c
@@ -35,11 +35,8 @@ weak_alias (__data_start, data_start)
 #define	DECL_DUMMIES
 #endif
 
-VOLATILE int errno;
-
-#ifndef	HAVE_WEAK_SYMBOLS
-#undef	environ
-#define	__environ	environ
+#ifndef errno
+volatile int errno;
 #endif
 
 extern void EXFUN(__libc_init, (int argc, char **argv, char **envp));
@@ -66,11 +63,10 @@ DEFUN_VOID(_start)
   start1();
 }
 
-#if !defined (NO_UNDERSCORES) && defined (HAVE_GNU_LD) && !defined (__GNUC__)
+#if !defined (NO_UNDERSCORES) && defined (HAVE_WEAK_SYMBOLS)
 /* Make an alias called `start' (no leading underscore,
    so it can't conflict with C symbols) for `_start'.  */
-asm(".stabs \"start\",11,0,0,0");
-asm(".stabs \"__start\",1,0,0,0");
+asm (".weak start; start = _start");
 #endif
 
 #endif