diff options
Diffstat (limited to 'usr/src/lib/libc_psr')
| -rw-r--r-- | usr/src/lib/libc_psr/inc.flg | 31 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4u-opl/Makefile.com | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4u-opl/common/memcpy.s | 10 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4u-us3/common/memcmp.s | 12 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4u-us3/common/memcpy.s | 13 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4u-us3/common/memset.s | 13 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4u/Makefile.com | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4u/common/memcmp.s | 12 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4u/common/memcpy.s | 13 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4u/common/memset.s | 13 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4u_hwcap1/Makefile.com | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4u_hwcap2/Makefile.com | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4v/common/memcpy.s | 10 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4v/common/memset.s | 10 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com | 5 | ||||
| -rw-r--r-- | usr/src/lib/libc_psr/sun4v_hwcap2/Makefile.com | 4 |
16 files changed, 59 insertions, 103 deletions
diff --git a/usr/src/lib/libc_psr/inc.flg b/usr/src/lib/libc_psr/inc.flg deleted file mode 100644 index 7bd2de9f0a..0000000000 --- a/usr/src/lib/libc_psr/inc.flg +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# 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 -# -# -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright (c) 1994 by Sun Microsystems, Inc. -# All rights reserved. -# -# File-list generator (flg) for included source not in this directory -# -echo_file usr/src/lib/libc/inc/synonyms.h diff --git a/usr/src/lib/libc_psr/sun4u-opl/Makefile.com b/usr/src/lib/libc_psr/sun4u-opl/Makefile.com index 64760d301c..107550d626 100644 --- a/usr/src/lib/libc_psr/sun4u-opl/Makefile.com +++ b/usr/src/lib/libc_psr/sun4u-opl/Makefile.com @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2006 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" @@ -43,7 +43,7 @@ CTFCONVERT_POST = : CTFMERGE_LIB = : LIBS = $(DYNLIB) -IFLAGS = -I$(SRC)/lib/libc/inc -I$(SRC)/uts/sun4u \ +IFLAGS = -I$(SRC)/uts/sun4u \ -I$(ROOT)/usr/platform/sun4u/include CPPFLAGS = -D_REENTRANT -D$(MACH) $(IFLAGS) $(CPPFLAGS.master) ASDEFS = -D__STDC__ -D_ASM $(CPPFLAGS) diff --git a/usr/src/lib/libc_psr/sun4u-opl/common/memcpy.s b/usr/src/lib/libc_psr/sun4u-opl/common/memcpy.s index 8968fcec19..68e962a576 100644 --- a/usr/src/lib/libc_psr/sun4u-opl/common/memcpy.s +++ b/usr/src/lib/libc_psr/sun4u-opl/common/memcpy.s @@ -18,14 +18,15 @@ * * CDDL HEADER END */ + /* - * Copyright 2006 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 "memcpy.s" + .file "%M%" /* * memcpy(s1, s2, len) @@ -75,9 +76,6 @@ ANSI_PRAGMA_WEAK(memmove,function) ANSI_PRAGMA_WEAK(memcpy,function) -#include "synonyms.h" - - ENTRY(memmove) prefetch [%o1], N_READS_STRONG prefetch [%o0], N_WRITES_STRONG diff --git a/usr/src/lib/libc_psr/sun4u-us3/common/memcmp.s b/usr/src/lib/libc_psr/sun4u-us3/common/memcmp.s index aa1d149f88..c96238e6c2 100644 --- a/usr/src/lib/libc_psr/sun4u-us3/common/memcmp.s +++ b/usr/src/lib/libc_psr/sun4u-us3/common/memcmp.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 2005 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%" @@ -58,8 +58,6 @@ ANSI_PRAGMA_WEAK(memcmp,function) -#include "synonyms.h" - ENTRY(memcmp) cmp %o0, %o1 ! s1 == s2? be %ncc, .cmpeq diff --git a/usr/src/lib/libc_psr/sun4u-us3/common/memcpy.s b/usr/src/lib/libc_psr/sun4u-us3/common/memcpy.s index 30351a1042..125955e232 100644 --- a/usr/src/lib/libc_psr/sun4u-us3/common/memcpy.s +++ b/usr/src/lib/libc_psr/sun4u-us3/common/memcpy.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 2006 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%" @@ -73,9 +73,6 @@ ANSI_PRAGMA_WEAK(memmove,function) ANSI_PRAGMA_WEAK(memcpy,function) -#include "synonyms.h" - - ENTRY(memmove) cmp %o1, %o0 ! if from address is >= to use forward copy bgeu %ncc, .forcpy ! else use backward if ... diff --git a/usr/src/lib/libc_psr/sun4u-us3/common/memset.s b/usr/src/lib/libc_psr/sun4u-us3/common/memset.s index 6475afa479..459dd96934 100644 --- a/usr/src/lib/libc_psr/sun4u-us3/common/memset.s +++ b/usr/src/lib/libc_psr/sun4u-us3/common/memset.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,14 +18,16 @@ * * CDDL HEADER END */ + /* - * Copyright 2006 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%" + /* * char *memset(sp, c, n) * @@ -54,8 +55,6 @@ ANSI_PRAGMA_WEAK(memset,function) -#include "synonyms.h" - #define ALIGN8(X) (((X) + 7) & ~7) #define BLOCK_SIZE 64 diff --git a/usr/src/lib/libc_psr/sun4u/Makefile.com b/usr/src/lib/libc_psr/sun4u/Makefile.com index e9482afa13..7b5a11d942 100644 --- a/usr/src/lib/libc_psr/sun4u/Makefile.com +++ b/usr/src/lib/libc_psr/sun4u/Makefile.com @@ -20,7 +20,7 @@ # # -# Copyright 2007 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" @@ -44,7 +44,7 @@ CTFCONVERT_POST = : CTFMERGE_LIB = : LIBS = $(DYNLIB) -IFLAGS = -I$(SRC)/lib/libc/inc -I$(SRC)/uts/$(PLATFORM) \ +IFLAGS = -I$(SRC)/uts/$(PLATFORM) \ -I$(ROOT)/usr/platform/$(PLATFORM)/include CPPFLAGS = -D_REENTRANT -D$(MACH) $(IFLAGS) $(CPPFLAGS.master) ASDEFS = -D__STDC__ -D_ASM $(CPPFLAGS) diff --git a/usr/src/lib/libc_psr/sun4u/common/memcmp.s b/usr/src/lib/libc_psr/sun4u/common/memcmp.s index b20a5619c2..b5c0342c9d 100644 --- a/usr/src/lib/libc_psr/sun4u/common/memcmp.s +++ b/usr/src/lib/libc_psr/sun4u/common/memcmp.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 1995-2003 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%" @@ -56,8 +56,6 @@ ANSI_PRAGMA_WEAK(memcmp,function) -#include "synonyms.h" - ENTRY(memcmp) cmp %o0, %o1 ! s1 == s2? be %ncc, .cmpeq diff --git a/usr/src/lib/libc_psr/sun4u/common/memcpy.s b/usr/src/lib/libc_psr/sun4u/common/memcpy.s index dee0af7412..751d8a81d0 100644 --- a/usr/src/lib/libc_psr/sun4u/common/memcpy.s +++ b/usr/src/lib/libc_psr/sun4u/common/memcpy.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,14 +18,16 @@ * * CDDL HEADER END */ + /* - * Copyright 1995-2003 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%" + /* * memcpy(s1, s2, len) * @@ -57,8 +58,6 @@ ANSI_PRAGMA_WEAK(memmove,function) ANSI_PRAGMA_WEAK(memcpy,function) -#include "synonyms.h" - ENTRY(memmove) cmp %o1, %o0 ! if from address is >= to use forward copy bgeu %ncc, forcpy ! else use backward if ... diff --git a/usr/src/lib/libc_psr/sun4u/common/memset.s b/usr/src/lib/libc_psr/sun4u/common/memset.s index 3bfb3a193f..64533915b9 100644 --- a/usr/src/lib/libc_psr/sun4u/common/memset.s +++ b/usr/src/lib/libc_psr/sun4u/common/memset.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,14 +18,16 @@ * * CDDL HEADER END */ + /* - * Copyright 1995-1998,2000-2003 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%" + /* * char *memset(sp, c, n) * @@ -54,8 +55,6 @@ ANSI_PRAGMA_WEAK(memset,function) -#include "synonyms.h" - #define ALIGN8(X) (((X) + 7) & ~7) .section ".text" diff --git a/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile.com b/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile.com index b04ba6255d..40f0cae3e9 100644 --- a/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile.com +++ b/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile.com @@ -20,7 +20,7 @@ # # -# Copyright 2007 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" @@ -44,7 +44,7 @@ CTFCONVERT_POST = : CTFMERGE_LIB = : LIBS = $(DYNLIB) -IFLAGS = -I$(SRC)/lib/libc/inc -I$(SRC)/uts/sun4u \ +IFLAGS = -I$(SRC)/uts/sun4u \ -I$(ROOT)/usr/platform/sun4u/include # See note in memcpy.s for use of bst threshold. CPPFLAGS = -DBSTORE_SIZE=256 \ diff --git a/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile.com b/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile.com index fabbd777bd..0a625fe91f 100644 --- a/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile.com +++ b/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile.com @@ -20,7 +20,7 @@ # # -# Copyright 2007 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" @@ -44,7 +44,7 @@ CTFCONVERT_POST = : CTFMERGE_LIB = : LIBS = $(DYNLIB) -IFLAGS = -I$(SRC)/lib/libc/inc -I$(SRC)/uts/sun4u \ +IFLAGS = -I$(SRC)/uts/sun4u \ -I$(ROOT)/usr/platform/sun4u/include # See note in memcpy.s for use of bst threshold. CPPFLAGS = -DBSTORE_SIZE=65536 -DPANTHER_ONLY \ diff --git a/usr/src/lib/libc_psr/sun4v/common/memcpy.s b/usr/src/lib/libc_psr/sun4v/common/memcpy.s index 9dd0c89993..af5547dd9d 100644 --- a/usr/src/lib/libc_psr/sun4v/common/memcpy.s +++ b/usr/src/lib/libc_psr/sun4v/common/memcpy.s @@ -18,14 +18,16 @@ * * CDDL HEADER END */ + /* - * Copyright 2007 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%" - .file "memcpy.s" /* * memcpy(s1, s2, len) * @@ -190,8 +192,6 @@ ANSI_PRAGMA_WEAK(memmove,function) ANSI_PRAGMA_WEAK(memcpy,function) -#include "synonyms.h" - ENTRY(memmove) cmp %o1, %o0 ! if from address is >= to use forward copy bgeu,pn %ncc, forcpy ! else use backward if ... diff --git a/usr/src/lib/libc_psr/sun4v/common/memset.s b/usr/src/lib/libc_psr/sun4v/common/memset.s index 2ffbaf0e3d..0596698bd8 100644 --- a/usr/src/lib/libc_psr/sun4v/common/memset.s +++ b/usr/src/lib/libc_psr/sun4v/common/memset.s @@ -18,14 +18,16 @@ * * CDDL HEADER END */ + /* - * Copyright 2007 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%" - .file "memset.s" /* * char *memset(sp, c, n) * @@ -69,8 +71,6 @@ ANSI_PRAGMA_WEAK(memset,function) -#include "synonyms.h" - .section ".text" .align 32 diff --git a/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com b/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com index 2085c80f0c..6d3709577a 100644 --- a/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com +++ b/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 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" @@ -38,8 +38,7 @@ CTFCONVERT_POST = : CTFMERGE_LIB = : LIBS = $(DYNLIB) -IFLAGS = -I$(SRC)/lib/libc/inc -I$(SRC)/uts/sun4v \ - -I$(ROOT)/usr/include/v9 +IFLAGS = -I$(SRC)/uts/sun4v -I$(ROOT)/usr/include/v9 CPPFLAGS = -D_REENTRANT -D$(MACH) -DNIAGARA_IMPL $(IFLAGS) $(CPPFLAGS.master) ASDEFS = -D__STDC__ -D_ASM $(CPPFLAGS) ASFLAGS = -P $(ASDEFS) diff --git a/usr/src/lib/libc_psr/sun4v_hwcap2/Makefile.com b/usr/src/lib/libc_psr/sun4v_hwcap2/Makefile.com index ac2e1f48f6..846d33737f 100644 --- a/usr/src/lib/libc_psr/sun4v_hwcap2/Makefile.com +++ b/usr/src/lib/libc_psr/sun4v_hwcap2/Makefile.com @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 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" @@ -38,7 +38,7 @@ CTFCONVERT_POST = : CTFMERGE_LIB = : LIBS = $(DYNLIB) -IFLAGS = -I$(SRC)/lib/libc/inc -I$(SRC)/uts/sun4v \ +IFLAGS = -I$(SRC)/uts/sun4v \ -I$(ROOT)/usr/platform/sun4v/include -I$(ROOT)/usr/include/v9 CPPFLAGS = -D_REENTRANT -D$(MACH) -DNIAGARA2_IMPL $(IFLAGS) $(CPPFLAGS.master) ASDEFS = -D__STDC__ -D_ASM $(CPPFLAGS) |
