diff options
Diffstat (limited to 'meta/recipes-core/uclibc')
26 files changed, 0 insertions, 8124 deletions
diff --git a/meta/recipes-core/uclibc/site_config/funcs b/meta/recipes-core/uclibc/site_config/funcs deleted file mode 100644 index ccc85392d7..0000000000 --- a/meta/recipes-core/uclibc/site_config/funcs +++ /dev/null @@ -1,474 +0,0 @@ -a64l -abs -access -__adjtimex -alarm -alphasort -argz_append -__argz_count -argz_create_sep -argz_insert -__argz_next -argz_next -__argz_stringify -argz_stringify -asprintf -atexit -atof -atoi -bcmp -bcopy -bindresvport -bind_textdomain_codeset -btowc -bzero -calloc -canonicalize_file_name -catgets -cfgetospeed -cfsetispeed -cfsetspeed -chmod -chown -chroot -clock -close -closedir -closelog -confstr -connect -daemon -dcgettext -difftime -dirfd -dirname -dngettext -dup2 -ecvt -endgrent -endmntent -endpwent -endutent -endutxent -epoll_ctl -err -ether_hostton -ether_ntohost -euidaccess -execv -fchdir -fchmod -fchmodat -fchown -fchownat -fcntl -fcvt -fdatasync -fdopendir -feof_unlocked -fgets_unlocked -fgetxattr -finite -flistxattr -flock -flockfile -fnmatch -fork -fpathconf -__fpending -fprintf -free -freeaddrinfo -freeifaddrs -fseeko -__fsetlocking -fsetxattr -fstat64 -fstat -fstatfs -fsync -ftello -ftime -ftruncate -funlockfile -futimes -futimesat -gai_strerror -gcvt -getaddrinfo -getc_unlocked -getcwd -getdelim -getdomainname -getdtablesize -getegid -getenv -geteuid -getgid -getgrent -getgrent_r -getgrgid_r -getgrnam -getgrnam_r -getgrouplist -getgroups -gethostbyaddr_r -gethostbyname2 -gethostbyname -gethostbyname_r -gethostent -gethostid -gethostname -getifaddrs -getline -getloadavg -getmntent -getmsg -getnameinfo -getnetbyaddr_r -getnetgrent_r -getopt -getopt_long -getopt_long_only -getpagesize -getpass -getpeername -getpgrp -getpid -getppid -getprotoent_r -getpwent -getpwent_r -getpwnam -getpwnam_r -getpwuid -getpwuid_r -getresuid -getrlimit -getrusage -getservbyname -getservbyname_r -getservbyport_r -getservent -getservent_r -getspnam -getspnam_r -gettimeofday -getttyent -getttynam -getuid -getusershell -getutent -getutid -getutline -getutmp -getutmpx -getutxent -getutxid -getutxline -getwd -getxattr -glob -gmtime -gmtime_r -grantpt -group_member -herror -hstrerror -iconv -iconv_open -if_freenameindex -if_indextoname -if_nameindex -if_nametoindex -index -inet_addr -inet_aton -inet_ntoa -inet_ntop -inet_pton -initgroups -innetgr -iruserok -isascii -isatty -isblank -isgraph -isinf -isnan -isprint -isspace -iswalnum -iswcntrl -iswctype -iswprint -iswspace -iswupper -isxdigit -kill -killpg -lchown -lckpwdf -lgetxattr -link -listxattr -llistxattr -localtime -localtime_r -lockf -lrand48 -lsearch -lseek64 -lsetxattr -lstat -mallinfo -malloc -mblen -mbrlen -mbrtowc -mbsinit -mbsrtowcs -mbtowc -memalign -memchr -memcmp -memcpy -memmove -mempcpy -memrchr -memset -mkdir -mkdirat -mkdtemp -mkfifo -mknod -mkstemp64 -mkstemp -mktime -mlock -mmap -mtrace -munlock -munmap -nanosleep -nice -nl_langinfo -ntp_adjtime -ntp_gettime -_obstack_free -on_exit -open64 -open -openat -opendir -openlog -pathconf -pipe -poll -popen -posix_memalign -prctl -pread -printf -__progname -pselect -pthread_mutex_lock -ptsname -putenv -putgrent -putpwent -putspent -pututline -pututxline -putwc -pwrite -qsort -raise -rand -random -rand_r -read -readdir -readdir_r -readlink -realloc -realpath -re_comp -recvmsg -re_exec -regcomp -regexec -remove -rename -re_search -rmdir -rpmatch -rresvport_af -ruserok -ruserok_af -sbrk -scandir -sched_setscheduler -sched_yield -__secure_getenv -select -semctl -semget -sendmsg -setbuf -setbuffer -setegid -setenv -seteuid -setgid -setgroups -sethostname -setitimer -_setjmp -setjmp -setlinebuf -setlocale -setmntent -setpgid -setpgrp -setpriority -setregid -setresgid -setresuid -setreuid -setrlimit -setsid -setsockopt -settimeofday -setuid -setutent -setutxent -setvbuf -setxattr -sgetspent -shmat -shmctl -shmdt -shmget -shutdown -sigaction -sigaddset -sigaltstack -sigblock -sigemptyset -sighold -siginterrupt -signal -sigprocmask -sigset -sigsetmask -sigstack -sigsuspend -sigvec -snprintf -socket -socketpair -sprintf -srand48 -srand -srandom -sscanf -stat -statfs -statvfs -stime -stpcpy -strcasecmp -strcasestr -strchr -strchrnul -strcmp -strcspn -strdup -strerror -strerror_r -strftime -strlen -strncasecmp -strncmp -strndup -strnlen -strpbrk -strptime -strrchr -strsep -strsignal -strspn -strstr -strtod -strtoimax -strtok_r -strtol -strtoll -strtoul -strtoull -strtoumax -strverscmp -strxfrm -symlink -sync -sysconf -sysctl -sysinfo -syslog -_sys_siglist -sys_siglist -system -tcgetattr -tcgetpgrp -tcsetattr -tcsetpgrp -time -timegm -times -timezone -tmpnam -towlower -towupper -truncate -tsearch -ttyname -tzset -ulimit -umask -uname -unlink -unsetenv -unshare -updwtmp -updwtmpx -usleep -ustat -utime -utimes -utmpname -utmpxname -valloc -vasprintf -verrx -vfork -vfprintf -vfscanf -vhangup -vprintf -vsnprintf -vsprintf -wait3 -wait4 -waitpid -wcrtomb -wcscoll -wcsdup -wcslen -wctob -wctomb -wctype -wcwidth -wmemchr -wmemcpy -wmempcpy diff --git a/meta/recipes-core/uclibc/site_config/headers b/meta/recipes-core/uclibc/site_config/headers deleted file mode 100644 index 609ab53797..0000000000 --- a/meta/recipes-core/uclibc/site_config/headers +++ /dev/null @@ -1,156 +0,0 @@ -aio.h -alloca.h -argz.h -arpa/inet.h -arpa/nameser.h -asm/byteorder.h -asm/ioctls.h -asm/page.h -asm/types.h -assert.h -byteswap.h -crypt.h -ctype.h -dirent.h -dlfcn.h -elf.h -endian.h -err.h -errno.h -execinfo.h -fcntl.h -features.h -float.h -fstab.h -ftw.h -getopt.h -glob.h -grp.h -iconv.h -ifaddrs.h -inttypes.h -langinfo.h -lastlog.h -libgen.h -libintl.h -limits.h -linux/capability.h -linux/fd.h -linux/fs.h -linux/hayesesp.h -linux/hdreg.h -linux/icmp.h -linux/in6.h -linux/joystick.h -linux/ptrace.h -linux/serial.h -linux/sonypi.h -linux/unistd.h -linux/utsname.h -linux/version.h -locale.h -malloc.h -math.h -mcheck.h -memory.h -mntent.h -mqueue.h -netdb.h -net/if.h -netinet/ether.h -netinet/in.h -netinet/ip6.h -netinet/ip.h -netinet/tcp.h -netinet/udp.h -netipx/ipx.h -net/route.h -paths.h -poll.h -pthread.h -pty.h -pwd.h -regex.h -resolv.h -rpc/rpc.h -rpc/types.h -sched.h -scsi/scsi.h -search.h -semaphore.h -setjmp.h -sgtty.h -shadow.h -signal.h -stdarg.h -stdbool.h -stdc -stddef.h -stdint.h -stdio.h -stdlib.h -string.h -strings.h -stropts.h -sys/bitypes.h -sys/cdefs.h -sys/dir.h -sys/epoll.h -sysexits.h -sys/fcntl.h -sys/file.h -sys/fsuid.h -sys/ioctl.h -sys/ipc.h -syslog.h -sys/mman.h -sys/mount.h -sys/mtio.h -sys/param.h -sys/poll.h -sys/prctl.h -sys/ptrace.h -sys/queue.h -sys/reg.h -sys/resource.h -sys/select.h -sys/sem.h -sys/shm.h -sys/signal.h -sys/socket.h -sys/socketvar.h -sys/soundcard.h -sys/statfs.h -sys/stat.h -sys/statvfs.h -sys/stropts.h -sys/swap.h -sys/sysctl.h -sys/sysinfo.h -sys/sysmacros.h -sys/termios.h -sys/timeb.h -sys/time.h -sys/times.h -sys/timex.h -sys/types.h -sys/uio.h -sys/un.h -sys/unistd.h -sys/user.h -sys/utsname.h -sys/vfs.h -sys/wait.h -termio.h -termios.h -time.h -ttyent.h -ulimit.h -unistd.h -ustat.h -utime.h -utmp.h -utmpx.h -values.h -wchar.h -wctype.h diff --git a/meta/recipes-core/uclibc/site_config/types b/meta/recipes-core/uclibc/site_config/types deleted file mode 100644 index 178bd85a00..0000000000 --- a/meta/recipes-core/uclibc/site_config/types +++ /dev/null @@ -1,21 +0,0 @@ -char -char * -double -float -int -long -long double -long int -long long -long long int -short -short int -signed char -unsigned char -unsigned int -unsigned long -unsigned long int -unsigned long long int -unsigned short -unsigned short int -void * diff --git a/meta/recipes-core/uclibc/uclibc-config.inc b/meta/recipes-core/uclibc/uclibc-config.inc deleted file mode 100644 index 8b9e41c64d..0000000000 --- a/meta/recipes-core/uclibc/uclibc-config.inc +++ /dev/null @@ -1,142 +0,0 @@ -DEPENDS += "kern-tools-native" -inherit cml1 -# -# Set the ARCH environment variable for uClibc compilation. -# Return value must match one of the architectures known to uClibc: -# libc/sysdeps/*/* -# - -valid_archs = "\ -alpha \ -arm \ -avr32 \ -bfin \ -c6x \ -cris \ -e1 \ -frv \ -h8300 \ -hppa \ -i386 \ -i960 \ -ia64 \ -m68k \ -microblaze \ -mips \ -nios \ -nios2 \ -powerpc \ -sh \ -sh64 \ -sparc \ -v850 \ -vax \ -x86_64 \ -xtensa \ -" -def map_uclibc_arch(a, d): - """Return the uClibc architecture for the given TARGET_ARCH.""" - import re - - valid_archs = d.getVar('valid_archs', True).split() - - if re.match('^(arm|sa110).*', a): - return 'arm' - elif re.match('^(i.86|athlon)$', a): - return 'i386' - elif re.match('^mips.*', a): - return 'mips' - elif re.match('^parisc.*', a): - return 'hppa' - elif re.match('^ppc.*', a): - return 'powerpc' - elif re.match('^s390.*', a): - return 's390' - elif re.match('^sh.*', a): - return 'sh' - elif re.match('^(sun|sparc).*', a): - return 'sparc' - elif re.match('^xtensa.*', a): - return 'xtensa' - elif a in valid_archs: - return a - else: - bb.error("cannot map '%s' to a uClibc architecture" % a) - -export UCLIBC_ARCH = "${@map_uclibc_arch(d.getVar('TARGET_ARCH', True), d)}" - -def map_uclibc_abi(o, d): - """Return the uClibc ABI for the given TARGET_OS.""" - import re - - arch = d.getVar('TARGET_ARCH', True) - if map_uclibc_arch(d.getVar('TARGET_ARCH', True), d) == "arm": - if re.match('.*eabi$', o): - return 'ARM_EABI' - else: - return 'ARM_OABI' - # FIXME: This is inaccurate! Handle o32, n32, n64 - elif re.match('^mips.*64$', arch): - return 'MIPS_N64_ABI' - elif re.match('^mips.*', arch): - return 'MIPS_O32_ABI' - return "" - -export UCLIBC_ABI = "${@map_uclibc_abi(d.getVar('TARGET_OS', True), d)}" - -def map_uclibc_endian(a, d): - """Return the uClibc endianess for the given TARGET_ARCH.""" - import re - - # Always BE - if re.match('^(avr32|e1|frv|(parisc|hppa)|m68k|microblaze|powerpc.*|(sparc|sun).*)$', a): - return 'BIG' - # Possibly BE - elif re.match('^(((arm|sa110).*eb)|h8300.*eb|(parisc|hppa).*eb|mips|mips64|sh.*eb|xtensa.*eb)$', a): - return 'BIG' - return 'LITTLE' - -export UCLIBC_ENDIAN = "${@map_uclibc_endian(d.getVar('TARGET_ARCH', True), d)}" - -# internal helper -def uclibc_cfg(feature, features, tokens, cnf, rem): - if type(tokens) == type(""): - tokens = [tokens] - rem.extend(['/^[# ]*' + token + '[ =]/d' for token in tokens]) - if type(features) == type([]) and feature in features: - cnf.extend([token + '=y' for token in tokens]) - else: - cnf.extend(['# ' + token + ' is not set' for token in tokens]) - -# Map distro features to config settings -def features_to_uclibc_settings(d): - cnf, rem = ([], []) - distro_features = d.getVar('DISTRO_FEATURES', True).split() - uclibc_cfg('ipv4', distro_features, 'UCLIBC_HAS_IPV4', cnf, rem) - uclibc_cfg('ipv6', distro_features, 'UCLIBC_HAS_IPV6', cnf, rem) - uclibc_cfg('largefile', distro_features, 'UCLIBC_HAS_LFS', cnf, rem) - uclibc_cfg('nls', distro_features, 'UCLIBC_HAS_LOCALE', cnf, rem) - uclibc_cfg('thumb-interwork', distro_features,'USE_BX', cnf, rem) - uclibc_cfg('xattr', distro_features, 'UCLIBC_HAS_XATTR', cnf, rem) - uclibc_cfg('ssp', distro_features, 'UCLIBC_HAS_SSP', cnf, rem) - uclibc_cfg('argp', distro_features, 'UCLIBC_HAS_ARGP', cnf, rem) - uclibc_cfg('libc-posix-clang-wchar', distro_features,'UCLIBC_HAS_WCHAR', cnf, rem) - return "\n".join(cnf), "\n".join(rem) -# X, Y = ${@features_to_uclibc_settings(d)} -# unfortunately doesn't seem to work with bitbake, workaround: -def features_to_uclibc_conf(d): - cnf, rem = features_to_uclibc_settings(d) - return cnf -def features_to_uclibc_del(d): - cnf, rem = features_to_uclibc_settings(d) - return rem - -# returns all the elements from the src uri that are .cfg files -def find_cfgs(d): - sources=src_patches(d, True) - sources_list=[] - for s in sources: - if s.endswith('.cfg'): - sources_list.append(s) - - return sources_list diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc deleted file mode 100644 index 6fca9e4673..0000000000 --- a/meta/recipes-core/uclibc/uclibc-git.inc +++ /dev/null @@ -1,26 +0,0 @@ -SRCREV="f22cca4722fa66e424562e69f4afa2bca0af871d" - -PV = "0.9.33+git${SRCPV}" - -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}" - -SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \ - file://uClibc.machine \ - file://uClibc.distro \ - file://obstack.cfg \ - file://locale.cfg \ - file://uclibc_enable_log2_test.patch \ - file://powerpc_copysignl.patch \ - file://argp-support.patch \ - file://argp-headers.patch \ - file://remove_attribute_optimize_Os.patch \ - file://compile-arm-fork-with-O2.patch \ - file://orign_path.patch \ - file://0001-atexit_old-Do-not-add-it-to-shared-libc.patch \ - file://0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch \ - file://0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \ - file://0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch \ - file://0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch \ - file://0001-add-posix_fadvise-for-arm.patch \ - " -S = "${WORKDIR}/git" diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch b/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch deleted file mode 100644 index 4ac765c334..0000000000 --- a/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch +++ /dev/null @@ -1,319 +0,0 @@ -Upstream-Status: Pending - -From 096abf14d2dc978607ccd8a0d7f42da65d8991f3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 Sep 2012 22:00:04 -0700 -Subject: [PATCH] Revert "utent.c, wtent.c: move functions from utxent.c" - -This reverts commit 84135275cfeebc0b233c1c96eeada4d4178a0b18. ---- - include/utmp.h | 8 +++++ - libc/misc/utmp/utent.c | 80 +++++++++++------------------------------------ - libc/misc/utmp/utxent.c | 4 +-- - libc/misc/utmp/wtent.c | 14 ++------- - 4 files changed, 30 insertions(+), 76 deletions(-) - -Index: git/include/utmp.h -=================================================================== ---- git.orig/include/utmp.h 2013-01-21 16:37:18.000000000 -0800 -+++ git/include/utmp.h 2013-01-21 16:40:56.987583099 -0800 -@@ -56,30 +56,37 @@ - /* Append entry UTMP to the wtmp-like file WTMP_FILE. */ - extern void updwtmp (const char *__wtmp_file, const struct utmp *__utmp) - __THROW; -+libc_hidden_proto(updwtmp) - - /* Change name of the utmp file to be examined. */ - extern int utmpname (const char *__file) __THROW; -+libc_hidden_proto(utmpname) - - /* Read next entry from a utmp-like file. */ - extern struct utmp *getutent (void) __THROW; -+libc_hidden_proto(getutent) - - /* Reset the input stream to the beginning of the file. */ - extern void setutent (void) __THROW; -+libc_hidden_proto(setutent) - - /* Close the current open file. */ - extern void endutent (void) __THROW; -+libc_hidden_proto(endutent) - - /* Search forward from the current point in the utmp file until the - next entry with a ut_type matching ID->ut_type. */ - extern struct utmp *getutid (const struct utmp *__id) __THROW; -+libc_hidden_proto(getutid) - - /* Search forward from the current point in the utmp file until the - next entry with a ut_line matching LINE->ut_line. */ - extern struct utmp *getutline (const struct utmp *__line) __THROW; -+libc_hidden_proto(getutline) - - /* Write out entry pointed to by UTMP_PTR into the utmp file. */ - extern struct utmp *pututline (const struct utmp *__utmp_ptr) __THROW; -- -+libc_hidden_proto(pututline) - - #if 0 /* def __USE_MISC */ - /* Reentrant versions of the file for handling utmp files. */ -Index: git/libc/misc/utmp/utent.c -=================================================================== ---- git.orig/libc/misc/utmp/utent.c 2013-01-21 16:37:18.000000000 -0800 -+++ git/libc/misc/utmp/utent.c 2013-01-21 16:38:14.035578638 -0800 -@@ -19,9 +19,6 @@ - #include <errno.h> - #include <string.h> - #include <utmp.h> --#ifdef __UCLIBC_HAS_UTMPX__ --# include <utmpx.h> --#endif - #include <not-cancel.h> - - #include <bits/uClibc_mutex.h> -@@ -34,7 +31,7 @@ - static const char *static_ut_name = default_file_name; - - /* This function must be called with the LOCK held */ --static void __setutent_unlocked(void) -+static void __setutent(void) - { - if (static_fd < 0) { - static_fd = open_not_cancel_2(static_ut_name, O_RDWR | O_CLOEXEC); -@@ -53,24 +50,19 @@ - lseek(static_fd, 0, SEEK_SET); - } - #if defined __UCLIBC_HAS_THREADS__ --static void __setutent(void) -+void setutent(void) - { - __UCLIBC_MUTEX_LOCK(utmplock); -- __setutent_unlocked(); -+ __setutent(); - __UCLIBC_MUTEX_UNLOCK(utmplock); - } - #else --static void __setutent(void); --strong_alias(__setutent_unlocked,__setutent) --#endif - strong_alias(__setutent,setutent) -- --#ifdef __UCLIBC_HAS_UTMPX__ --strong_alias(__setutent,setutxent) - #endif -+libc_hidden_def(setutent) - - /* This function must be called with the LOCK held */ --static struct utmp *__getutent_unlocked(void) -+static struct utmp *__getutent(void) - { - if (static_fd < 0) { - __setutent(); -@@ -86,27 +78,19 @@ - return NULL; - } - #if defined __UCLIBC_HAS_THREADS__ --static struct utmp *__getutent(void) -+struct utmp *getutent(void) - { - struct utmp *ret; - - __UCLIBC_MUTEX_LOCK(utmplock); -- ret = __getutent_unlocked(); -+ ret = __getutent(); - __UCLIBC_MUTEX_UNLOCK(utmplock); - return ret; - } - #else --static struct utmp *__getutent(void); --strong_alias(__getutent_unlocked,__getutent) --#endif - strong_alias(__getutent,getutent) -- --#ifdef __UCLIBC_HAS_UTMPX__ --struct utmpx *getutxent(void) --{ -- return (struct utmpx *) __getutent (); --} - #endif -+libc_hidden_def(getutent) - - static void __endutent(void) - { -@@ -117,13 +101,10 @@ - __UCLIBC_MUTEX_UNLOCK(utmplock); - } - strong_alias(__endutent,endutent) -- --#ifdef __UCLIBC_HAS_UTMPX__ --strong_alias(__endutent,endutxent) --#endif -+libc_hidden_def(endutent) - - /* This function must be called with the LOCK held */ --static struct utmp *__getutid_unlocked(const struct utmp *utmp_entry) -+static struct utmp *__getutid(const struct utmp *utmp_entry) - { - struct utmp *lutmp; - unsigned type; -@@ -133,7 +114,7 @@ - type = utmp_entry->ut_type - 1; - type /= 4; - -- while ((lutmp = __getutent_unlocked()) != NULL) { -+ while ((lutmp = __getutent()) != NULL) { - if (type == 0 && lutmp->ut_type == utmp_entry->ut_type) { - /* one of RUN_LVL, BOOT_TIME, NEW_TIME, OLD_TIME */ - return lutmp; -@@ -147,34 +128,26 @@ - return NULL; - } - #if defined __UCLIBC_HAS_THREADS__ --static struct utmp *__getutid(const struct utmp *utmp_entry) -+struct utmp *getutid(const struct utmp *utmp_entry) - { - struct utmp *ret; - - __UCLIBC_MUTEX_LOCK(utmplock); -- ret = __getutid_unlocked(utmp_entry); -+ ret = __getutid(utmp_entry); - __UCLIBC_MUTEX_UNLOCK(utmplock); - return ret; - } - #else --static struct utmp *__getutid(const struct utmp *utmp_entry); --strong_alias(__getutid_unlocked,__getutid) --#endif - strong_alias(__getutid,getutid) -- --#ifdef __UCLIBC_HAS_UTMPX__ --struct utmpx *getutxid(const struct utmpx *utmp_entry) --{ -- return (struct utmpx *) __getutid ((const struct utmp *) utmp_entry); --} - #endif -+libc_hidden_def(getutid) - - static struct utmp *__getutline(const struct utmp *utmp_entry) - { - struct utmp *lutmp; - - __UCLIBC_MUTEX_LOCK(utmplock); -- while ((lutmp = __getutent_unlocked()) != NULL) { -+ while ((lutmp = __getutent()) != NULL) { - if (lutmp->ut_type == USER_PROCESS || lutmp->ut_type == LOGIN_PROCESS) { - if (strncmp(lutmp->ut_line, utmp_entry->ut_line, sizeof(lutmp->ut_line)) == 0) { - break; -@@ -185,13 +158,7 @@ - return lutmp; - } - strong_alias(__getutline,getutline) -- --#ifdef __UCLIBC_HAS_UTMPX__ --struct utmpx *getutxline(const struct utmpx *utmp_entry) --{ -- return (struct utmpx *) __getutline ((const struct utmp *) utmp_entry); --} --#endif -+libc_hidden_def(getutline) - - static struct utmp *__pututline(const struct utmp *utmp_entry) - { -@@ -200,7 +167,7 @@ - the file pointer where they want it, everything will work out. */ - lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR); - -- if (__getutid_unlocked(utmp_entry) != NULL) -+ if (__getutid(utmp_entry) != NULL) - lseek(static_fd, (off_t) - sizeof(struct utmp), SEEK_CUR); - else - lseek(static_fd, (off_t) 0, SEEK_END); -@@ -211,13 +178,7 @@ - return (struct utmp *)utmp_entry; - } - strong_alias(__pututline,pututline) -- --#ifdef __UCLIBC_HAS_UTMPX__ --struct utmpx *pututxline (const struct utmpx *utmp_entry) --{ -- return (struct utmpx *) __pututline ((const struct utmp *) utmp_entry); --} --#endif -+libc_hidden_def(pututline) - - static int __utmpname(const char *new_ut_name) - { -@@ -241,7 +202,4 @@ - return 0; /* or maybe return -(static_ut_name != new_ut_name)? */ - } - strong_alias(__utmpname,utmpname) -- --#ifdef __UCLIBC_HAS_UTMPX__ --strong_alias(__utmpname,utmpxname) --#endif -+libc_hidden_def(utmpname) -Index: git/libc/misc/utmp/utxent.c -=================================================================== ---- git.orig/libc/misc/utmp/utxent.c 2013-01-21 16:37:18.000000000 -0800 -+++ git/libc/misc/utmp/utxent.c 2013-01-21 16:38:14.035578638 -0800 -@@ -13,7 +13,6 @@ - #include <utmpx.h> - #include <utmp.h> - --#if 0 /* moved to utent.c */ - void setutxent(void) - { - setutent (); -@@ -49,12 +48,10 @@ - return utmpname (new_ut_name); - } - --/* moved to wtent.c */ - void updwtmpx (const char *wtmpx_file, const struct utmpx |