diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-05-08 18:18:49 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-05-08 18:18:49 +0000 |
| commit | 43840e901cacf50a9bb41148069e34ca307524e8 (patch) | |
| tree | 2836162f69bba2534e8b9acf9797e5892f103258 /usr/src/lib/libc/amd64 | |
| parent | abd43b3991c3becf4fd3cc1a370aeafdc8749a30 (diff) | |
| parent | 5dbfd19ad5fcc2b779f40f80fa05c1bd28fd0b4e (diff) | |
| download | illumos-joyent-43840e901cacf50a9bb41148069e34ca307524e8.tar.gz | |
[illumos-gate merge]
commit 5dbfd19ad5fcc2b779f40f80fa05c1bd28fd0b4e
3713 Implement accept4()
3714 Implement pipe2()
3715 Implement dup3()
3716 Implement mkostemp() and mkostemps()
3719 so_socketpair syscall should preserve FD_CLOEXEC flag
commit 6136c589445a3ea081bd34ab72db1060875b6bcc
3722 link-editor is over restrictive of R_AMD64_32 addends
Conflicts:
usr/src/lib/libc/sparcv9/Makefile.com [copyright]
usr/src/lib/libc/sparc/Makefile.com [copyright]
usr/src/lib/libc/i386/Makefile.com [copyright]
Diffstat (limited to 'usr/src/lib/libc/amd64')
| -rw-r--r-- | usr/src/lib/libc/amd64/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc/amd64/sys/pipe.s | 42 |
2 files changed, 3 insertions, 43 deletions
diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile index 2f37212a55..396c536387 100644 --- a/usr/src/lib/libc/amd64/Makefile +++ b/usr/src/lib/libc/amd64/Makefile @@ -22,6 +22,7 @@ # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2012, Joyent, Inc. All rights reserved. # +# Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. # Copyright 2011 Nexenta Systems, Inc. All rights reserved. # Use is subject to license terms. # @@ -223,6 +224,7 @@ COMSYSOBJS= \ pathconf.o \ pause.o \ pcsample.o \ + pipe2.o \ pollsys.o \ pread.o \ priocntlset.o \ @@ -279,7 +281,6 @@ SYSOBJS= \ gettimeofday.o \ lwp_private.o \ nuname.o \ - pipe.o \ syscall.o \ sysi86.o \ tls_get_addr.o \ @@ -468,6 +469,7 @@ PORTGEN= \ pfmt.o \ pfmt_data.o \ pfmt_print.o \ + pipe.o \ plock.o \ poll.o \ posix_fadvise.o \ diff --git a/usr/src/lib/libc/amd64/sys/pipe.s b/usr/src/lib/libc/amd64/sys/pipe.s deleted file mode 100644 index fd659bea1f..0000000000 --- a/usr/src/lib/libc/amd64/sys/pipe.s +++ /dev/null @@ -1,42 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - - .file "pipe.s" - -#include <sys/asm_linkage.h> - - ANSI_PRAGMA_WEAK(pipe,function) - -#include "SYS.h" - - ENTRY(pipe) - pushq %rdi /* preserve the pointer */ - SYSTRAP_2RVALS(pipe) - popq %rdi - SYSCERROR - movl %eax, (%rdi) - movl %edx, 4(%rdi) - RETC - SET_SIZE(pipe) |