[Glibc-bsd-commits] r3689 - in trunk/glibc-ports/kfreebsd: . i386 x86_64
Petr Salinger
ps-guest at alioth.debian.org
Sun Aug 21 08:44:00 UTC 2011
Author: ps-guest
Date: 2011-08-21 08:43:59 +0000 (Sun, 21 Aug 2011)
New Revision: 3689
Modified:
trunk/glibc-ports/kfreebsd/dl-sysdep.c
trunk/glibc-ports/kfreebsd/i386/dl-machine.h
trunk/glibc-ports/kfreebsd/x86_64/dl-machine.h
Log:
handle AT_EXECPATH
Modified: trunk/glibc-ports/kfreebsd/dl-sysdep.c
===================================================================
--- trunk/glibc-ports/kfreebsd/dl-sysdep.c 2011-08-20 17:26:40 UTC (rev 3688)
+++ trunk/glibc-ports/kfreebsd/dl-sysdep.c 2011-08-21 08:43:59 UTC (rev 3689)
@@ -36,6 +36,8 @@
# undef _dl_sysdep_start
# undef _dl_show_auxv
+extern const char *_self_program_name_from_auxv attribute_hidden;
+
ElfW(Addr)
_dl_sysdep_start (void **start_argptr,
void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phnum,
@@ -73,6 +75,9 @@
case AT_ENTRY:
user_entry = av->a_un.a_val;
break;
+ case AT_EXECPATH:
+ _self_program_name_from_auxv = (char *) av->a_un.a_val;
+ break;
#ifdef NEED_DL_BASE_ADDR
case AT_BASE:
_dl_base_addr = av->a_un.a_val;
Modified: trunk/glibc-ports/kfreebsd/i386/dl-machine.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/dl-machine.h 2011-08-20 17:26:40 UTC (rev 3688)
+++ trunk/glibc-ports/kfreebsd/i386/dl-machine.h 2011-08-21 08:43:59 UTC (rev 3689)
@@ -92,16 +92,12 @@
);
}
-extern const char *_self_program_name_from_auxv attribute_hidden;
-
static inline void __attribute__ ((unused))
dl_platform_kfreebsd_i386_init (void)
{
/* we don't have reasonable AT_PLATFORM from kernel
try to use cpuid to get one, also guess AT_HWCAP */
- _self_program_name_from_auxv = GLRO(dl_platform);
-
int val, hwcap;
val = try_flip_flags(X86_EFLAGS_AC | X86_EFLAGS_ID);
Modified: trunk/glibc-ports/kfreebsd/x86_64/dl-machine.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/dl-machine.h 2011-08-20 17:26:40 UTC (rev 3688)
+++ trunk/glibc-ports/kfreebsd/x86_64/dl-machine.h 2011-08-21 08:43:59 UTC (rev 3689)
@@ -117,9 +117,6 @@
);
}
-extern const char *_self_program_name_from_auxv attribute_hidden;
-
-
static inline void __attribute__ ((unused))
dl_platform_kfreebsd_x86_64_init (void)
{
@@ -130,7 +127,6 @@
cpuid(1, &val, &hwcap);
GLRO(dl_hwcap) = hwcap;
- _self_program_name_from_auxv = GLRO(dl_platform);
GLRO(dl_platform) = ELF_MACHINE_NAME;
}
More information about the Glibc-bsd-commits
mailing list