Title: [1961] trunk/uClibc/libc/misc/internals/__uClibc_main.c:
Upstream r18722 | vapier | 2007-06-01 21:17:36 +0200 (Fri, 01 Jun 2007)
| 1 line
- Revision
- 1961
- Author
- bernds
- Date
- 2007-11-22 16:07:43 -0600 (Thu, 22 Nov 2007)
Log Message
Upstream r18722 | vapier | 2007-06-01 21:17:36 +0200 (Fri, 01 Jun 2007) | 1 line
change the auxvt code from being dependent on MMU to !LDSO as auxvt things are ELF-specific, not MMU-specific
Diffstat
__uClibc_main.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
Modified Paths
Diff
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c (1960 => 1961)
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c 2007-11-22 22:05:08 UTC (rev 1960)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c 2007-11-22 22:07:43 UTC (rev 1961)
@@ -33,7 +33,7 @@
#ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__
libc_hidden_proto(strrchr)
#endif
-#ifdef __ARCH_USE_MMU__
+#ifndef __ARCH_HAS_NO_LDSO__
libc_hidden_proto(memcpy)
libc_hidden_proto(getgid)
libc_hidden_proto(getuid)
@@ -129,7 +129,7 @@
# define O_NOFOLLOW 0
#endif
-#ifdef __ARCH_USE_MMU__
+#ifndef __ARCH_HAS_NO_LDSO__
static void __check_one_fd(int fd, int mode)
{
/* Check if the specified fd is already open */
@@ -277,7 +277,7 @@
char **argv, void (*app_init)(void), void (*app_fini)(void),
void (*rtld_fini)(void), void *stack_end)
{
-#ifdef __ARCH_USE_MMU__
+#ifndef __ARCH_HAS_NO_LDSO__
unsigned long *aux_dat;
ElfW(auxv_t) auxvt[AT_EGID + 1];
#endif
@@ -298,7 +298,7 @@
__environ = &argv[argc];
}
-#ifdef __ARCH_USE_MMU__
+#ifndef __ARCH_HAS_NO_LDSO__
/* Pull stuff from the ELF header when possible */
memset(auxvt, 0x00, sizeof(auxvt));
aux_dat = (unsigned long*)__environ;
@@ -320,7 +320,7 @@
* __uClibc_init() regardless, to be sure the right thing happens. */
__uClibc_init();
-#ifdef __ARCH_USE_MMU__
+#ifndef __ARCH_HAS_NO_LDSO__
/* Make certain getpagesize() gives the correct answer */
__pagesize = (auxvt[AT_PAGESZ].a_un.a_val)? auxvt[AT_PAGESZ].a_un.a_val : PAGE_SIZE;
_______________________________________________
Toolchain-commits mailing list
Toolchain-commits@blackfin.uclinux.org
http://blackfin.uclinux.org/mailman/listinfo/toolchain-commits
