[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r11461 - in /trunk: libc/ libc/bits/ libc/debug/ libc/iconvdata/ libc/include/rpc/ libc/libio/ libc/manual/ libc/nis/ libc/n...
- To: commits@xxxxxxxxxx
- Subject: [commits] r11461 - in /trunk: libc/ libc/bits/ libc/debug/ libc/iconvdata/ libc/include/rpc/ libc/libio/ libc/manual/ libc/nis/ libc/n...
- From: joseph@xxxxxxxxxx
- Date: Mon, 06 Sep 2010 15:29:38 -0000
Author: joseph
Date: Mon Sep 6 08:29:36 2010
New Revision: 11461
Log:
Merge changes between r11304 and r11460 from /fsf/trunk.
Added:
trunk/libc/scripts/config-uname.sh
- copied unchanged from r11460, fsf/trunk/libc/scripts/config-uname.sh
trunk/libc/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S
- copied unchanged from r11460, fsf/trunk/libc/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S
trunk/libc/sysdeps/i386/i686/multiarch/strlen-sse2.S
- copied unchanged from r11460, fsf/trunk/libc/sysdeps/i386/i686/multiarch/strlen-sse2.S
trunk/libc/sysdeps/i386/i686/multiarch/varshift.c
- copied unchanged from r11460, fsf/trunk/libc/sysdeps/i386/i686/multiarch/varshift.c
trunk/libc/sysdeps/i386/i686/multiarch/varshift.h
- copied unchanged from r11460, fsf/trunk/libc/sysdeps/i386/i686/multiarch/varshift.h
trunk/libc/sysdeps/x86_64/multiarch/strlen-no-bsf.S
- copied unchanged from r11460, fsf/trunk/libc/sysdeps/x86_64/multiarch/strlen-no-bsf.S
trunk/libc/sysdeps/x86_64/multiarch/strlen-sse4.S
- copied unchanged from r11460, fsf/trunk/libc/sysdeps/x86_64/multiarch/strlen-sse4.S
trunk/libc/sysdeps/x86_64/multiarch/varshift.c
- copied unchanged from r11460, fsf/trunk/libc/sysdeps/x86_64/multiarch/varshift.c
trunk/libc/sysdeps/x86_64/multiarch/varshift.h
- copied unchanged from r11460, fsf/trunk/libc/sysdeps/x86_64/multiarch/varshift.h
Removed:
trunk/libc/config-name.in
Modified:
trunk/libc/ChangeLog
trunk/libc/LICENSES
trunk/libc/NEWS
trunk/libc/bits/sched.h
trunk/libc/configure
trunk/libc/configure.in
trunk/libc/debug/vdprintf_chk.c
trunk/libc/iconvdata/gconv-modules
trunk/libc/include/rpc/pmap_clnt.h
trunk/libc/libio/iofdopen.c
trunk/libc/libio/iofopncook.c
trunk/libc/libio/iovdprintf.c
trunk/libc/libio/oldiofdopen.c
trunk/libc/manual/Makefile
trunk/libc/nis/nis_findserv.c
trunk/libc/nis/rpcsvc/nis.h
trunk/libc/nis/rpcsvc/nis.x
trunk/libc/nis/rpcsvc/nis_callback.h
trunk/libc/nis/rpcsvc/nis_callback.x
trunk/libc/nis/rpcsvc/nis_object.x
trunk/libc/nis/rpcsvc/nis_tags.h
trunk/libc/nis/rpcsvc/yp.h
trunk/libc/nis/rpcsvc/yp.x
trunk/libc/nis/rpcsvc/ypupd.h
trunk/libc/nis/yp_xdr.c
trunk/libc/nis/ypupdate_xdr.c
trunk/libc/nptl/ChangeLog
trunk/libc/nptl/sysdeps/pthread/allocalim.h
trunk/libc/posix/Makefile
trunk/libc/resolv/res_init.c
trunk/libc/stdlib/strtod_l.c
trunk/libc/sunrpc/Versions
trunk/libc/sunrpc/pm_getport.c
trunk/libc/sunrpc/rpc_parse.h
trunk/libc/sysdeps/i386/i686/multiarch/Makefile
trunk/libc/sysdeps/i386/i686/multiarch/strlen.S
trunk/libc/sysdeps/powerpc/powerpc64/dl-machine.h
trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/epoll.h
trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h
trunk/libc/sysdeps/x86_64/add_n.S
trunk/libc/sysdeps/x86_64/addmul_1.S
trunk/libc/sysdeps/x86_64/lshift.S
trunk/libc/sysdeps/x86_64/mul_1.S
trunk/libc/sysdeps/x86_64/multiarch/Makefile
trunk/libc/sysdeps/x86_64/multiarch/init-arch.c
trunk/libc/sysdeps/x86_64/multiarch/init-arch.h
trunk/libc/sysdeps/x86_64/multiarch/memmove.c
trunk/libc/sysdeps/x86_64/multiarch/memmove_chk.c
trunk/libc/sysdeps/x86_64/multiarch/strcspn-c.c
trunk/libc/sysdeps/x86_64/multiarch/strlen.S
trunk/libc/sysdeps/x86_64/multiarch/strspn-c.c
trunk/libc/sysdeps/x86_64/multiarch/strstr.c
trunk/libc/sysdeps/x86_64/rshift.S
trunk/libc/sysdeps/x86_64/strlen.S
trunk/libc/sysdeps/x86_64/sub_n.S
trunk/libc/sysdeps/x86_64/submul_1.S
trunk/ports/ChangeLog.m68k
trunk/ports/sysdeps/unix/sysv/linux/m68k/coldfire/sysdep.h
Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Mon Sep 6 08:29:36 2010
@@ -1,3 +1,176 @@
+2010-09-06 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * manual/Makefile: Don't mix pattern rules with normal rules.
+
+2010-09-05 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * debug/vdprintf_chk.c (__vdprintf_chk): Remove undefined
+ operation.
+ * libio/iofdopen.c (_IO_new_fdopen): Likewise.
+ * libio/iofopncook.c (_IO_cookie_init): Likewise.
+ * libio/iovdprintf.c (_IO_vdprintf): Likewise.
+ * libio/oldiofdopen.c (_IO_old_fdopen): Likewise.
+ * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela):
+ Likewise.
+
+2010-09-04 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #11979]
+ * iconvdata/gconv-modules: Remove EBCDIC-CP-AR2 alias from
+ IBM-930, IBM-933, IBM-935, IBM-937, and IBM-939.
+
+2010-09-02 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/x86_64/add_n.S: Update from GMP 5.0.1.
+ * sysdeps/x86_64/addmul_1.S: Likewise.
+ * sysdeps/x86_64/lshift.S: Likewise.
+ * sysdeps/x86_64/mul_1.S: Likewise.
+ * sysdeps/x86_64/rshift.S: Likewise.
+ * sysdeps/x86_64/sub_n.S: Likewise.
+ * sysdeps/x86_64/submul_1.S: Likewise.
+
+2010-09-01 Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
+
+ This aligns bits/sched.h onto sysdeps/unix/sysv/linux/bits/sched.h:
+ Define __sched_param instead of SCHED_* and sched_param when
+ <bits/sched.h> is included with __need_schedparam defined.
+ * bits/sched.h [__need_schedparam]
+ (SCHED_OTHER, SCHED_FIFO, SCHED_RR, sched_param): Do not define.
+ [!__defined_schedparam && (__need_schedparam || _SCHED_H)]
+ (__defined_schedparam): Define to 1.
+ (__sched_param): New structure, identical to sched_param.
+ (__need_schedparam): Undefine.
+
+2010-08-31 Mike Frysinger <vapier@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/sparc/sys/epoll.h (epoll_create2): Delete.
+ (epoll_create1): Declare.
+
+ * sysdeps/unix/sysv/linux/x86_64/sys/epoll.h: Fix typo.
+
+2010-08-31 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ [BZ #7066]
+ * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix array overflow when
+ shifting retval into place.
+
+2010-09-01 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * nis/rpcsvc/nis.h: Update copyright notice.
+ * nis/rpcsvc/nis.x: Likewise.
+ * nis/rpcsvc/nis_callback.h: Likewise.
+ * nis/rpcsvc/nis_callback.x: Likewise.
+ * nis/rpcsvc/nis_object.x: Likewise.
+ * nis/rpcsvc/nis_tags.h: Likewise.
+ * nis/rpcsvc/yp.h: Likewise.
+ * nis/rpcsvc/yp.x: Likewise.
+ * nis/rpcsvc/ypupd.h: Likewise.
+ * nis/yp_xdr.c: Likewise.
+ * nis/ypupdate_xdr.c: Likewise.
+
+ * sunrpc/pm_getport.c (__libc_rpc_getport): New function. This is
+ mainly the body of pmap_getport. Add parameters to specify timeouts.
+ (pmap_getport): Use __libc_rpc_getport.
+ * sunrpc/Versions: Export __libc_rpc_getport with GLIBC_PRIVATE.
+ * include/rpc/pmap_clnt.h: Declare __libc_rpc_getport.
+ * nis/nis_findserv.c: Remove pmap_getport copy. Use __libc_rpc_getport.
+
+2010-08-31 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Add
+ fanotify_mark.
+
+2010-08-27 Roland McGrath <roland@xxxxxxxxxx>
+
+ * sysdeps/i386/i686/multiarch/Makefile
+ (CFLAGS-varshift.c): New variable.
+
+2010-08-27 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/i386/i686/multiarch/varshift.S: File removed.
+ * sysdeps/i386/i686/multiarch/varshift.c: New file.
+
+ * sysdeps/x86_64/multiarch/strlen-no-bsf.S: Move to .text.slow section.
+
+ * sysdeps/x86_64/strlen.S: Minimal code improvement.
+
+2010-08-26 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ * sysdeps/x86_64/strlen.S: Unroll the loop.
+ * sysdeps/x86_64/multiarch/Makefile (sysdep_routines): Add
+ strlen-sse2 strlen-sse2-bsf.
+ * sysdeps/x86_64/multiarch/strlen.S ((strlen): Return
+ __strlen_no_bsf if bit_Slow_BSF is set.
+ (__strlen_sse42): Removed.
+ * sysdeps/x86_64/multiarch/strlen-no-bsf.S: New file.
+ * sysdeps/x86_64/multiarch/strlen-sse4.S: New file.
+
+2010-08-25 Roland McGrath <roland@xxxxxxxxxx>
+
+ * sysdeps/x86_64/multiarch/varshift.S: File removed.
+ * sysdeps/x86_64/multiarch/varshift.c: New file.
+ * sysdeps/x86_64/multiarch/Makefile (CFLAGS-varshift.c): New variable.
+ * sysdeps/x86_64/multiarch/varshift.h: Clean up decls, fix a cast.
+ * sysdeps/x86_64/multiarch/memmove.c: Move decls around.
+ * sysdeps/x86_64/multiarch/memmove_chk.c: Likewise.
+
+2010-08-25 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ * sysdeps/i386/i686/multiarch/Makefile (sysdep_routines): Add
+ strlen-sse2 strlen-sse2-bsf.
+ * sysdeps/i386/i686/multiarch/strlen.S (strlen): Return
+ __strlen_sse2_bsf if bit_Slow_BSF is unset.
+ (__strlen_sse2): Removed.
+ * sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S: New file.
+ * sysdeps/i386/i686/multiarch/strlen-sse2.S: New file.
+ * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features): Set
+ bit_Slow_BSF for Atom.
+ * sysdeps/x86_64/multiarch/init-arch.h (bit_Slow_BSF): Define.
+ (index_Slow_BSF): Define.
+ (HAS_SLOW_BSF): Define.
+
+2010-08-25 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #10851]
+ * resolv/res_init.c (__res_vinit): When no server address at all
+ is given default to loopback.
+
+2010-08-24 Roland McGrath <roland@xxxxxxxxxx>
+
+ * configure.in: Remove config-name.h generation.
+ * configure: Regenerated.
+ * config-name.in: File removed.
+ * scripts/config-uname.sh: New file.
+ * posix/Makefile (uname.c): Depend on $(objdir)config-name.h.
+ ($(objdir)config-name.h): New target.
+
+ * sunrpc/rpc_parse.h: Avoid nested comment.
+
+2010-08-24 Richard Henderson <rth@xxxxxxxxxx>
+ Ulrich Drepper <drepper@xxxxxxxxxx>
+ H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ * sysdeps/i386/i686/multiarch/Makefile (sysdep_routines): Add varshift.
+ * sysdeps/x86_64/multiarch/Makefile (sysdep_routines): Likewise.
+ * sysdeps/x86_64/multiarch/strcspn-c.c: Include "varshift.h".
+ Replace _mm_srli_si128 with __m128i_shift_right. Replace
+ _mm_alignr_epi8 with _mm_loadu_si128.
+ * sysdeps/x86_64/multiarch/strspn-c.c: Likewise.
+ * sysdeps/x86_64/multiarch/strstr.c: Include "varshift.h".
+ (__m128i_shift_right): Removed.
+ * sysdeps/i386/i686/multiarch/varshift.h: New file.
+ * sysdeps/i386/i686/multiarch/varshift.S: New file.
+ * sysdeps/x86_64/multiarch/varshift.h: New file.
+ * sysdeps/x86_64/multiarch/varshift.S: New file.
+
+2010-08-21 Mike Frysinger <vapier@xxxxxxxxxx>
+
+ * configure.in: Move assembler checks to before sysdep dir checking.
+
+2010-08-20 Petr Baudis <pasky@xxxxxxx>
+
+ * LICENSES: Sync the sunrpc license.
+
2010-08-19 Ulrich Drepper <drepper@xxxxxxxxxx>
* sunrpc/auth_des.c: Update copyright notice once again.
Modified: trunk/libc/LICENSES
==============================================================================
--- trunk/libc/LICENSES (original)
+++ trunk/libc/LICENSES Mon Sep 6 08:29:36 2010
@@ -63,30 +63,34 @@
The Sun RPC support (from rpcsrc-4.0) is covered by the following
license:
-Copyright (C) 1984, Sun Microsystems, Inc.
-
-Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-unrestricted use provided that this legend is included on all tape media
-and as a part of the software program in whole or part. Users may copy
-or modify Sun RPC without charge, but are not authorized to license or
-distribute it to anyone else except as part of a product or program
-developed by the user.
-
-SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-
-Sun RPC is provided with no support and without any obligation on the
-part of Sun Microsystems, Inc. to assist in its use, correction,
-modification or enhancement.
-
-SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-OR ANY PART THEREOF.
-
-In no event will Sun Microsystems, Inc. be liable for any lost revenue
-or profits or other special, indirect and consequential damages, even if
-Sun has been advised of the possibility of such damages.
+Copyright (c) 2010, Oracle America, Inc.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.
+ * Neither the name of the "Oracle America, Inc." nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The following CMU license covers some of the support code for Mach,
Modified: trunk/libc/NEWS
==============================================================================
--- trunk/libc/NEWS (original)
+++ trunk/libc/NEWS Mon Sep 6 08:29:36 2010
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes. 2010-8-14
+GNU C Library NEWS -- history of user-visible changes. 2010-8-25
Copyright (C) 1992-2009, 2010 Free Software Foundation, Inc.
See the end for copying conditions.
@@ -9,7 +9,7 @@
* The following bugs are resolved with this release:
- 11640, 11701, 11840, 11856, 11883, 11903, 11904
+ 7066, 10851, 11640, 11701, 11840, 11856, 11883, 11903, 11904
* New Linux interfaces: prlimit, prlimit64, fanotify_init, fanotify_mark
Modified: trunk/libc/bits/sched.h
==============================================================================
--- trunk/libc/bits/sched.h (original)
+++ trunk/libc/bits/sched.h Mon Sep 6 08:29:36 2010
@@ -18,6 +18,8 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#ifndef __need_schedparam
+
#ifndef _SCHED_H
# error "Never include <bits/sched.h> directly; use <sched.h> instead."
#endif
@@ -33,6 +35,19 @@
{
int __sched_priority;
};
+
+#endif /* need schedparam */
+
+#if !defined __defined_schedparam \
+ && (defined __need_schedparam || defined _SCHED_H)
+# define __defined_schedparam 1
+/* Data structure to describe a process' schedulability. */
+struct __sched_param
+ {
+ int __sched_priority;
+ };
+# undef __need_schedparam
+#endif
#if defined _SCHED_H && !defined __cpu_set_t_defined
Modified: trunk/libc/configure
==============================================================================
--- trunk/libc/configure (original)
+++ trunk/libc/configure Mon Sep 6 08:29:36 2010
@@ -667,9 +667,6 @@
libc_cv_localedir
libc_cv_slibdir
old_glibc_headers
-uname_version
-uname_release
-uname_sysname
libc_cv_gcc_unwind_find_fde
sizeof_long_double
EGREP
@@ -3873,9 +3870,6 @@
multi_arch=default
fi
-if test x"$multi_arch" != xno; then
- multi_arch_d=/multiarch
-fi
# Check whether --enable-experimental-malloc was given.
if test "${enable_experimental_malloc+set}" = set; then
@@ -4309,6 +4303,140 @@
fi
+# For the multi-arch option we need support in the assembler.
+{ $as_echo "$as_me:$LINENO: checking for assembler gnu_indirect_function symbol type support" >&5
+$as_echo_n "checking for assembler gnu_indirect_function symbol type support... " >&6; }
+if test "${libc_cv_asm_gnu_indirect_function+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat > conftest.s <<EOF
+.type foo,%gnu_indirect_function
+EOF
+if ${CC-cc} -c $ASFLAGS conftest.s 1>&5 2>&5;
+then
+ libc_cv_asm_gnu_indirect_function=yes
+else
+ libc_cv_asm_gnu_indirect_function=no
+fi
+rm -f conftest*
+fi
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_asm_gnu_indirect_function" >&5
+$as_echo "$libc_cv_asm_gnu_indirect_function" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking whether .text pseudo-op must be used" >&5
+$as_echo_n "checking whether .text pseudo-op must be used... " >&6; }
+if test "${libc_cv_dot_text+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat > conftest.s <<EOF
+.text
+EOF
+libc_cv_dot_text=
+if { ac_try='${CC-cc} $ASFLAGS -c conftest.s 1>&5'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ libc_cv_dot_text=.text
+fi
+rm -f conftest*
+fi
+
+if test -z "$libc_cv_dot_text"; then
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for assembler global-symbol directive" >&5
+$as_echo_n "checking for assembler global-symbol directive... " >&6; }
+if test "${libc_cv_asm_global_directive+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ libc_cv_asm_global_directive=UNKNOWN
+for ac_globl in .globl .global .EXPORT; do
+ cat > conftest.s <<EOF
+ ${libc_cv_dot_text}
+ ${ac_globl} foo
+foo:
+EOF
+ if { ac_try='${CC-cc} $ASFLAGS -c conftest.s 1>&5'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ libc_cv_asm_global_directive=${ac_globl}
+ fi
+ rm -f conftest*
+ test $libc_cv_asm_global_directive != UNKNOWN && break
+done
+fi
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_asm_global_directive" >&5
+$as_echo "$libc_cv_asm_global_directive" >&6; }
+if test $libc_cv_asm_global_directive = UNKNOWN; then
+ { { $as_echo "$as_me:$LINENO: error: cannot determine asm global directive" >&5
+$as_echo "$as_me: error: cannot determine asm global directive" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >>confdefs.h <<_ACEOF
+#define ASM_GLOBAL_DIRECTIVE ${libc_cv_asm_global_directive}
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for assembler .type directive prefix" >&5
+$as_echo_n "checking for assembler .type directive prefix... " >&6; }
+if test "${libc_cv_asm_type_prefix+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ libc_cv_asm_type_prefix=no
+for ac_try_prefix in '@' '%' '#'; do
+ cat > conftest.s <<EOF
+ ${libc_cv_dot_text}
+ ${libc_cv_asm_global_directive} foo
+ .type foo, ${ac_try_prefix}object
+ .size foo, 1
+foo:
+ .byte 1
+EOF
+ if { ac_try='${CC-cc} $ASFLAGS -c conftest.s 1>&5'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ libc_cv_asm_type_prefix=${ac_try_prefix}
+ fi
+ rm -f conftest*
+ test "x$libc_cv_asm_type_prefix" != xno && break
+done
+fi
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_asm_type_prefix" >&5
+$as_echo "$libc_cv_asm_type_prefix" >&6; }
+if test "x$libc_cv_asm_type_prefix" != xno; then
+ cat >>confdefs.h <<_ACEOF
+#define ASM_TYPE_DIRECTIVE_PREFIX ${libc_cv_asm_type_prefix}
+_ACEOF
+
+fi
+
+if test x"$libc_cv_asm_gnu_indirect_function" != xyes -a x"$libc_cv_asm_type_prefix" = xno; then
+ if test x"$multi_arch" = xyes; then
+ { { $as_echo "$as_me:$LINENO: error: --enable-multi-arch support requires assembler and linker support" >&5
+$as_echo "$as_me: error: --enable-multi-arch support requires assembler and linker support" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ multi_arch=no
+ fi
+fi
+if test x"$multi_arch" != xno; then
+ multi_arch_d=/multiarch
+fi
+
# Compute the list of sysdep directories for this configuration.
# This can take a while to compute.
sysdep_dir=$srcdir/sysdeps
@@ -4425,35 +4553,14 @@
# If the assembler supports gnu_indirect_function symbol type and the
# architecture supports multi-arch, we enable multi-arch by default.
-if test "$multi_arch" = default; then
-{ $as_echo "$as_me:$LINENO: checking for assembler gnu_indirect_function symbol type support" >&5
-$as_echo_n "checking for assembler gnu_indirect_function symbol type support... " >&6; }
-if test "${libc_cv_asm_gnu_indirect_function+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat > conftest.s <<EOF
-.type foo,%gnu_indirect_function
-EOF
-if ${CC-cc} -c $ASFLAGS conftest.s 1>&5 2>&5;
-then
- libc_cv_asm_gnu_indirect_function=yes
-else
- libc_cv_asm_gnu_indirect_function=no
-fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:$LINENO: result: $libc_cv_asm_gnu_indirect_function" >&5
-$as_echo "$libc_cv_asm_gnu_indirect_function" >&6; }
+case $sysnames_add_ons$sysnames in
+*"$multi_arch_d"*)
+ ;;
+*)
multi_arch=no
- if test "$libc_cv_asm_gnu_indirect_function" = yes; then
- case $sysnames_add_ons$sysnames in
- *"$multi_arch_d"*)
- multi_arch=yes
- ;;
- esac
- fi
-fi
-if test x"$multi_arch" = xyes; then
+ ;;
+esac
+if test x"$multi_arch" != xno; then
cat >>confdefs.h <<\_ACEOF
#define USE_MULTIARCH 1
_ACEOF
@@ -6020,71 +6127,6 @@
asm-CPPFLAGS = -P # The assembler can't grok cpp's # line directives."
fi
-{ $as_echo "$as_me:$LINENO: checking whether .text pseudo-op must be used" >&5
-$as_echo_n "checking whether .text pseudo-op must be used... " >&6; }
-if test "${libc_cv_dot_text+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat > conftest.s <<EOF
-.text
-EOF
-libc_cv_dot_text=
-if { ac_try='${CC-cc} $ASFLAGS -c conftest.s 1>&5'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- libc_cv_dot_text=.text
-fi
-rm -f conftest*
-fi
-
-if test -z "$libc_cv_dot_text"; then
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for assembler global-symbol directive" >&5
-$as_echo_n "checking for assembler global-symbol directive... " >&6; }
-if test "${libc_cv_asm_global_directive+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- libc_cv_asm_global_directive=UNKNOWN
-for ac_globl in .globl .global .EXPORT; do
- cat > conftest.s <<EOF
- ${libc_cv_dot_text}
- ${ac_globl} foo
-foo:
-EOF
- if { ac_try='${CC-cc} $ASFLAGS -c conftest.s 1>&5'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- libc_cv_asm_global_directive=${ac_globl}
- fi
- rm -f conftest*
- test $libc_cv_asm_global_directive != UNKNOWN && break
-done
-fi
-{ $as_echo "$as_me:$LINENO: result: $libc_cv_asm_global_directive" >&5
-$as_echo "$libc_cv_asm_global_directive" >&6; }
-if test $libc_cv_asm_global_directive = UNKNOWN; then
- { { $as_echo "$as_me:$LINENO: error: cannot determine asm global directive" >&5
-$as_echo "$as_me: error: cannot determine asm global directive" >&2;}
- { (exit 1); exit 1; }; }
-else
- cat >>confdefs.h <<_ACEOF
-#define ASM_GLOBAL_DIRECTIVE ${libc_cv_asm_global_directive}
-_ACEOF
-
-fi
-
{ $as_echo "$as_me:$LINENO: checking for .set assembler directive" >&5
$as_echo_n "checking for .set assembler directive... " >&6; }
if test "${libc_cv_asm_set_directive+set}" = set; then
@@ -6120,42 +6162,6 @@
fi
-{ $as_echo "$as_me:$LINENO: checking for assembler .type directive prefix" >&5
-$as_echo_n "checking for assembler .type directive prefix... " >&6; }
-if test "${libc_cv_asm_type_prefix+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- libc_cv_asm_type_prefix=no
-for ac_try_prefix in '@' '%' '#'; do
- cat > conftest.s <<EOF
- ${libc_cv_dot_text}
- ${libc_cv_asm_global_directive} foo
- .type foo, ${ac_try_prefix}object
- .size foo, 1
-foo:
- .byte 1
-EOF
- if { ac_try='${CC-cc} $ASFLAGS -c conftest.s 1>&5'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- libc_cv_asm_type_prefix=${ac_try_prefix}
- fi
- rm -f conftest*
- test "x$libc_cv_asm_type_prefix" != xno && break
-done
-fi
-{ $as_echo "$as_me:$LINENO: result: $libc_cv_asm_type_prefix" >&5
-$as_echo "$libc_cv_asm_type_prefix" >&6; }
-if test "x$libc_cv_asm_type_prefix" != xno; then
- cat >>confdefs.h <<_ACEOF
-#define ASM_TYPE_DIRECTIVE_PREFIX ${libc_cv_asm_type_prefix}
-_ACEOF
-
-fi
-
{ $as_echo "$as_me:$LINENO: checking for assembler gnu_unique_object symbol type" >&5
$as_echo_n "checking for assembler gnu_unique_object symbol type... " >&6; }
if test "${libc_cv_asm_unique_object+set}" = set; then
@@ -6180,37 +6186,6 @@
#define HAVE_ASM_UNIQUE_OBJECT 1
_ACEOF
-fi
-
-# For the multi-arch option we need support in the assembler.
-if test "$multi_arch" = yes; then
- if test "x$libc_cv_asm_type_prefix" != xno; then
-{ $as_echo "$as_me:$LINENO: checking for assembler gnu_indirect_function symbol type support" >&5
-$as_echo_n "checking for assembler gnu_indirect_function symbol type support... " >&6; }
-if test "${libc_cv_asm_gnu_indirect_function+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat > conftest.s <<EOF
-.type foo,%gnu_indirect_function
-EOF
-if ${CC-cc} -c $ASFLAGS conftest.s 1>&5 2>&5;
-then
- libc_cv_asm_gnu_indirect_function=yes
-else
- libc_cv_asm_gnu_indirect_function=no
-fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:$LINENO: result: $libc_cv_asm_gnu_indirect_function" >&5
-$as_echo "$libc_cv_asm_gnu_indirect_function" >&6; }
- else
- libc_cv_asm_gnu_indirect_function=no
- fi
- if test x"$libc_cv_asm_gnu_indirect_function" != xyes; then
- { { $as_echo "$as_me:$LINENO: error: --enable-multi-arch support requires assembler and linker support" >&5
-$as_echo "$as_me: error: --enable-multi-arch support requires assembler and linker support" >&2;}
- { (exit 1); exit 1; }; }
- fi
fi
{ $as_echo "$as_me:$LINENO: checking for .symver assembler directive" >&5
@@ -8766,8 +8741,7 @@
libc_cv_idn=no
# Iterate over all the sysdep directories we will use, running their
-# configure fragments, and looking for a uname implementation.
-uname=
+# configure fragments.
for dir in $sysnames; do
case $dir in
/*) dest=$dir ;;
@@ -8778,15 +8752,6 @@
$as_echo "running configure fragment for $dir" >&6; }
. $dest/configure
fi
-
- if test -z "$uname"; then
- if test -r $dest/uname.c ||
- test -r $dest/uname.S ||
- { test -r $dest/syscalls.list &&
- grep '^uname[ ]' $dest/syscalls.list >/dev/null; }; then
- uname=$dir
- fi
- fi
done
if test x$libc_cv_gcc_unwind_find_fde = xyes; then
@@ -8796,75 +8761,6 @@
fi
-
-# If we will use the generic uname implementation, we must figure out what
-# it will say by examining the system, and write the results in config-name.h.
-if test "$uname" = "sysdeps/generic"; then
-
- uname_sysname=`echo $config_os | sed 's/[0-9.]*$//'`
- if test $uname_sysname != $config_os; then
- config_release=`echo $config_os | sed s/$uname_sysname//`
- fi
-
- { $as_echo "$as_me:$LINENO: checking OS release for uname" >&5
-$as_echo_n "checking OS release for uname... " >&6; }
-if test "${libc_cv_uname_release+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -r /vmunix; then
- kernel_id=`strings /vmunix | grep UNIX`
- elif test -r /dynix; then
- kernel_id=`strings /dynix | grep DYNIX`
- else
- kernel_id=
- fi
-
- kernel_release=`echo "$kernel_id" | sed 's/^[^0-9.]*\([0-9.]*\).*$/\1/'`
- if test x`echo "$config_release" | sed "s/^$kernel_release//"` \
- != x$config_release; then
- # The configuration release is a substring of the kernel release.
- libc_cv_uname_release=$kernel_release
- elif test x$config_release != x; then
- libc_cv_uname_release=$config_release
- elif test x$kernel_release != x; then
- libc_cv_uname_release=$kernel_release
- else
- libc_cv_uname_release=unknown
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $libc_cv_uname_release" >&5
-$as_echo "$libc_cv_uname_release" >&6; }
- uname_release="$libc_cv_uname_release"
-
- { $as_echo "$as_me:$LINENO: checking OS version for uname" >&5
-$as_echo_n "checking OS version for uname... " >&6; }
-if test "${libc_cv_uname_version+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -r /vmunix; then
- kernel_id=`strings /vmunix | grep UNIX`
- elif test -r /dynix; then
- kernel_id=`strings /dynix | grep DYNIX`
- else
- kernel_id=
- fi
-
- kernel_version=`echo "$kernel_id" | sed 's/^[^#]*#\([0-9]*\).*$/\1/'`
- if test -n "$kernel_version"; then
- libc_cv_uname_version="$kernel_version"
- else
- libc_cv_uname_version=unknown
- fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $libc_cv_uname_version" >&5
-$as_echo "$libc_cv_uname_version" >&6; }
- uname_version="$libc_cv_uname_version"
-
- config_uname=config-name.h:config-name.in
-else
- # For non-generic uname, we don't need to create config-name.h at all.
- config_uname=
-fi
cat >>confdefs.h <<\_ACEOF
#define USE_IN_LIBIO 1
@@ -8966,7 +8862,7 @@
-ac_config_files="$ac_config_files config.make ${config_makefile} ${config_uname}"
+ac_config_files="$ac_config_files config.make ${config_makefile}"
ac_config_commands="$ac_config_commands default"
@@ -9577,7 +9473,6 @@
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"config.make") CONFIG_FILES="$CONFIG_FILES config.make" ;;
"${config_makefile}") CONFIG_FILES="$CONFIG_FILES ${config_makefile}" ;;
- "${config_uname}") CONFIG_FILES="$CONFIG_FILES ${config_uname}" ;;
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
Modified: trunk/libc/configure.in
==============================================================================
--- trunk/libc/configure.in (original)
+++ trunk/libc/configure.in Mon Sep 6 08:29:36 2010
@@ -278,9 +278,6 @@
[enable single DSO with optimizations for multiple architectures]),
[multi_arch=$enableval],
[multi_arch=default])
-if test x"$multi_arch" != xno; then
- multi_arch_d=/multiarch
-fi
AC_ARG_ENABLE([experimental-malloc],
AC_HELP_STRING([--enable-experimental-malloc],
@@ -608,6 +605,90 @@
AC_DEFINE(USE_REGPARMS)
fi
+# For the multi-arch option we need support in the assembler.
+AC_CACHE_CHECK([for assembler gnu_indirect_function symbol type support],
+ libc_cv_asm_gnu_indirect_function, [dnl
+cat > conftest.s <<EOF
+.type foo,%gnu_indirect_function
+EOF
+if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD;
+then
+ libc_cv_asm_gnu_indirect_function=yes
+else
+ libc_cv_asm_gnu_indirect_function=no
+fi
+rm -f conftest*])
+
+AC_MSG_CHECKING(whether .text pseudo-op must be used)
+AC_CACHE_VAL(libc_cv_dot_text, [dnl
+cat > conftest.s <<EOF
+.text
+EOF
+libc_cv_dot_text=
+if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
+ libc_cv_dot_text=.text
+fi
+rm -f conftest*])
+if test -z "$libc_cv_dot_text"; then
+ AC_MSG_RESULT(no)
+else
+ AC_MSG_RESULT(yes)
+fi
+
+AC_CACHE_CHECK(for assembler global-symbol directive,
+ libc_cv_asm_global_directive, [dnl
+libc_cv_asm_global_directive=UNKNOWN
+for ac_globl in .globl .global .EXPORT; do
+ cat > conftest.s <<EOF
+ ${libc_cv_dot_text}
+ ${ac_globl} foo
+foo:
+EOF
+ if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
+ libc_cv_asm_global_directive=${ac_globl}
+ fi
+ rm -f conftest*
+ test $libc_cv_asm_global_directive != UNKNOWN && break
+done])
+if test $libc_cv_asm_global_directive = UNKNOWN; then
+ AC_MSG_ERROR(cannot determine asm global directive)
+else
+ AC_DEFINE_UNQUOTED(ASM_GLOBAL_DIRECTIVE, ${libc_cv_asm_global_directive})
+fi
+
+AC_CACHE_CHECK(for assembler .type directive prefix,
+ libc_cv_asm_type_prefix, [dnl
+libc_cv_asm_type_prefix=no
+for ac_try_prefix in '@' '%' '#'; do
+ cat > conftest.s <<EOF
+ ${libc_cv_dot_text}
+ ${libc_cv_asm_global_directive} foo
+ .type foo, ${ac_try_prefix}object
+ .size foo, 1
+foo:
+ .byte 1
+EOF
+ if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
+ libc_cv_asm_type_prefix=${ac_try_prefix}
+ fi
+ rm -f conftest*
+ test "x$libc_cv_asm_type_prefix" != xno && break
+done])
+if test "x$libc_cv_asm_type_prefix" != xno; then
+ AC_DEFINE_UNQUOTED(ASM_TYPE_DIRECTIVE_PREFIX, ${libc_cv_asm_type_prefix})
+fi
+
+if test x"$libc_cv_asm_gnu_indirect_function" != xyes -a x"$libc_cv_asm_type_prefix" = xno; then
+ if test x"$multi_arch" = xyes; then
+ AC_MSG_ERROR([--enable-multi-arch support requires assembler and linker support])
+ else
+ multi_arch=no
+ fi
+fi
+if test x"$multi_arch" != xno; then
+ multi_arch_d=/multiarch
+fi
+
# Compute the list of sysdep directories for this configuration.
# This can take a while to compute.
sysdep_dir=$srcdir/sysdeps
@@ -727,29 +808,14 @@
# If the assembler supports gnu_indirect_function symbol type and the
# architecture supports multi-arch, we enable multi-arch by default.
-if test "$multi_arch" = default; then
-AC_CACHE_CHECK([for assembler gnu_indirect_function symbol type support],
- libc_cv_asm_gnu_indirect_function, [dnl
-cat > conftest.s <<EOF
-.type foo,%gnu_indirect_function
-EOF
-if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD;
-then
- libc_cv_asm_gnu_indirect_function=yes
-else
- libc_cv_asm_gnu_indirect_function=no
-fi
-rm -f conftest*])
+case $sysnames_add_ons$sysnames in
+*"$multi_arch_d"*)
+ ;;
+*)
multi_arch=no
- if test "$libc_cv_asm_gnu_indirect_function" = yes; then
- case $sysnames_add_ons$sysnames in
- *"$multi_arch_d"*)
- multi_arch=yes
- ;;
- esac
- fi
-fi
-if test x"$multi_arch" = xyes; then
+ ;;
+esac
+if test x"$multi_arch" != xno; then
AC_DEFINE(USE_MULTIARCH)
fi
AC_SUBST(multi_arch)
@@ -1210,43 +1276,6 @@
asm-CPPFLAGS = -P # The assembler can't grok cpp's # line directives."
fi
-AC_MSG_CHECKING(whether .text pseudo-op must be used)
-AC_CACHE_VAL(libc_cv_dot_text, [dnl
-cat > conftest.s <<EOF
-.text
-EOF
-libc_cv_dot_text=
-if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
- libc_cv_dot_text=.text
-fi
-rm -f conftest*])
-if test -z "$libc_cv_dot_text"; then
- AC_MSG_RESULT(no)
-else
- AC_MSG_RESULT(yes)
-fi
-
-AC_CACHE_CHECK(for assembler global-symbol directive,
- libc_cv_asm_global_directive, [dnl
-libc_cv_asm_global_directive=UNKNOWN
-for ac_globl in .globl .global .EXPORT; do
- cat > conftest.s <<EOF
- ${libc_cv_dot_text}
- ${ac_globl} foo
-foo:
-EOF
- if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
- libc_cv_asm_global_directive=${ac_globl}
- fi
- rm -f conftest*
- test $libc_cv_asm_global_directive != UNKNOWN && break
-done])
-if test $libc_cv_asm_global_directive = UNKNOWN; then
- AC_MSG_ERROR(cannot determine asm global directive)
-else
- AC_DEFINE_UNQUOTED(ASM_GLOBAL_DIRECTIVE, ${libc_cv_asm_global_directive})
-fi
-
AC_CACHE_CHECK(for .set assembler directive, libc_cv_asm_set_directive, [dnl
cat > conftest.s <<EOF
${libc_cv_dot_text}
@@ -1272,28 +1301,6 @@
AC_DEFINE(HAVE_ASM_SET_DIRECTIVE)
fi
-AC_CACHE_CHECK(for assembler .type directive prefix,
- libc_cv_asm_type_prefix, [dnl
-libc_cv_asm_type_prefix=no
-for ac_try_prefix in '@' '%' '#'; do
- cat > conftest.s <<EOF
- ${libc_cv_dot_text}
- ${libc_cv_asm_global_directive} foo
- .type foo, ${ac_try_prefix}object
- .size foo, 1
-foo:
- .byte 1
-EOF
- if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
- libc_cv_asm_type_prefix=${ac_try_prefix}
- fi
- rm -f conftest*
- test "x$libc_cv_asm_type_prefix" != xno && break
-done])
-if test "x$libc_cv_asm_type_prefix" != xno; then
- AC_DEFINE_UNQUOTED(ASM_TYPE_DIRECTIVE_PREFIX, ${libc_cv_asm_type_prefix})
-fi
-
AC_CACHE_CHECK(for assembler gnu_unique_object symbol type,
libc_cv_asm_unique_object, [dnl
cat > conftest.s <<EOF
@@ -1309,29 +1316,6 @@
rm -f conftest*])
if test $libc_cv_asm_unique_object = yes; then
AC_DEFINE(HAVE_ASM_UNIQUE_OBJECT)
-fi
-
-# For the multi-arch option we need support in the assembler.
-if test "$multi_arch" = yes; then
- if test "x$libc_cv_asm_type_prefix" != xno; then
-AC_CACHE_CHECK([for assembler gnu_indirect_function symbol type support],
- libc_cv_asm_gnu_indirect_function, [dnl
-cat > conftest.s <<EOF
-.type foo,%gnu_indirect_function
-EOF
-if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD;
-then
- libc_cv_asm_gnu_indirect_function=yes
-else
- libc_cv_asm_gnu_indirect_function=no
-fi
-rm -f conftest*])
- else
- libc_cv_asm_gnu_indirect_function=no
- fi
- if test x"$libc_cv_asm_gnu_indirect_function" != xyes; then
- AC_MSG_ERROR([--enable-multi-arch support requires assembler and linker support])
- fi
fi
AC_CACHE_CHECK(for .symver assembler directive, libc_cv_asm_symver_directive,
@@ -2232,8 +2216,7 @@
libc_cv_idn=no
# Iterate over all the sysdep directories we will use, running their
-# configure fragments, and looking for a uname implementation.
-uname=
+# configure fragments.
for dir in $sysnames; do
case $dir in
/*) dest=$dir ;;
@@ -2243,80 +2226,12 @@
AC_MSG_RESULT(running configure fragment for $dir)
. $dest/configure
fi
-[
- if test -z "$uname"; then
- if test -r $dest/uname.c ||
- test -r $dest/uname.S ||
- { test -r $dest/syscalls.list &&
- grep '^uname[ ]' $dest/syscalls.list >/dev/null; }; then
- uname=$dir
- fi
- fi
-]dnl
done
if test x$libc_cv_gcc_unwind_find_fde = xyes; then
AC_DEFINE(EXPORT_UNWIND_FIND_FDE)
fi
AC_SUBST(libc_cv_gcc_unwind_find_fde)
-
-# If we will use the generic uname implementation, we must figure out what
-# it will say by examining the system, and write the results in config-name.h.
-if test "$uname" = "sysdeps/generic"; then
-
-changequote(,)dnl
- uname_sysname=`echo $config_os | sed 's/[0-9.]*$//'`
-changequote([,])dnl
- if test $uname_sysname != $config_os; then
- config_release=`echo $config_os | sed s/$uname_sysname//`
- fi
-dnl
-AC_DEFUN(LIBC_KERNEL_ID, [dnl
- if test -r /vmunix; then
- kernel_id=`strings /vmunix | grep UNIX`
- elif test -r /dynix; then
- kernel_id=`strings /dynix | grep DYNIX`
- else
- kernel_id=
- fi
-])dnl
-
- AC_CACHE_CHECK(OS release for uname, libc_cv_uname_release, [dnl
-LIBC_KERNEL_ID
-changequote(,)dnl
- kernel_release=`echo "$kernel_id" | sed 's/^[^0-9.]*\([0-9.]*\).*$/\1/'`
-changequote([,])dnl
- if test x`echo "$config_release" | sed "s/^$kernel_release//"` \
- != x$config_release; then
- # The configuration release is a substring of the kernel release.
- libc_cv_uname_release=$kernel_release
- elif test x$config_release != x; then
- libc_cv_uname_release=$config_release
- elif test x$kernel_release != x; then
- libc_cv_uname_release=$kernel_release
- else
- libc_cv_uname_release=unknown
- fi])
- uname_release="$libc_cv_uname_release"
-
- AC_CACHE_CHECK(OS version for uname, libc_cv_uname_version, [dnl
-LIBC_KERNEL_ID
-changequote(,)dnl
- kernel_version=`echo "$kernel_id" | sed 's/^[^#]*#\([0-9]*\).*$/\1/'`
-changequote([,])dnl
- if test -n "$kernel_version"; then
- libc_cv_uname_version="$kernel_version"
- else
- libc_cv_uname_version=unknown
- fi])
- uname_version="$libc_cv_uname_version"
-
-AC_SUBST(uname_sysname) AC_SUBST(uname_release) AC_SUBST(uname_version)dnl
- config_uname=config-name.h:config-name.in
-else
- # For non-generic uname, we don't need to create config-name.h at all.
- config_uname=
-fi
dnl This is tested by existing code and it's simpler to avoid changing it.
AC_DEFINE(USE_IN_LIBIO)
@@ -2401,7 +2316,7 @@
AC_SUBST(VERSION)
AC_SUBST(RELEASE)
-AC_CONFIG_FILES([config.make ${config_makefile} ${config_uname}])
+AC_CONFIG_FILES([config.make ${config_makefile}])
AC_CONFIG_COMMANDS([default],[[
case $CONFIG_FILES in *config.make*)
echo "$config_vars" >> config.make;;
Modified: trunk/libc/debug/vdprintf_chk.c
==============================================================================
--- trunk/libc/debug/vdprintf_chk.c (original)
+++ trunk/libc/debug/vdprintf_chk.c Mon Sep 6 08:29:36 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1997-2000, 2001, 2002, 2003, 2006, 2008
+/* Copyright (C) 1995, 1997-2000, 2001, 2002, 2003, 2006, 2008, 2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -50,10 +50,10 @@
INTUSE(_IO_un_link) (&tmpfil);
return EOF;
}
- tmpfil.file._IO_file_flags =
- (_IO_mask_flags (&tmpfil.file, _IO_NO_READS,
- _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING)
- | _IO_DELETE_DONT_CLOSE);
+ tmpfil.file._flags |= _IO_DELETE_DONT_CLOSE;
+
+ _IO_mask_flags (&tmpfil.file, _IO_NO_READS,
+ _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
/* For flags > 0 (i.e. __USE_FORTIFY_LEVEL > 1) request that %n
can only come from read-only format strings. */
Modified: trunk/libc/iconvdata/gconv-modules
==============================================================================
--- trunk/libc/iconvdata/gconv-modules (original)
+++ trunk/libc/iconvdata/gconv-modules Mon Sep 6 08:29:36 2010
@@ -938,7 +938,6 @@
# from to module cost
alias IBM-930// IBM930//
alias CP930// IBM930//
-alias EBCDIC-CP-AR2// IBM930//
alias CSIBM930// IBM930//
module IBM930// INTERNAL IBM930 1
module INTERNAL IBM930// IBM930 1
@@ -952,7 +951,6 @@
# from to module cost
alias IBM-933// IBM933//
alias CP933// IBM933//
-alias EBCDIC-CP-AR2// IBM933//
alias CSIBM933// IBM933//
module IBM933// INTERNAL IBM933 1
module INTERNAL IBM933// IBM933 1
@@ -960,7 +958,6 @@
# from to module cost
alias IBM-935// IBM935//
alias CP935// IBM935//
-alias EBCDIC-CP-AR2// IBM935//
alias CSIBM935// IBM935//
module IBM935// INTERNAL IBM935 1
module INTERNAL IBM935// IBM935 1
@@ -968,7 +965,6 @@
# from to module cost
alias IBM-937// IBM937//
alias CP937// IBM937//
-alias EBCDIC-CP-AR2// IBM937//
alias CSIBM937// IBM937//
module IBM937// INTERNAL IBM937 1
module INTERNAL IBM937// IBM937 1
@@ -976,7 +972,6 @@
# from to module cost
alias IBM-939// IBM939//
alias CP939// IBM939//
-alias EBCDIC-CP-AR2// IBM939//
alias CSIBM939// IBM939//
module IBM939// INTERNAL IBM939 1
module INTERNAL IBM939// IBM939 1
Modified: trunk/libc/include/rpc/pmap_clnt.h
==============================================================================
--- trunk/libc/include/rpc/pmap_clnt.h (original)
+++ trunk/libc/include/rpc/pmap_clnt.h Mon Sep 6 08:29:36 2010
@@ -8,5 +8,10 @@
/* Defined in pm_getport.c. */
extern int __get_socket (struct sockaddr_in *saddr)
attribute_hidden internal_function;
+extern u_short __libc_rpc_getport (struct sockaddr_in *address, u_long program,
+ u_long version, u_int protocol,
+ time_t timeout_sec, time_t tottimeout_sec)
+ internal_function;
+libc_hidden_proto (__libc_rpc_getport)
#endif
Modified: trunk/libc/libio/iofdopen.c
==============================================================================
--- trunk/libc/libio/iofdopen.c (original)
+++ trunk/libc/libio/iofdopen.c Mon Sep 6 08:29:36 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1994,1997,1998,1999,2000,2002,2003
+/* Copyright (C) 1993,1994,1997,1998,1999,2000,2002,2003,2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -172,9 +172,8 @@
}
new_f->fp.file._flags &= ~_IO_DELETE_DONT_CLOSE;
- new_f->fp.file._IO_file_flags =
- _IO_mask_flags (&new_f->fp.file, read_write,
- _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
+ _IO_mask_flags (&new_f->fp.file, read_write,
+ _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
return &new_f->fp.file;
}
Modified: trunk/libc/libio/iofopncook.c
==============================================================================
--- trunk/libc/libio/iofopncook.c (original)
+++ trunk/libc/libio/iofopncook.c Mon Sep 6 08:29:36 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,95,97,99,2000,2002,2004, 2005
+/* Copyright (C) 1993,95,97,99,2000,2002,2004, 2005, 2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -154,9 +154,8 @@
INTUSE(_IO_file_init) (&cfile->__fp);
- cfile->__fp.file._IO_file_flags =
- _IO_mask_flags (&cfile->__fp.file, read_write,
- _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
+ _IO_mask_flags (&cfile->__fp.file, read_write,
+ _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
/* We use a negative number different from -1 for _fileno to mark that
this special stream is not associated with a real file, but still has
Modified: trunk/libc/libio/iovdprintf.c
==============================================================================
--- trunk/libc/libio/iovdprintf.c (original)
+++ trunk/libc/libio/iovdprintf.c Mon Sep 6 08:29:36 2010
@@ -53,10 +53,10 @@
INTUSE(_IO_un_link) (&tmpfil);
return EOF;
}
- tmpfil.file._IO_file_flags =
- (_IO_mask_flags (&tmpfil.file, _IO_NO_READS,
- _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING)
- | _IO_DELETE_DONT_CLOSE);
+ tmpfil.file._flags |= _IO_DELETE_DONT_CLOSE;
+
+ _IO_mask_flags (&tmpfil.file, _IO_NO_READS,
+ _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
done = INTUSE(_IO_vfprintf) (&tmpfil.file, format, arg);
Modified: trunk/libc/libio/oldiofdopen.c
==============================================================================
--- trunk/libc/libio/oldiofdopen.c (original)
+++ trunk/libc/libio/oldiofdopen.c Mon Sep 6 08:29:36 2010
@@ -130,9 +130,8 @@
}
new_f->fp.file._file._flags &= ~_IO_DELETE_DONT_CLOSE;
- new_f->fp.file._file._IO_file_flags =
- _IO_mask_flags (&new_f->fp.file._file, read_write,
- _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
+ _IO_mask_flags (&new_f->fp.file._file, read_write,
+ _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
return (_IO_FILE *) &new_f->fp;
}
Modified: trunk/libc/manual/Makefile
==============================================================================
--- trunk/libc/manual/Makefile (original)
+++ trunk/libc/manual/Makefile Mon Sep 6 08:29:36 2010
@@ -243,7 +243,10 @@
.PHONY: stubs
stubs: $(objpfx)stubs
endif
-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
+$(objpfx)stubs ../po/manual.pot:
+ $(make-target-directory)
+ touch $@
+$(objpfx)stamp%:
$(make-target-directory)
touch $@
Modified: trunk/libc/nis/nis_findserv.c
==============================================================================
--- trunk/libc/nis/nis_findserv.c (original)
+++ trunk/libc/nis/nis_findserv.c Mon Sep 6 08:29:36 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 2000, 2001, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@xxxxxxxxxxxxxxxxxxx>, 1997.
@@ -47,15 +47,6 @@
};
-/* The following is the original routine from sunrpc/pm_getport.c.
- The only change is the much shorter timeout. */
-/*
- * pmap_getport.c
- * Client interface to pmap rpc service.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
/*
* Find the mapped port for program,version.
* Calls the pmap service remotely to do the lookup.
@@ -65,39 +56,7 @@
__pmap_getnisport (struct sockaddr_in *address, u_long program,
u_long version, u_int protocol)
{
- const struct timeval timeout = {1, 0};
- const struct timeval tottimeout = {1, 0};
- u_short port = 0;
- int socket = -1;
- CLIENT *client;
- struct pmap parms;
-
- address->sin_port = htons (PMAPPORT);
- client = clntudp_bufcreate (address, PMAPPROG, PMAPVERS, timeout, &socket,
- RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
- if (client != (CLIENT *) NULL)
- {
- parms.pm_prog = program;
- parms.pm_vers = version;
- parms.pm_prot = protocol;
- parms.pm_port = 0; /* not needed or used */
- if (CLNT_CALL (client, PMAPPROC_GETPORT, (xdrproc_t) xdr_pmap,
- (caddr_t) & parms, (xdrproc_t) xdr_u_short,
- (caddr_t) & port, tottimeout) != RPC_SUCCESS)
- {
- rpc_createerr.cf_stat = RPC_PMAPFAILURE;
- clnt_geterr (client, &rpc_createerr.cf_error);
- }
- else
- {
- if (port == 0)
- rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
- }
- CLNT_DESTROY (client);
- }
- /* (void)close(socket); CLNT_DESTROY already closed it */
- address->sin_port = 0;
- return port;
+ return __libc_rpc_getport (address, program, version, protocol, 1, 1);
}
/* This is now the public function, which should find the fastest server */
Modified: trunk/libc/nis/rpcsvc/nis.h
==============================================================================
--- trunk/libc/nis/rpcsvc/nis.h (original)
+++ trunk/libc/nis/rpcsvc/nis.h Mon Sep 6 08:29:36 2010
@@ -1,31 +1,32 @@
/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
+ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _RPCSVC_NIS_H
@@ -42,7 +43,7 @@
*
* This file is the main include file for NIS clients. It contains
* both the client library function defines and the various data
- * structures used by the NIS service. It includes the file nis_tags.h
+ * structures used by the NIS service. It includes the file nis_tags.h
* which defines the tag values. This allows the tags to change without
* having to change the nis.x file.
*
@@ -119,8 +120,8 @@
typedef enum nstype nstype;
struct oar_mask {
- uint32_t oa_rights;
- zotypes oa_otype;
+ uint32_t oa_rights;
+ zotypes oa_otype;
};
typedef struct oar_mask oar_mask;
Modified: trunk/libc/nis/rpcsvc/nis.x
==============================================================================
--- trunk/libc/nis/rpcsvc/nis.x (original)
+++ trunk/libc/nis/rpcsvc/nis.x Mon Sep 6 08:29:36 2010
@@ -1,31 +1,32 @@
%/*
-% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-% * unrestricted use provided that this legend is included on all tape
-% * media and as a part of the software program in whole or part. Users
-% * may copy or modify Sun RPC without charge, but are not authorized
-% * to license or distribute it to anyone else except as part of a product or
-% * program developed by the user or with the express written consent of
-% * Sun Microsystems, Inc.
-% *
-% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-% *
-% * Sun RPC is provided with no support and without any obligation on the
-% * part of Sun Microsystems, Inc. to assist in its use, correction,
-% * modification or enhancement.
-% *
-% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-% * OR ANY PART THEREOF.
-% *
-% * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-% * or profits or other special, indirect and consequential damages, even if
-% * Sun has been advised of the possibility of such damages.
-% *
-% * Sun Microsystems, Inc.
-% * 2550 Garcia Avenue
-% * Mountain View, California 94043
+% * Copyright (c) 2010, Oracle America, Inc.
+% *
+% * Redistribution and use in source and binary forms, with or without
+% * modification, are permitted provided that the following conditions are
+% * met:
+% *
+% * * Redistributions of source code must retain the above copyright
+% * notice, this list of conditions and the following disclaimer.
+% * * Redistributions in binary form must reproduce the above
+% * copyright notice, this list of conditions and the following
+% * disclaimer in the documentation and/or other materials
+% * provided with the distribution.
+% * * Neither the name of the "Oracle America, Inc." nor the names of its
+% * contributors may be used to endorse or promote products derived
+% * from this software without specific prior written permission.
+% *
+% * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+% * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+% * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+% * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+% * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+% * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+% * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+% * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+% * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+% * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+% * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+% * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
% */
#ifdef RPC_HDR
@@ -34,7 +35,7 @@
% *
% * This file is the main include file for NIS clients. It contains
% * both the client library function defines and the various data
-% * structures used by the NIS service. It includes the file nis_tags.h
+% * structures used by the NIS service. It includes the file nis_tags.h
% * which defines the tag values. This allows the tags to change without
% * having to change the nis.x file.
% *
@@ -57,10 +58,10 @@
/* Errors that can be returned by the service */
enum nis_error {
- NIS_SUCCESS = 0, /* A-ok, let's rock n roll */
- NIS_S_SUCCESS = 1, /* Name found (maybe) */
- NIS_NOTFOUND = 2, /* Name definitely not found */
- NIS_S_NOTFOUND = 3, /* Name maybe not found */
+ NIS_SUCCESS = 0, /* A-ok, let's rock n roll */
+ NIS_S_SUCCESS = 1, /* Name found (maybe) */
+ NIS_NOTFOUND = 2, /* Name definitely not found */
+ NIS_S_NOTFOUND = 3, /* Name maybe not found */
NIS_CACHEEXPIRED = 4, /* Name exists but cache out of date */
NIS_NAMEUNREACHABLE = 5, /* Can't get there from here */
NIS_UNKNOWNOBJ = 6, /* Object type is bogus */
@@ -81,7 +82,7 @@
NIS_NOTUNIQUE = 21, /* Value is not uniques (entry) */
NIS_IBMODERROR = 22, /* Inf. Base. Modify error. */
NIS_NOSUCHTABLE = 23, /* Name for table was wrong */
- NIS_TYPEMISMATCH = 24, /* Entry and table type mismatch */
+ NIS_TYPEMISMATCH = 24, /* Entry and table type mismatch */
NIS_LINKNAMEERROR = 25, /* Link points to bogus name */
NIS_PARTIAL = 26, /* Partial success, found table */
NIS_TOOMANYATTRS = 27, /* Too many attributes */
@@ -118,9 +119,9 @@
struct nis_result {
nis_error status; /* Status of the response */
- nis_object objects<>; /* objects found */
- netobj cookie; /* Cookie Data */
- uint32_t zticks; /* server ticks */
+ nis_object objects<>; /* objects found */
+ netobj cookie; /* Cookie Data */
+ uint32_t zticks; /* server ticks */
uint32_t dticks; /* DBM ticks. */
uint32_t aticks; /* Cache (accel) ticks */
uint32_t cticks; /* Client ticks */
@@ -148,9 +149,9 @@
*/
struct ib_request {
- nis_name ibr_name; /* The name of the Table */
- nis_attr ibr_srch<>; /* The search critereia */
- uint32_t ibr_flags; /* Optional flags */
+ nis_name ibr_name; /* The name of the Table */
+ nis_attr ibr_srch<>; /* The search critereia */
+ uint32_t ibr_flags; /* Optional flags */
nis_object ibr_obj<1>; /* optional object (add/modify) */
nis_server ibr_cbhost<1>; /* Optional callback info */
u_int ibr_bufsize; /* Optional first/next bufsize */
@@ -177,11 +178,11 @@
*/
enum log_entry_t {
LOG_NOP = 0,
- ADD_NAME = 1, /* Name Added to name space */
- REM_NAME = 2, /* Name removed from name space */
- MOD_NAME_OLD = 3, /* Name was modified in the name space */
- MOD_NAME_NEW = 4, /* Name was modified in the name space */
- ADD_IBASE = 5, /* Entry added to information base */
+ ADD_NAME = 1, /* Name Added to name space */
+ REM_NAME = 2, /* Name removed from name space */
+ MOD_NAME_OLD = 3, /* Name was modified in the name space */
+ MOD_NAME_NEW = 4, /* Name was modified in the name space */
+ ADD_IBASE = 5, /* Entry added to information base */
REM_IBASE = 6, /* Entry removed from information base */
MOD_IBASE = 7, /* Entry was modified in information base */
UPD_STAMP = 8 /* Update timestamp (used as fenceposts) */
@@ -195,24 +196,24 @@
* 'name'.
*/
struct log_entry {
- uint32_t le_time; /* Time in seconds */
- log_entry_t le_type; /* Type of log entry */
+ uint32_t le_time; /* Time in seconds */
+ log_entry_t le_type; /* Type of log entry */
nis_name le_princp; /* Principal making the change */
- nis_name le_name; /* Name of table/dir involved */
+ nis_name le_name; /* Name of table/dir involved */
nis_attr le_attrs<>; /* List of AV pairs. */
- nis_object le_object; /* Actual object value */
+ nis_object le_object; /* Actual object value */
};
struct log_result {
- nis_error lr_status; /* The status itself */
+ nis_error lr_status; /* The status itself */
netobj lr_cookie; /* Used by the dump callback */
- log_entry lr_entries<>; /* zero or more entries */
+ log_entry lr_entries<>; /* zero or more entries */
};
struct cp_result {
- nis_error cp_status; /* Status of the checkpoint */
- uint32_t cp_zticks; /* Service 'ticks' */
- uint32_t cp_dticks; /* Database 'ticks' */
+ nis_error cp_status; /* Status of the checkpoint */
+ uint32_t cp_zticks; /* Service 'ticks' */
+ uint32_t cp_dticks; /* Database 'ticks' */
};
/*
@@ -222,7 +223,7 @@
* and to set or reset state variables.
*/
struct nis_tag {
- uint32_t tag_type; /* Statistic tag (may vary) */
+ uint32_t tag_type; /* Statistic tag (may vary) */
string tag_val<>; /* Statistic value may also vary */
};
@@ -231,7 +232,7 @@
};
struct dump_args {
- nis_name da_dir; /* Directory to dump */
+ nis_name da_dir; /* Directory to dump */
uint32_t da_time; /* From this timestamp */
nis_server da_cbhost<1>; /* Callback to use. */
};
@@ -243,9 +244,9 @@
struct fd_result {
nis_error status; /* Status returned by function */
- nis_name source; /* Source of this answer */
- opaque dir_data<>; /* Directory Data (XDR'ed) */
- opaque signature<>; /* Signature of the source */
+ nis_name source; /* Source of this answer */
+ opaque dir_data<>; /* Directory Data (XDR'ed) */
+ opaque signature<>; /* Signature of the source */
};
%/*
@@ -372,7 +373,7 @@
%
%/* Structure for storing dynamically allocated static data */
%struct nis_sdata {
-% void *buf; /* Memory allocation pointer */
+% void *buf; /* Memory allocation pointer */
% u_int size; /* Buffer size */
%};
%
Modified: trunk/libc/nis/rpcsvc/nis_callback.h
==============================================================================
--- trunk/libc/nis/rpcsvc/nis_callback.h (original)
+++ trunk/libc/nis/rpcsvc/nis_callback.h Mon Sep 6 08:29:36 2010
@@ -1,31 +1,32 @@
/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
+ * Copyright (c) 2010, Oracle America, Inc.
*
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
*
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _RPCSVC_NIS_CALLBACK_H
#define _RPCSVC_NIS_CALLBACK_H 1
Modified: trunk/libc/nis/rpcsvc/nis_callback.x
==============================================================================
--- trunk/libc/nis/rpcsvc/nis_callback.x (original)
+++ trunk/libc/nis/rpcsvc/nis_callback.x Mon Sep 6 08:29:36 2010
@@ -1,44 +1,42 @@
%/*
-% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-% * unrestricted use provided that this legend is included on all tape
-% * media and as a part of the software program in whole or part. Users
-% * may copy or modify Sun RPC without charge, but are not authorized
-% * to license or distribute it to anyone else except as part of a product or
-% * program developed by the user or with the express written consent of
-% * Sun Microsystems, Inc.
+% * Copyright (c) 2010, Oracle America, Inc.
% *
-% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+% * Redistribution and use in source and binary forms, with or without
+% * modification, are permitted provided that the following conditions are
+% * met:
% *
-% * Sun RPC is provided with no support and without any obligation on the
-% * part of Sun Microsystems, Inc. to assist in its use, correction,
-% * modification or enhancement.
+% * * Redistributions of source code must retain the above copyright
+% * notice, this list of conditions and the following disclaimer.
+% * * Redistributions in binary form must reproduce the above
+% * copyright notice, this list of conditions and the following
+% * disclaimer in the documentation and/or other materials
+% * provided with the distribution.
+% * * Neither the name of the "Oracle America, Inc." nor the names of its
+% * contributors may be used to endorse or promote products derived
+% * from this software without specific prior written permission.
% *
-% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-% * OR ANY PART THEREOF.
-% *
-% * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-% * or profits or other special, indirect and consequential damages, even if
-% * Sun has been advised of the possibility of such damages.
-% *
-% * Sun Microsystems, Inc.
-% * 2550 Garcia Avenue
-% * Mountain View, California 94043
+% * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+% * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+% * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+% * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+% * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+% * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+% * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+% * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+% * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+% * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+% * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+% * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
% */
/*
* nis_callback.x
- *
- * Copyright (c) 1988-1992 Sun Microsystems Inc
- * All Rights Reserved.
*/
-%#pragma ident "@(#)nis_callback.x 1.7 94/05/03 SMI"
+%#pragma ident "@(#)nis_callback.x 1.7 94/05/03"
/*
- * "@(#)zns_cback.x 1.2 90/09/10 Copyr 1990 Sun Micro"
+ * "@(#)zns_cback.x 1.2 90/09/10"
*
* RPCL description of the Callback Service.
*/
Modified: trunk/libc/nis/rpcsvc/nis_object.x
==============================================================================
--- trunk/libc/nis/rpcsvc/nis_object.x (original)
+++ trunk/libc/nis/rpcsvc/nis_object.x Mon Sep 6 08:29:36 2010
@@ -1,11 +1,37 @@
/*
* nis_object.x
*
- * Copyright (c) 1988-1992 Sun Microsystems Inc
- * All Rights Reserved.
- */
-
-%#pragma ident "@(#)nis_object.x 1.12 97/11/19 SMI"
+ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+%#pragma ident "@(#)nis_object.x 1.12 97/11/19"
#if RPC_HDR
%
@@ -14,7 +40,7 @@
%
#endif
/*
- * This file defines the format for a NIS object in RPC language.
+ * This file defines the format for a NIS object in RPC language.
* It is included by the main .x file and the database access protocol
* file. It is common because both of them need to deal with the same
* type of object. Generating the actual code though is a bit messy because
@@ -54,8 +80,8 @@
* optional set of attribute/value pairs.
*/
struct nis_attr {
- string zattr_ndx<>; /* name of the index */
- opaque zattr_val<>; /* Value for the attribute. */
+ string zattr_ndx<>; /* name of the index */
+ opaque zattr_val<>; /* Value for the attribute. */
};
typedef string nis_name<>; /* The NIS name itself. */
@@ -63,7 +89,7 @@
/* NIS object types are defined by the following enumeration. The numbers
* they use are based on the following scheme :
* 0 - 1023 are reserved for Sun,
- * 1024 - 2047 are defined to be private to a particular tree.
+ * 1024 - 2047 are defined to be private to a particular tree.
* 2048 - 4095 are defined to be user defined.
* 4096 - ... are reserved for future use.
*
@@ -74,22 +100,22 @@
enum zotypes {
- BOGUS_OBJ = 0, /* Uninitialized object structure */
- NO_OBJ = 1, /* NULL object (no data) */
- DIRECTORY_OBJ = 2, /* Directory object describing domain */
- GROUP_OBJ = 3, /* Group object (a list of names) */
- TABLE_OBJ = 4, /* Table object (a database schema) */
- ENTRY_OBJ = 5, /* Entry object (a database record) */
- LINK_OBJ = 6, /* A name link. */
- PRIVATE_OBJ = 7, /* Private object (all opaque data) */
-
- NIS_BOGUS_OBJ = 0, /* Uninitialized object structure */
- NIS_NO_OBJ = 1, /* NULL object (no data) */
- NIS_DIRECTORY_OBJ = 2, /* Directory object describing domain */
- NIS_GROUP_OBJ = 3, /* Group object (a list of names) */
- NIS_TABLE_OBJ = 4, /* Table object (a database schema) */
- NIS_ENTRY_OBJ = 5, /* Entry object (a database record) */
- NIS_LINK_OBJ = 6, /* A name link. */
+ BOGUS_OBJ = 0, /* Uninitialized object structure */
+ NO_OBJ = 1, /* NULL object (no data) */
+ DIRECTORY_OBJ = 2, /* Directory object describing domain */
+ GROUP_OBJ = 3, /* Group object (a list of names) */
+ TABLE_OBJ = 4, /* Table object (a database schema) */
+ ENTRY_OBJ = 5, /* Entry object (a database record) */
+ LINK_OBJ = 6, /* A name link. */
+ PRIVATE_OBJ = 7, /* Private object (all opaque data) */
+
+ NIS_BOGUS_OBJ = 0, /* Uninitialized object structure */
+ NIS_NO_OBJ = 1, /* NULL object (no data) */
+ NIS_DIRECTORY_OBJ = 2, /* Directory object describing domain */
+ NIS_GROUP_OBJ = 3, /* Group object (a list of names) */
+ NIS_TABLE_OBJ = 4, /* Table object (a database schema) */
+ NIS_ENTRY_OBJ = 5, /* Entry object (a database record) */
+ NIS_LINK_OBJ = 6, /* A name link. */
NIS_PRIVATE_OBJ = 7 /* Private object (all opaque data) */
};
@@ -124,8 +150,8 @@
* administrator's approval.
*/
struct oar_mask {
- uint32_t oa_rights; /* Access rights mask */
- zotypes oa_otype; /* Object type */
+ uint32_t oa_rights; /* Access rights mask */
+ zotypes oa_otype; /* Object type */
};
struct endpoint {
@@ -140,17 +166,17 @@
* the expected lifetime of this service.
*/
struct nis_server {
- nis_name name; /* Principal name of the server */
- endpoint ep<>; /* Universal addr(s) for server */
+ nis_name name; /* Principal name of the server */
+ endpoint ep<>; /* Universal addr(s) for server */
uint32_t key_type; /* Public key type */
- netobj pkey; /* server's public key */
+ netobj pkey; /* server's public key */
};
struct directory_obj {
nis_name do_name; /* Name of the directory being served */
- nstype do_type; /* one of NIS, DNS, IVY, YP, or X.500 */
- nis_server do_servers<>; /* <0> == Primary name server */
- uint32_t do_ttl; /* Time To Live (for caches) */
+ nstype do_type; /* one of NIS, DNS, IVY, YP, or X.500 */
+ nis_server do_servers<>; /* <0> == Primary name server */
+ uint32_t do_ttl; /* Time To Live (for caches) */
oar_mask do_armask<>; /* Create/Destroy rights by object type */
};
@@ -163,10 +189,10 @@
* entry but got to it through a LINK rather than directly.
* If the entry is a "standalone" entry then this field is void.
*/
-const EN_BINARY = 1; /* Indicates value is binary data */
+const EN_BINARY = 1; /* Indicates value is binary data */
const EN_CRYPT = 2; /* Indicates the value is encrypted */
const EN_XDR = 4; /* Indicates the value is XDR encoded */
-const EN_MODIFIED = 8; /* Indicates entry is modified. */
+const EN_MODIFIED = 8; /* Indicates entry is modified. */
const EN_ASN1 = 64; /* Means contents use ASN.1 encoding */
struct entry_col {
@@ -175,7 +201,7 @@
};
struct entry_obj {
- string en_type<>; /* Type of entry such as "passwd" */
+ string en_type<>; /* Type of entry such as "passwd" */
entry_col en_cols<>; /* Value for the entry */
};
@@ -187,7 +213,7 @@
*/
struct group_obj {
uint32_t gr_flags; /* Flags controlling group */
- nis_name gr_members<>; /* List of names in group */
+ nis_name gr_members<>; /* List of names in group */
};
/*
@@ -200,7 +226,7 @@
struct link_obj {
zotypes li_rtype; /* Real type of the object */
nis_attr li_attrs<>; /* Attribute/Values for tables */
- nis_name li_name; /* The object's real NIS name */
+ nis_name li_name; /* The object's real NIS name */
};
/*
@@ -219,8 +245,8 @@
* column value.
*/
-const TA_BINARY = 1; /* Means table data is binary */
-const TA_CRYPT = 2; /* Means value should be encrypted */
+const TA_BINARY = 1; /* Means table data is binary */
+const TA_CRYPT = 2; /* Means value should be encrypted */
const TA_XDR = 4; /* Means value is XDR encoded */
const TA_SEARCHABLE = 8; /* Means this column is searchable */
const TA_CASE = 16; /* Means this column is Case Sensitive */
@@ -228,16 +254,16 @@
const TA_ASN1 = 64; /* Means contents use ASN.1 encoding */
struct table_col {
- string tc_name<64>; /* Column Name */
+ string tc_name<64>; /* Column Name */
uint32_t tc_flags; /* control flags */
uint32_t tc_rights; /* Access rights mask */
};
struct table_obj {
- string ta_type<64>; /* Table type such as "passwd" */
+ string ta_type<64>; /* Table type such as "passwd" */
int ta_maxcol; /* Total number of columns */
- u_char ta_sep; /* Separator character */
- table_col ta_cols<>; /* The number of table indexes */
+ u_char ta_sep; /* Separator character */
+ table_col ta_cols<>; /* The number of table indexes */
string ta_path<>; /* A search path for this table */
};
@@ -245,24 +271,24 @@
* This union joins together all of the currently known objects.
*/
union objdata switch (zotypes zo_type) {
- case NIS_DIRECTORY_OBJ :
- struct directory_obj di_data;
- case NIS_GROUP_OBJ :
- struct group_obj gr_data;
- case NIS_TABLE_OBJ :
- struct table_obj ta_data;
- case NIS_ENTRY_OBJ:
- struct entry_obj en_data;
- case NIS_LINK_OBJ :
- struct link_obj li_data;
- case NIS_PRIVATE_OBJ :
- opaque po_data<>;
+ case NIS_DIRECTORY_OBJ :
+ struct directory_obj di_data;
+ case NIS_GROUP_OBJ :
+ struct group_obj gr_data;
+ case NIS_TABLE_OBJ :
+ struct table_obj ta_data;
+ case NIS_ENTRY_OBJ:
+ struct entry_obj en_data;
+ case NIS_LINK_OBJ :
+ struct link_obj li_data;
+ case NIS_PRIVATE_OBJ :
+ opaque po_data<>;
case NIS_NO_OBJ :
void;
- case NIS_BOGUS_OBJ :
+ case NIS_BOGUS_OBJ :
void;
- default :
- void;
+ default :
+ void;
};
/*
@@ -281,7 +307,7 @@
* new position and calculate the size.
*/
struct nis_oid {
- uint32_t ctime; /* Time of objects creation */
+ uint32_t ctime; /* Time of objects creation */
uint32_t mtime; /* Time of objects modification */
};
@@ -293,7 +319,7 @@
nis_name zo_domain; /* The administrator for the object */
uint32_t zo_access; /* Access rights (owner, group, world) */
uint32_t zo_ttl; /* Object's time to live in seconds. */
- objdata zo_data; /* Data structure for this type */
+ objdata zo_data; /* Data structure for this type */
};
#if RPC_HDR
%
Modified: trunk/libc/nis/rpcsvc/nis_tags.h
==============================================================================
--- trunk/libc/nis/rpcsvc/nis_tags.h (original)
+++ trunk/libc/nis/rpcsvc/nis_tags.h Mon Sep 6 08:29:36 2010
@@ -1,5 +1,32 @@
/*
- * Copyright (c) 1991, Sun Microsystems Inc.
+ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
@@ -13,9 +40,9 @@
#define _RPCSVC_NIS_TAGS_H
#if 0
-#pragma ident "@(#)nis_tags.h 1.16 96/10/25 SMI"
+#pragma ident "@(#)nis_tags.h 1.16 96/10/25"
#endif
-/* from file: zns_tags.h 1.7 Copyright (c) 1990 Sun Microsystems */
+/* from file: zns_tags.h 1.7 */
#ifdef __cplusplus
extern "C" {
@@ -25,11 +52,11 @@
#define NIS_DIR "data"
/* Lookup and List function flags */
-#define FOLLOW_LINKS (1<<0) /* Follow link objects */
-#define FOLLOW_PATH (1<<1) /* Follow the path in a table */
-#define HARD_LOOKUP (1<<2) /* Block until successful */
-#define ALL_RESULTS (1<<3) /* Retrieve all results */
-#define NO_CACHE (1<<4) /* Do not return 'cached' results */
+#define FOLLOW_LINKS (1<<0) /* Follow link objects */
+#define FOLLOW_PATH (1<<1) /* Follow the path in a table */
+#define HARD_LOOKUP (1<<2) /* Block until successful */
+#define ALL_RESULTS (1<<3) /* Retrieve all results */
+#define NO_CACHE (1<<4) /* Do not return 'cached' results */
#define MASTER_ONLY (1<<5) /* Get value only from master server */
#define EXPAND_NAME (1<<6) /* Expand partitially qualified names */
@@ -46,7 +73,7 @@
#define SOFT_LOOKUP (1<<14) /* The "old default" return on failure */
/* Transport specific modifications to the operation */
-#define USE_DGRAM (1<<16) /* Use a datagram transport */
+#define USE_DGRAM (1<<16) /* Use a datagram transport */
#define NO_AUTHINFO (1<<17) /* Don't bother attaching auth info */
/*
@@ -55,14 +82,14 @@
* Statistic tags have values 2048 - 65535
* User Tags have values >2^16
*/
-#define TAG_DEBUG 1 /* set debug level */
-#define TAG_STATS 2 /* Enable/disable statistics */
+#define TAG_DEBUG 1 /* set debug level */
+#define TAG_STATS 2 /* Enable/disable statistics */
#define TAG_GCACHE 3 /* Flush the Group Cache */
#define TAG_GCACHE_ALL TAG_GCACHE
#define TAG_DCACHE 4 /* Flush the directory cache */
#define TAG_DCACHE_ONE TAG_DCACHE
#define TAG_OCACHE 5 /* Flush the Object Cache */
-#define TAG_SECURE 6 /* Set the security level */
+#define TAG_SECURE 6 /* Set the security level */
#define TAG_TCACHE_ONE 7 /* Flush the table cache */
#define TAG_DCACHE_ALL 8 /* Flush entire directory cache */
#define TAG_TCACHE_ALL 9 /* Flush entire table cache */
@@ -91,8 +118,8 @@
* Declarations for the Group object flags. Currently
* there are only 3.
*/
-#define IMPMEM_GROUPS 1 /* Implicit Membership allowed */
-#define RECURS_GROUPS 2 /* Recursive Groups allowed */
+#define IMPMEM_GROUPS 1 /* Implicit Membership allowed */
+#define RECURS_GROUPS 2 /* Recursive Groups allowed */
#define NEGMEM_GROUPS 4 /* Negative Groups allowed */
#ifdef __cplusplus
Modified: trunk/libc/nis/rpcsvc/yp.h
==============================================================================
--- trunk/libc/nis/rpcsvc/yp.h (original)
+++ trunk/libc/nis/rpcsvc/yp.h Mon Sep 6 08:29:36 2010
@@ -1,30 +1,32 @@
/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
+ * Copyright (c) 2010, Oracle America, Inc.
*
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
*
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef __RPCSVC_YP_H__
Modified: trunk/libc/nis/rpcsvc/yp.x
==============================================================================
--- trunk/libc/nis/rpcsvc/yp.x (original)
+++ trunk/libc/nis/rpcsvc/yp.x Mon Sep 6 08:29:36 2010
@@ -1,32 +1,34 @@
/* @(#)yp.x 2.1 88/08/01 4.0 RPCSRC */
/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
+ * Copyright (c) 2010, Oracle America, Inc.
*
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
*
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
@@ -163,12 +165,12 @@
enum yppush_status {
YPPUSH_SUCC = 1, /* Success */
- YPPUSH_AGE = 2, /* Master's version not newer */
+ YPPUSH_AGE = 2, /* Master's version not newer */
YPPUSH_NOMAP = -1, /* Can't find server for map */
YPPUSH_NODOM = -2, /* Domain not supported */
YPPUSH_RSRC = -3, /* Local resource alloc failure */
YPPUSH_RPC = -4, /* RPC failure talking to server */
- YPPUSH_MADDR = -5, /* Can't get master address */
+ YPPUSH_MADDR = -5, /* Can't get master address */
YPPUSH_YPERR = -6, /* YP server/map db error */
YPPUSH_BADARGS = -7, /* Request arguments bad */
YPPUSH_DBM = -8, /* Local dbm operation failed */
@@ -176,8 +178,8 @@
YPPUSH_SKEW = -10, /* Map version skew during transfer */
YPPUSH_CLEAR = -11, /* Can't send "Clear" req to local ypserv */
YPPUSH_FORCE = -12, /* No local order number in map use -f flag. */
- YPPUSH_XFRERR = -13, /* ypxfr error */
- YPPUSH_REFUSED = -14 /* Transfer request refused by ypserv */
+ YPPUSH_XFRERR = -13, /* ypxfr error */
+ YPPUSH_REFUSED = -14 /* Transfer request refused by ypserv */
};
struct yppushresp_xfr {
@@ -202,9 +204,9 @@
union ypbind_resp switch (ypbind_resptype ypbind_status) {
case YPBIND_FAIL_VAL:
- unsigned ypbind_error;
+ unsigned ypbind_error;
case YPBIND_SUCC_VAL:
- ypbind_binding ypbind_bindinfo;
+ ypbind_binding ypbind_bindinfo;
};
/* Detailed failure reason codes for response field ypbind_error*/
Modified: trunk/libc/nis/rpcsvc/ypupd.h
==============================================================================
--- trunk/libc/nis/rpcsvc/ypupd.h (original)
+++ trunk/libc/nis/rpcsvc/ypupd.h Mon Sep 6 08:29:36 2010
@@ -1,34 +1,32 @@
/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
+ * Copyright (c) 2010, Oracle America, Inc.
*
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
*
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-/*
- * Copyright (c) 1986, 1990 by Sun Microsystems, Inc.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/* from @(#)ypupdate_prot.x 1.3 91/03/11 TIRPC 1.0 */
Modified: trunk/libc/nis/yp_xdr.c
==============================================================================
--- trunk/libc/nis/yp_xdr.c (original)
+++ trunk/libc/nis/yp_xdr.c Mon Sep 6 08:29:36 2010
@@ -1,30 +1,32 @@
/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
+ * Copyright (c) 2010, Oracle America, Inc.
*
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
*
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <rpcsvc/yp.h>
Modified: trunk/libc/nis/ypupdate_xdr.c
==============================================================================
--- trunk/libc/nis/ypupdate_xdr.c (original)
+++ trunk/libc/nis/ypupdate_xdr.c Mon Sep 6 08:29:36 2010
@@ -1,34 +1,32 @@
/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
+ * Copyright (c) 2010, Oracle America, Inc.
*
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
*
[... 2155 lines stripped ...]