diff options
Diffstat (limited to 'usr/src/lib/libc/i386')
38 files changed, 199 insertions, 452 deletions
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com index 93e3a5cb69..8303dee02d 100644 --- a/usr/src/lib/libc/i386/Makefile.com +++ b/usr/src/lib/libc/i386/Makefile.com @@ -114,14 +114,11 @@ GENOBJS= \ i386_data.o \ ladd.o \ ldivide.o \ - lexp10.o \ - llog10.o \ lmul.o \ lock.o \ lshiftl.o \ lsign.o \ lsub.o \ - ltostr.o \ makectxt.o \ memccpy.o \ memchr.o \ @@ -484,11 +481,13 @@ PORTGEN= \ l64a.o \ lckpwdf.o \ lconstants.o \ + lexp10.o \ lfind.o \ lfmt.o \ lfmt_log.o \ llabs.o \ lldiv.o \ + llog10.o \ lltostr.o \ localtime.o \ lsearch.o \ @@ -1046,9 +1045,6 @@ SRCS= \ $(UNWINDMACHOBJS:%.o=../port/unwind/%.c) \ $(FPOBJS:%.o=../$(MACH)/fp/%.c) \ $(LIBCBASE)/gen/ecvt.c \ - $(LIBCBASE)/gen/lexp10.c \ - $(LIBCBASE)/gen/llog10.c \ - $(LIBCBASE)/gen/ltostr.c \ $(LIBCBASE)/gen/makectxt.c \ $(LIBCBASE)/gen/siginfolst.c \ $(LIBCBASE)/gen/siglongjmp.c \ diff --git a/usr/src/lib/libc/i386/fp/_base_il.c b/usr/src/lib/libc/i386/fp/_base_il.c index d20789999a..a821932d41 100644 --- a/usr/src/lib/libc/i386/fp/_base_il.c +++ b/usr/src/lib/libc/i386/fp/_base_il.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,14 +18,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include "base_conversion.h" /* The following should be coded as inline expansion templates. */ diff --git a/usr/src/lib/libc/i386/fp/fpgetmask.c b/usr/src/lib/libc/i386/fp/fpgetmask.c index 3e9771cd4b..0dea85fafa 100644 --- a/usr/src/lib/libc/i386/fp/fpgetmask.c +++ b/usr/src/lib/libc/i386/fp/fpgetmask.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,20 +18,21 @@ * * CDDL HEADER END */ -/* Copyright (c) 1990, 1991 UNIX System Laboratories, Inc. */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* Copyright (c) 1990, 1991 UNIX System Laboratories, Inc. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ + #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak fpgetmask = _fpgetmask +#pragma weak _fpgetmask = fpgetmask -#include "synonyms.h" +#include "lint.h" #include <ieeefp.h> #include "fp.h" @@ -44,7 +44,3 @@ fpgetmask() _getcw(&cw); return (fp_except)(~cw.mask & EXCPMASK); } - - - - diff --git a/usr/src/lib/libc/i386/fp/fpgetround.c b/usr/src/lib/libc/i386/fp/fpgetround.c index 35acea5fb7..49e11bbb14 100644 --- a/usr/src/lib/libc/i386/fp/fpgetround.c +++ b/usr/src/lib/libc/i386/fp/fpgetround.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,20 +18,21 @@ * * CDDL HEADER END */ -/* Copyright (c) 1990, 1991 UNIX System Laboratories, Inc. */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* Copyright (c) 1990, 1991 UNIX System Laboratories, Inc. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ + #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak fpgetround = _fpgetround +#pragma weak _fpgetround = fpgetround -#include "synonyms.h" +#include "lint.h" #include <ieeefp.h> #include "fp.h" @@ -42,5 +42,5 @@ fpgetround() struct _cw87 cw; _getcw(&cw); - return (fp_rnd)cw.rnd; + return ((fp_rnd)cw.rnd); } diff --git a/usr/src/lib/libc/i386/fp/fpgetsticky.c b/usr/src/lib/libc/i386/fp/fpgetsticky.c index ab45e2b910..92a16785aa 100644 --- a/usr/src/lib/libc/i386/fp/fpgetsticky.c +++ b/usr/src/lib/libc/i386/fp/fpgetsticky.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,17 +18,18 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include <ieeefp.h> -#include "synonyms.h" +#pragma weak _fpgetsticky = fpgetsticky -#pragma weak fpgetsticky = _fpgetsticky +#include "lint.h" +#include <ieeefp.h> extern int _sse_hw; extern void _getsw(int *), _getmxcsr(int *); diff --git a/usr/src/lib/libc/i386/fp/fpsetmask.c b/usr/src/lib/libc/i386/fp/fpsetmask.c index 86bc442f04..dc14162934 100644 --- a/usr/src/lib/libc/i386/fp/fpsetmask.c +++ b/usr/src/lib/libc/i386/fp/fpsetmask.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,20 +18,21 @@ * * CDDL HEADER END */ -/* Copyright (c) 1990, 1991 UNIX System Laboratories, Inc. */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* Copyright (c) 1990, 1991 UNIX System Laboratories, Inc. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ + #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak fpsetmask = _fpsetmask +#pragma weak _fpsetmask = fpsetmask -#include "synonyms.h" +#include "lint.h" #include <ieeefp.h> #include "fp.h" diff --git a/usr/src/lib/libc/i386/fp/fpsetround.c b/usr/src/lib/libc/i386/fp/fpsetround.c index 901cc14a1a..cdd78261d3 100644 --- a/usr/src/lib/libc/i386/fp/fpsetround.c +++ b/usr/src/lib/libc/i386/fp/fpsetround.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,20 +18,21 @@ * * CDDL HEADER END */ -/* Copyright (c) 1990, 1991 UNIX System Laboratories, Inc. */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* Copyright (c) 1990, 1991 UNIX System Laboratories, Inc. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ + #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak fpsetround = _fpsetround +#pragma weak _fpsetround = fpsetround -#include "synonyms.h" +#include "lint.h" #include <ieeefp.h> #include "fp.h" diff --git a/usr/src/lib/libc/i386/fp/fpsetsticky.c b/usr/src/lib/libc/i386/fp/fpsetsticky.c index d464303200..67fe9a08cf 100644 --- a/usr/src/lib/libc/i386/fp/fpsetsticky.c +++ b/usr/src/lib/libc/i386/fp/fpsetsticky.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,17 +18,18 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" +#include "lint.h" #include <ieeefp.h> -#include "synonyms.h" -#pragma weak fpsetsticky = _fpsetsticky +#pragma weak _fpsetsticky = fpsetsticky extern int _sse_hw; extern void _getsw(int *), _putsw(int), _getmxcsr(int *), _putmxcsr(int); diff --git a/usr/src/lib/libc/i386/fp/fpstart.c b/usr/src/lib/libc/i386/fp/fpstart.c index 7c5a1bb291..141ca99db9 100644 --- a/usr/src/lib/libc/i386/fp/fpstart.c +++ b/usr/src/lib/libc/i386/fp/fpstart.c @@ -46,7 +46,7 @@ #pragma weak _fpstart = __fpstart -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/sysi86.h> /* for SI86FPHW/SI86FPSTART definitions */ #include <sys/fp.h> /* for FPU_CW_INIT and SSE_MXCSR_INIT */ diff --git a/usr/src/lib/libc/i386/gen/ecvt.c b/usr/src/lib/libc/i386/gen/ecvt.c index 4ad7319792..b791e513cf 100644 --- a/usr/src/lib/libc/i386/gen/ecvt.c +++ b/usr/src/lib/libc/i386/gen/ecvt.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,15 +18,15 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ + #pragma ident "%Z%%M% %I% %E% SMI" /* @@ -37,13 +36,11 @@ * sign is set to 0 for positive, 1 for negative * */ -#pragma weak ecvt = _ecvt -#pragma weak fcvt = _fcvt -#pragma weak qecvt = _qecvt -#pragma weak qfcvt = _qfcvt -#pragma weak qgcvt = _qgcvt -#include "synonyms.h" +#pragma weak _ecvt = ecvt +#pragma weak _fcvt = fcvt + +#include "lint.h" #include <sys/types.h> #include <stdlib.h> #include <floatingpoint.h> diff --git a/usr/src/lib/libc/i386/gen/ladd.s b/usr/src/lib/libc/i386/gen/ladd.s index d20596666d..6b3b7ffde1 100644 --- a/usr/src/lib/libc/i386/gen/ladd.s +++ b/usr/src/lib/libc/i386/gen/ladd.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,21 +18,18 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - .ident "%Z%%M% %I% %E% SMI" +#pragma ident "%Z%%M% %I% %E% SMI" .file "%M%" / Double long add routine. -#include <sys/asm_linkage.h> - - ANSI_PRAGMA_WEAK(ladd,function) - #include "SYS.h" .set lop,4 diff --git a/usr/src/lib/libc/i386/gen/ldivide.s b/usr/src/lib/libc/i386/gen/ldivide.s index a75b5e3f52..3df4afcb36 100644 --- a/usr/src/lib/libc/i386/gen/ldivide.s +++ b/usr/src/lib/libc/i386/gen/ldivide.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,21 +18,18 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - .ident "%Z%%M% %I% %E% SMI" +#pragma ident "%Z%%M% %I% %E% SMI" .file "%M%" / Double long divide routine. -#include <sys/asm_linkage.h> - - ANSI_PRAGMA_WEAK(ldivide,function) - #include "SYS.h" .set lop,16 diff --git a/usr/src/lib/libc/i386/gen/lexp10.c b/usr/src/lib/libc/i386/gen/lexp10.c deleted file mode 100644 index b02a328acc..0000000000 --- a/usr/src/lib/libc/i386/gen/lexp10.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (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 (c) 1988 AT&T */ -/* All Rights Reserved */ - - -/* - * Copyright 1992-2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#pragma weak lexp10 = _lexp10 - -#include "synonyms.h" -#include <sys/types.h> -#include <sys/dl.h> - -dl_t -lexp10(exp) -dl_t exp; -{ - dl_t result; - - result = lone; - - while(exp.dl_hop != 0 || exp.dl_lop != 0){ - result = lmul(result, lten); - exp = lsub(exp, lone); - } - - return(result); -} diff --git a/usr/src/lib/libc/i386/gen/llog10.c b/usr/src/lib/libc/i386/gen/llog10.c deleted file mode 100644 index e4a6f8ac20..0000000000 --- a/usr/src/lib/libc/i386/gen/llog10.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (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 (c) 1988 AT&T */ -/* All Rights Reserved */ - - -/* - * Copyright 1992-2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#pragma weak llog10 = _llog10 - -#include "synonyms.h" -#include <sys/types.h> -#include <sys/dl.h> - -dl_t -llog10(val) -dl_t val; -{ - dl_t result; - - result = lzero; - val = ldivide(val, lten); - - while(val.dl_hop != 0 || val.dl_lop != 0){ - val = ldivide(val, lten); - result = ladd(result, lone); - } - - return(result); -} diff --git a/usr/src/lib/libc/i386/gen/lmul.s b/usr/src/lib/libc/i386/gen/lmul.s index 2007f34682..c25ca556f7 100644 --- a/usr/src/lib/libc/i386/gen/lmul.s +++ b/usr/src/lib/libc/i386/gen/lmul.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,21 +18,18 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - .ident "%Z%%M% %I% %E% SMI" +#pragma ident "%Z%%M% %I% %E% SMI" .file "%M%" / Double long multiply routine. -#include <sys/asm_linkage.h> - - ANSI_PRAGMA_WEAK(lmul,function) - #include "SYS.h" .set lop,8 diff --git a/usr/src/lib/libc/i386/gen/lshiftl.s b/usr/src/lib/libc/i386/gen/lshiftl.s index 29dbe1e5ba..1d684ccc1e 100644 --- a/usr/src/lib/libc/i386/gen/lshiftl.s +++ b/usr/src/lib/libc/i386/gen/lshiftl.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,21 +18,18 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - .ident "%Z%%M% %I% %E% SMI" +#pragma ident "%Z%%M% %I% %E% SMI" .file "%M%" / Shift a double long value. -#include <sys/asm_linkage.h> - - ANSI_PRAGMA_WEAK(lshiftl,function) - #include "SYS.h" .set arg,8 diff --git a/usr/src/lib/libc/i386/gen/lsign.s b/usr/src/lib/libc/i386/gen/lsign.s index 5bfc198a31..2854113a28 100644 --- a/usr/src/lib/libc/i386/gen/lsign.s +++ b/usr/src/lib/libc/i386/gen/lsign.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,21 +18,18 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - .ident "%Z%%M% %I% %E% SMI" +#pragma ident "%Z%%M% %I% %E% SMI" .file "%M%" / Determine the sign of a double-long number. -#include <sys/asm_linkage.h> - - ANSI_PRAGMA_WEAK(lsign,function) - #include "SYS.h" ENTRY(lsign) diff --git a/usr/src/lib/libc/i386/gen/lsub.s b/usr/src/lib/libc/i386/gen/lsub.s index 92e744ed1a..db39d376a1 100644 --- a/usr/src/lib/libc/i386/gen/lsub.s +++ b/usr/src/lib/libc/i386/gen/lsub.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,21 +18,18 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - .ident "%Z%%M% %I% %E% SMI" +#pragma ident "%Z%%M% %I% %E% SMI" .file "%M%" / Double long subtraction routine. -#include <sys/asm_linkage.h> - - ANSI_PRAGMA_WEAK(lsub,function) - #include "SYS.h" .set lop,4 diff --git a/usr/src/lib/libc/i386/gen/ltostr.c b/usr/src/lib/libc/i386/gen/ltostr.c deleted file mode 100644 index 04129a34ad..0000000000 --- a/usr/src/lib/libc/i386/gen/ltostr.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (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 (c) 1988 AT&T */ -/* All Rights Reserved */ - - -#ident "%W% %E% SMI" /* SVr4.0 1.4 */ -/* - * ltostr -- convert long to decimal string - * - * - * char * - * ltostr(value, ptr) - * long value; - * char *ptr; - * - * Ptr is assumed to point to the byte following a storage area - * into which the decimal representation of "value" is to be - * placed as a string. Ltostr converts "value" to decimal and - * produces the string, and returns a pointer to the beginning - * of the string. No leading zeroes are produced, and no - * terminating null is produced. The low-order digit of the - * result always occupies memory position ptr-1. - * Ltostr's behavior is undefined if "value" is negative. A single - * zero digit is produced if "value" is zero. - * - */ -#include "synonyms.h" - -char * -_ltostr(value, ptr) -register long value; -register char *ptr; -{ - register long t; - - do { - *--ptr = '0' + value - 10 * (t = value / 10); - } while ((value = t) != 0); - - return(ptr); -} diff --git a/usr/src/lib/libc/i386/gen/makectxt.c b/usr/src/lib/libc/i386/gen/makectxt.c index 6432bbf1d0..d72a67a481 100644 --- a/usr/src/lib/libc/i386/gen/makectxt.c +++ b/usr/src/lib/libc/i386/gen/makectxt.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,20 +18,20 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak makecontext = _makecontext +#pragma weak _makecontext = makecontext -#include "synonyms.h" +#include "lint.h" #include <stdarg.h> #include <ucontext.h> #include <sys/stack.h> diff --git a/usr/src/lib/libc/i386/gen/siglongjmp.c b/usr/src/lib/libc/i386/gen/siglongjmp.c index 1b3296d93d..ea23fcf749 100644 --- a/usr/src/lib/libc/i386/gen/siglongjmp.c +++ b/usr/src/lib/libc/i386/gen/siglongjmp.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -30,18 +30,16 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak siglongjmp = _siglongjmp +#pragma weak _siglongjmp = siglongjmp -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/ucontext.h> #include <setjmp.h> #include <ucontext.h> -extern int _setcontext(const ucontext_t *); - void -_siglongjmp(sigjmp_buf env, int val) +siglongjmp(sigjmp_buf env, int val) { ucontext_t *ucp = (ucontext_t *)env; @@ -50,5 +48,5 @@ _siglongjmp(sigjmp_buf env, int val) else ucp->uc_mcontext.gregs[EAX] = 1; - (void) _setcontext(ucp); + (void) setcontext(ucp); } diff --git a/usr/src/lib/libc/i386/gen/wschr.s b/usr/src/lib/libc/i386/gen/wschr.s index bf0a217b9d..2cf1809cf2 100644 --- a/usr/src/lib/libc/i386/gen/wschr.s +++ b/usr/src/lib/libc/i386/gen/wschr.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,12 +18,13 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - .ident "%Z%%M% %I% %E% SMI" +#pragma ident "%Z%%M% %I% %E% SMI" .file "%M%" @@ -33,19 +33,15 @@ / / Algorithm based on Solaris 2.6 gen/strchr.s implementation / -/ .ident "@(#)strchr.s 1.1 92/04/17 SMI" -/ -#include <sys/asm_linkage.h> +#include "SYS.h" ANSI_PRAGMA_WEAK(wcschr,function) ANSI_PRAGMA_WEAK(wschr,function) -#include "SYS.h" - .align 8 / accounts for .loop alignment and prolog - ENTRY(_wcschr) + ENTRY(wcschr) movl 4(%esp),%eax / %eax = string address movl 8(%esp),%ecx / %ecx = wchar sought .loop: @@ -88,16 +84,16 @@ addl $4,%eax .found: ret - SET_SIZE(_wcschr) + SET_SIZE(wcschr) - ENTRY(_wschr) + ENTRY(wschr) _prologue_ movl _esp_(8),%eax movl _esp_(4),%edx pushl %eax pushl %edx - call _fref_(_wcschr) + call _fref_(wcschr) addl $8,%esp _epilogue_ ret - SET_SIZE(_wschr) + SET_SIZE(wschr) diff --git a/usr/src/lib/libc/i386/gen/wslen.s b/usr/src/lib/libc/i386/gen/wslen.s index 5d428e84cc..3431210229 100644 --- a/usr/src/lib/libc/i386/gen/wslen.s +++ b/usr/src/lib/libc/i386/gen/wslen.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,12 +18,13 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - .ident "%Z%%M% %I% %E% SMI" +#pragma ident "%Z%%M% %I% %E% SMI" .file "%M%" @@ -32,7 +32,7 @@ * Wide character wcslen() implementation * * size_t - * _wcslen(const wchar_t *s) + * wcslen(const wchar_t *s) *{ * const wchar_t *s0 = s + 1; * while (*s++) @@ -41,14 +41,12 @@ *} */ -#include <sys/asm_linkage.h> +#include "SYS.h" ANSI_PRAGMA_WEAK(wcslen,function) ANSI_PRAGMA_WEAK(wslen,function) -#include "SYS.h" - - ENTRY(_wcslen) + ENTRY(wcslen) movl 4(%esp),%edx xorl %eax,%eax @@ -81,16 +79,16 @@ .out3: add $3, %eax ret - SET_SIZE(_wcslen) + SET_SIZE(wcslen) - ENTRY(_wslen) + ENTRY(wslen) _prologue_ movl _esp_(8),%eax movl _esp_(4),%edx pushl %eax pushl %edx - call _fref_(_wcslen) + call _fref_(wcslen) addl $8,%esp _epilogue_ ret - SET_SIZE(_wslen) + SET_SIZE(wslen) diff --git a/usr/src/lib/libc/i386/gen/wsncmp.s b/usr/src/lib/libc/i386/gen/wsncmp.s index 54b05f8342..995187a827 100644 --- a/usr/src/lib/libc/i386/gen/wsncmp.s +++ b/usr/src/lib/libc/i386/gen/wsncmp.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,12 +18,13 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - .ident "%Z%%M% %I% %E% SMI" +#pragma ident "%Z%%M% %I% %E% SMI" .file "%M%" @@ -33,17 +33,13 @@ / / Algorithm based on Solaris 2.6 gen/strncpy.s implementation / -/ .ident "@(#)strncpy.s 1.1 92/04/17 SMI" -/ -#include <sys/asm_linkage.h> +#include "SYS.h" ANSI_PRAGMA_WEAK(wcsncmp,function) ANSI_PRAGMA_WEAK(wsncmp,function) -#include "SYS.h" - - ENTRY(_wcsncmp) + ENTRY(wcsncmp) pushl %esi / save register variables movl 8(%esp),%esi / %esi = first string movl %edi,%edx @@ -105,9 +101,9 @@ subl (%edi),%eax / return value is (*s1 - *--s2) movl %edx,%edi ret - SET_SIZE(_wcsncmp) + SET_SIZE(wcsncmp) - ENTRY(_wsncmp) + ENTRY(wsncmp) _prologue_ movl _esp_(12),%ecx movl _esp_(8),%eax @@ -115,8 +111,8 @@ pushl %ecx pushl %eax pushl %edx - call _fref_(_wcsncmp) + call _fref_(wcsncmp) addl $12,%esp _epilogue_ ret - SET_SIZE(_wsncmp) + SET_SIZE(wsncmp) diff --git a/usr/src/lib/libc/i386/inc/SYS.h b/usr/src/lib/libc/i386/inc/SYS.h index eaba7aee91..b5f7d7c938 100644 --- a/usr/src/lib/libc/i386/inc/SYS.h +++ b/usr/src/lib/libc/i386/inc/SYS.h @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,8 +18,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -34,9 +34,7 @@ */ #include <sys/asm_linkage.h> #include <sys/syscall.h> -#include <sys/trap.h> #include <sys/errno.h> -#include "synonyms.h" #define _prologue_ \ pushl %ebx; \ diff --git a/usr/src/lib/libc/i386/mapfile-vers b/usr/src/lib/libc/i386/mapfile-vers index 2229e9d71b..a58c2f858e 100644 --- a/usr/src/lib/libc/i386/mapfile-vers +++ b/usr/src/lib/libc/i386/mapfile-vers @@ -40,7 +40,6 @@ SUNW_1.23 { enable_extended_FILE_stdio; lio_listio64; mkstemps64; - _mkstemps64; posix_fallocate64; }; @@ -924,6 +923,7 @@ SUNWprivate_1.1 { __xtoull; local: + _syscall6 = NODYNSORT; __systemcall6 = NODYNSORT; _seekdir64 = NODYNSORT; _telldir64 = NODYNSORT; diff --git a/usr/src/lib/libc/i386/sys/_lwp_mutex_unlock.s b/usr/src/lib/libc/i386/sys/_lwp_mutex_unlock.s index 1154c72140..3133ba1fe8 100644 --- a/usr/src/lib/libc/i386/sys/_lwp_mutex_unlock.s +++ b/usr/src/lib/libc/i386/sys/_lwp_mutex_unlock.s @@ -28,12 +28,8 @@ .file "%M%" -#include <sys/asm_linkage.h> - - ANSI_PRAGMA_WEAK(_lwp_mutex_unlock,function) - #include "SYS.h" -#include <assym.h> +#include <../assym.h> ENTRY(_lwp_mutex_unlock) movl 4(%esp), %eax diff --git a/usr/src/lib/libc/i386/sys/door.s b/usr/src/lib/libc/i386/sys/door.s index 799d9e17fd..92ef56eff8 100644 --- a/usr/src/lib/libc/i386/sys/door.s +++ b/usr/src/lib/libc/i386/sys/door.s @@ -28,27 +28,18 @@ .file "%M%" -#include <sys/asm_linkage.h> +#include "SYS.h" +#include <sys/door.h> /* * weak aliases for public interfaces */ - ANSI_PRAGMA_WEAK(_door_bind,function) - ANSI_PRAGMA_WEAK(_door_getparam,function) - ANSI_PRAGMA_WEAK(_door_info,function) - ANSI_PRAGMA_WEAK(_door_revoke,function) - ANSI_PRAGMA_WEAK(_door_setparam,function) - ANSI_PRAGMA_WEAK(_door_unbind,function) - - ANSI_PRAGMA_WEAK(door_bind,function) - ANSI_PRAGMA_WEAK(door_getparam,function) - ANSI_PRAGMA_WEAK(door_info,function) - ANSI_PRAGMA_WEAK(door_revoke,function) - ANSI_PRAGMA_WEAK(door_setparam,function) - ANSI_PRAGMA_WEAK(door_unbind,function) - -#include <sys/door.h> -#include "SYS.h" + ANSI_PRAGMA_WEAK2(door_bind,__door_bind,function) + ANSI_PRAGMA_WEAK2(door_getparam,__door_getparam,function) + ANSI_PRAGMA_WEAK2(door_info,__door_info,function) + ANSI_PRAGMA_WEAK2(door_revoke,__door_revoke,function) + ANSI_PRAGMA_WEAK2(door_setparam,__door_setparam,function) + ANSI_PRAGMA_WEAK2(door_unbind,__door_unbind,function) /* * Offsets within struct door_results @@ -177,7 +168,7 @@ door_restart: call *%eax /* Exit the thread if we return here */ pushl $0 - call _thr_terminate + call _thrp_terminate /* NOTREACHED */ 2: /* diff --git a/usr/src/lib/libc/i386/sys/gettimeofday.s b/usr/src/lib/libc/i386/sys/gettimeofday.s index 07f69d4a8e..e54a71121b 100644 --- a/usr/src/lib/libc/i386/sys/gettimeofday.s +++ b/usr/src/lib/libc/i386/sys/gettimeofday.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,8 +18,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,19 +28,17 @@ .file "%M%" -#include <sys/asm_linkage.h> +#include "SYS.h" ANSI_PRAGMA_WEAK(gettimeofday,function) -#include "SYS.h" - / / implements int gettimeofday(struct timeval *tp, void *tzp) / / note that tzp is always ignored / - ENTRY(_gettimeofday) + ENTRY(gettimeofday) / / use long long gethrestime() / @@ -59,6 +57,6 @@ movl %edx, 4(%ecx) / store usecs into timeval ptr + 4. 1: RETC / return 0 - SET_SIZE(_gettimeofday) + SET_SIZE(gettimeofday) diff --git a/usr/src/lib/libc/i386/sys/lwp_private.s b/usr/src/lib/libc/i386/sys/lwp_private.s index d6f0f0621a..757dd83209 100644 --- a/usr/src/lib/libc/i386/sys/lwp_private.s +++ b/usr/src/lib/libc/i386/sys/lwp_private.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,22 +18,21 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" - .file "lwp_private.s" - -#include <sys/asm_linkage.h> + .file "%M%" #include "SYS.h" /* * int - * __lwp_setprivate(int cmd, int which, void *base) + * ___lwp_private(int cmd, int which, void *base) */ ENTRY(___lwp_private) SYSTRAP_RVAL1(lwp_private) diff --git a/usr/src/lib/libc/i386/sys/nuname.s b/usr/src/lib/libc/i386/sys/nuname.s index d87120f665..1d7ea9ecc9 100644 --- a/usr/src/lib/libc/i386/sys/nuname.s +++ b/usr/src/lib/libc/i386/sys/nuname.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,8 +18,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,14 +28,12 @@ .file "%M%" -#include <sys/asm_linkage.h> +#include "SYS.h" ANSI_PRAGMA_WEAK(nuname,function) -#include "SYS.h" - - ENTRY(_nuname) + ENTRY(nuname) SYSTRAP_RVAL1(uname) SYSCERROR RET - SET_SIZE(_nuname) + SET_SIZE(nuname) diff --git a/usr/src/lib/libc/i386/sys/ptrace.c b/usr/src/lib/libc/i386/sys/ptrace.c index 5cd033bdb0..470f79663a 100644 --- a/usr/src/lib/libc/i386/sys/ptrace.c +++ b/usr/src/lib/libc/i386/sys/ptrace.c @@ -30,9 +30,9 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak ptrace = _ptrace +#pragma weak _ptrace = ptrace -#include "synonyms.h" +#include "lint.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/usr/src/lib/libc/i386/sys/syscall.s b/usr/src/lib/libc/i386/sys/syscall.s index 503c8a0001..886cec9b8a 100644 --- a/usr/src/lib/libc/i386/sys/syscall.s +++ b/usr/src/lib/libc/i386/sys/syscall.s @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * 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. @@ -19,8 +18,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,22 +28,17 @@ .file "%M%" -#include <sys/asm_linkage.h> +#include "SYS.h" #include <sys/trap.h> ANSI_PRAGMA_WEAK(syscall,function) -#include "SYS.h" - -#undef _syscall /* override "synonyms.h" */ -#undef __systemcall - /* - * See sparc/sys/syscall.s to understand why __syscall6() exists. + * See sparc/sys/syscall.s to understand why _syscall6() exists. * On x86, the implementation of the two are the same, the only - * difference being that __syscall6 is not an exported symbol. + * difference being that _syscall6 is not an exported symbol. */ - ENTRY2(_syscall,_syscall6) + ENTRY2(syscall,_syscall6) popl %edx / return address popl %eax / system call number pushl %edx @@ -63,7 +58,7 @@ pushl %edx / restore the return address SYSCERROR ret - SET_SIZE(_syscall) + SET_SIZE(syscall) SET_SIZE(_syscall6) /* diff --git a/usr/src/lib/libc/i386/sys/sysi86.s b/usr/src/lib/libc/i386/sys/sysi86.s index 14e47db53c..bb1edbfd2a 100644 --- a/usr/src/lib/libc/i386/sys/sysi86.s +++ b/usr/src/lib/libc/i386/sys/sysi86.s @@ -28,14 +28,10 @@ .file "%M%" -#include <sys/asm_linkage.h> +#include "SYS.h" ANSI_PRAGMA_WEAK(sysi86,function) -#include "SYS.h" - - ENTRY(_sysi86) - SYSTRAP_RVAL1(sysi86) - SYSCERROR + SYSCALL_RVAL1(sysi86) RET - SET_SIZE(_sysi86) + SET_SIZE(sysi86) diff --git a/usr/src/lib/libc/i386/sys/uadmin.c b/usr/src/lib/libc/i386/sys/uadmin.c index 8caf6d5bc3..bc15f4a9e3 100644 --- a/usr/src/lib/libc/i386/sys/uadmin.c +++ b/usr/src/lib/libc/i386/sys/uadmin.c @@ -26,8 +26,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak uadmin = _uadmin - /* * Wrapper function to implement reboot w/ arguments on x86 * platforms. Extract reboot arguments and place them in @@ -35,7 +33,7 @@ * All other commands are passed through. */ -#include "synonyms.h" +#include "lint.h" #include <fcntl.h> #include <ctype.h> #include <stdio.h> diff --git a/usr/src/lib/libc/i386/sys/vforkx.s b/usr/src/lib/libc/i386/sys/vforkx.s index 4659498dc5..be14d9757a 100644 --- a/usr/src/lib/libc/i386/sys/vforkx.s +++ b/usr/src/lib/libc/i386/sys/vforkx.s @@ -20,7 +20,7 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,11 +28,6 @@ .file "%M%" -#include <sys/asm_linkage.h> - - ANSI_PRAGMA_WEAK(vforkx,function) - ANSI_PRAGMA_WEAK(vfork,function) - #include "SYS.h" #include <assym.h> diff --git a/usr/src/lib/libc/i386/threads/asm_subr.s b/usr/src/lib/libc/i386/threads/asm_subr.s index 232cb09893..622ea3f250 100644 --- a/usr/src/lib/libc/i386/threads/asm_subr.s +++ b/usr/src/lib/libc/i386/threads/asm_subr.s @@ -32,11 +32,11 @@ / This is where execution resumes when a thread created with / thr_create() or pthread_create() returns (see setup_context()). - / We pass the (void *) return value to _thr_terminate(). + / We pass the (void *) return value to _thrp_terminate(). ENTRY(_lwp_start) addl $4, %esp pushl %eax - call _thr_terminate + call _thrp_terminate addl $4, %esp / actually, never returns SET_SIZE(_lwp_start) diff --git a/usr/src/lib/libc/i386/threads/machdep.c b/usr/src/lib/libc/i386/threads/machdep.c index c5b8e2d118..d1c8d34437 100644 --- a/usr/src/lib/libc/i386/threads/machdep.c +++ b/usr/src/lib/libc/i386/threads/machdep.c @@ -70,7 +70,7 @@ setup_context(ucontext_t *ucp, void *(*func)(ulwp_t *), * to pass down self pointer and set %gs selector * value so __lwp_create() can setup %gs atomically. * Without this we would need to block all signals - * and directly call __lwp_setprivate() in _thr_setup + * and directly call ___lwp_private() in _thrp_setup * on the other side of __lwp_create(). */ ucp->uc_mcontext.gregs[ESP] = (greg_t)ulwp; @@ -98,7 +98,7 @@ setup_context(ucontext_t *ucp, void *(*func)(ulwp_t *), * Machine-dependent startup code for a newly-created thread. */ void * -_thr_setup(ulwp_t *self) +_thrp_setup(ulwp_t *self) { self->ul_ustack.ss_sp = (void *)(self->ul_stktop - self->ul_stksiz); self->ul_ustack.ss_size = self->ul_stksiz; |