aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <pb@reciva.com>2005-06-11 10:15:27 +0000
committerPhil Blundell <pb@reciva.com>2005-06-11 10:15:27 +0000
commit19f2e4ebef5133473a04035fae727b6c250e92a0 (patch)
tree218538cc6fe98ed9f894e4cef2b88931772d1d24
parent51ae9dc83d6b52a46a9f5d00f43a0c6b49d7029c (diff)
downloadglibc-19f2e4ebef5133473a04035fae727b6c250e92a0.tar.xz
glibc-19f2e4ebef5133473a04035fae727b6c250e92a0.zip
2005-06-11 Phil Blundell <pb@reciva.com>
* sysdeps/arm/init-first.c: Deleted. * sysdeps/unix/sysv/linux/arm/linuxthreads/fork.c: New file.
-rw-r--r--ChangeLog.arm5
-rw-r--r--sysdeps/arm/init-first.c73
-rw-r--r--sysdeps/unix/sysv/linux/arm/linuxthreads/fork.c1
3 files changed, 6 insertions, 73 deletions
diff --git a/ChangeLog.arm b/ChangeLog.arm
index b5186cdf77..7383cb38f1 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,8 @@
+2005-06-11 Phil Blundell <pb@reciva.com>
+
+ * sysdeps/arm/init-first.c: Deleted.
+ * sysdeps/unix/sysv/linux/arm/linuxthreads/fork.c: New file.
+
2005-06-10 Phil Blundell <pb@reciva.com>
Bug #957:
diff --git a/sysdeps/arm/init-first.c b/sysdeps/arm/init-first.c
deleted file mode 100644
index 652cf95d14..0000000000
--- a/sysdeps/arm/init-first.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Initialization code run first thing by the ELF startup code. For ARM.
- Copyright (C) 1995,1996,1997,1998,2001,2002 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.
-
- 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. */
-
-#include <unistd.h>
-
-extern void __libc_init (int, char **, char **);
-#ifdef USE_NONOPTION_FLAGS
-extern void __getopt_clean_environment (char **);
-#endif
-extern void __libc_global_ctors (void);
-
-int __libc_multiple_libcs attribute_hidden = 1;
-
-static void
-init (int *data)
-{
- int argc = *data;
- char **argv = (void *) (data + 1);
- char **envp = &argv[argc + 1];
-
- __environ = envp;
- __libc_init (argc, argv, envp);
-
-#ifdef USE_NONOPTION_FLAGS
- /* This is a hack to make the special getopt in GNU libc working. */
- __getopt_clean_environment (envp);
-#endif
-}
-
-#ifdef SHARED
-/* This function is called to initialize the shared C library.
- It is called just before the user _start code from i386/elf/start.S,
- with the stack set up as that code gets it. */
-
-/* NOTE! The linker notices the magical name `_init' and sets the DT_INIT
- pointer in the dynamic section based solely on that. It is convention
- for this function to be in the `.init' section, but the symbol name is
- the only thing that really matters!! */
-/*void _init (int argc, ...) __attribute__ ((unused, section (".init")));*/
-
-void
-_init (int argc, ...)
-{
- init (&argc);
-
- __libc_global_ctors ();
-}
-#endif
-
-
-void
-__libc_init_first (int argc __attribute__ ((unused)), ...)
-{
-#ifndef SHARED
- init (&argc);
-#endif
-}
diff --git a/sysdeps/unix/sysv/linux/arm/linuxthreads/fork.c b/sysdeps/unix/sysv/linux/arm/linuxthreads/fork.c
new file mode 100644
index 0000000000..4fb0db2be9
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/arm/linuxthreads/fork.c
@@ -0,0 +1 @@
+#include <linuxthreads/sysdeps/unix/sysv/linux/fork.c>