From ad10cac8a4d5874f6e7cd8cd6b4acbf86502a893 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 20 Jun 2001 07:10:50 +0000 Subject: Update. 2001-05-09 Michael Keezer * Makeconfig: Added AIX-ld support for DSO. * Makerules: Likewise. * dlfcn/Makefile (defaultmod1.so): Added libc_nonshared. (defaultmod2.so): Likewise. * debug/Makefile: Conditionalize use of elf/ld.so. * iconvdata/Makefile: Moved LDFLAG rpath/soname info into Makeconfig. * sysdeps/unix/sysv/aix/Makefile: Added dl-support.c and dl-error.c. * sysdeps/unix/sysv/aix/Makefile: Made (f/g)rsave(0/1) & (f/g)prrest(0/1) static only. * sysdeps/unix/sysv/aix/gettimeofday.c: Removed #if 0. * sysdeps/unix/sysv/aix/start.c: Define __dso_handle if not ELF but shared. * sysdeps/unix/sysv/aix/setitimer.c: New file. * sysdeps/unix/sysv/aix/sleep.c: New file. * sysdeps/unix/sysv/aix/usleep.c: New file. * sysdeps/unix/sysv/aix/dl-addr.c: New file. * sysdeps/unix/sysv/aix/dl-error.c: New file. * sysdeps/unix/sysv/aix/dl-support.c: New file. * sysdeps/unix/sysv/aix/powerpc/register-dump.h: New file. (BODY for TO_LOOP): Keep track of Unicode 3.1 language tag. I f "ja", prefer conversion to Japanese character sets. If "zh", prefer conversion to GB2312. I f "ko", prefer conversion to KSC5601. Small --- sysdeps/unix/sysv/aix/start.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'sysdeps/unix/sysv/aix/start.c') diff --git a/sysdeps/unix/sysv/aix/start.c b/sysdeps/unix/sysv/aix/start.c index d854a55f42..eee21966ef 100644 --- a/sysdeps/unix/sysv/aix/start.c +++ b/sysdeps/unix/sysv/aix/start.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 93, 1995-1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1991, 93, 1995-1998, 2000, 2001 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 @@ -32,6 +32,12 @@ typedef unsigned char uchar; /* sb in libc/posix/types.h */ /* The first piece of initialized data. */ int __data_start = 0; ++#ifndef HAVE_ELF +/* Since gcc/crtstuff.c won't define it unless the ELF format is used + we will need to define it here. */ +void *__dso_handle = NULL; +#endif + extern int errno; /* extern __pthread_init; */ @@ -108,12 +114,12 @@ asm(" #endif crt0_info.p_argc = (int*)&argc; -/* crt0_info.threads_init = (FPV) &__pthread_init; */ +/* crt0_info.threads_init = (FPV) &__pthread_init; */ /* * Do run-time linking, if enabled and call the init() * for all loaded modules. - */ + */ argc = modinit(argc,&crt0_info,module_count,text_origin,data_origin); errno=0; @@ -131,9 +137,9 @@ asm(" * int modinit(argc,crt0_info,module_count,text,data) * * argc - current value of argc. - * info - crt0 information passed + * info - crt0 information passed * module_count - number of modules loaded. - * text - Beginning of text address + * text - Beginning of text address * data - Beginning of data address */ @@ -287,4 +293,3 @@ __RTINIT *find_rtinit(caddr_t text_origin, caddr_t data_origin, int module_count (data_origin - data_sec_hdr->s_vaddr)); return(rtl); } - -- cgit v1.2.3