summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorcraigm <none@none>2006-04-21 16:05:25 -0700
committercraigm <none@none>2006-04-21 16:05:25 -0700
commit31c168a2a91c2e8bc74cf90f132bdc2739f90043 (patch)
treeec17e7f803ede834a87f6d583501be9e2c1af449 /usr/src
parent0400e0b7b3d7439bda29b4d73e29bff158199bc4 (diff)
downloadillumos-joyent-31c168a2a91c2e8bc74cf90f132bdc2739f90043.tar.gz
6416685 minor corrections to 1085341 - fix build noise and header
--HG-- rename : usr/src/lib/extendedFILE/spec/Makefile => deleted_files/usr/src/lib/extendedFILE/spec/Makefile rename : usr/src/lib/extendedFILE/spec/Makefile.targ => deleted_files/usr/src/lib/extendedFILE/spec/Makefile.targ rename : usr/src/lib/extendedFILE/spec/extendedFILE.spec => deleted_files/usr/src/lib/extendedFILE/spec/extendedFILE.spec rename : usr/src/lib/extendedFILE/spec/i386/Makefile => deleted_files/usr/src/lib/extendedFILE/spec/i386/Makefile rename : usr/src/lib/extendedFILE/spec/sparc/Makefile => deleted_files/usr/src/lib/extendedFILE/spec/sparc/Makefile rename : usr/src/lib/extendedFILE/spec/versions => deleted_files/usr/src/lib/extendedFILE/spec/versions
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/head/stdio_ext.h2
-rw-r--r--usr/src/lib/extendedFILE/Makefile2
-rw-r--r--usr/src/lib/extendedFILE/Makefile.com8
-rw-r--r--usr/src/lib/extendedFILE/common/mapfile-vers (renamed from usr/src/lib/extendedFILE/spec/versions)12
-rw-r--r--usr/src/lib/extendedFILE/i386/Makefile1
-rw-r--r--usr/src/lib/extendedFILE/sparc/Makefile1
-rw-r--r--usr/src/lib/extendedFILE/spec/Makefile59
-rw-r--r--usr/src/lib/extendedFILE/spec/Makefile.targ35
-rw-r--r--usr/src/lib/extendedFILE/spec/extendedFILE.spec26
-rw-r--r--usr/src/lib/extendedFILE/spec/i386/Makefile41
-rw-r--r--usr/src/lib/extendedFILE/spec/sparc/Makefile43
11 files changed, 13 insertions, 217 deletions
diff --git a/usr/src/head/stdio_ext.h b/usr/src/head/stdio_ext.h
index 13e19d171a..77465c9930 100644
--- a/usr/src/head/stdio_ext.h
+++ b/usr/src/head/stdio_ext.h
@@ -76,7 +76,7 @@ extern int __fsetlocking(FILE *stream, int type);
* Extended FILE enabling function.
*/
#if defined(_LP64) && !defined(__lint)
-#define enable_extended_FILE_stdio(fd, act) (255)
+#define enable_extended_FILE_stdio(fd, act) (0)
#else
extern int enable_extended_FILE_stdio(int, int);
#endif
diff --git a/usr/src/lib/extendedFILE/Makefile b/usr/src/lib/extendedFILE/Makefile
index 714a9f062b..927f5c41c8 100644
--- a/usr/src/lib/extendedFILE/Makefile
+++ b/usr/src/lib/extendedFILE/Makefile
@@ -28,7 +28,7 @@
include ../Makefile.lib
-SUBDIRS= spec .WAIT $(MACH)
+SUBDIRS= $(MACH)
LIBRARY= extendedFILE.a
diff --git a/usr/src/lib/extendedFILE/Makefile.com b/usr/src/lib/extendedFILE/Makefile.com
index cc9da90fcf..765237b411 100644
--- a/usr/src/lib/extendedFILE/Makefile.com
+++ b/usr/src/lib/extendedFILE/Makefile.com
@@ -34,8 +34,7 @@ OBJECTS = extendedFILE.o
# include library definitions
include ../../Makefile.lib
-MAPFILE = $(MAPDIR)/mapfile
-CLOBBERFILES += $(MAPFILE)
+MAPFILE = ../common/mapfile-vers
SRCS = $(OBJECTS:%.o=../common/%.c)
@@ -54,10 +53,7 @@ all: $(LIBS)
lint:
$(LINT.c) $(SRCS) $(LDLIBS)
-$(DYNLIB): $(MAPFILE)
-
-$(MAPFILE):
- @cd $(MAPDIR); $(MAKE) mapfile
+$(DYNLIB):
# include library targets
include ../../Makefile.targ
diff --git a/usr/src/lib/extendedFILE/spec/versions b/usr/src/lib/extendedFILE/common/mapfile-vers
index 7e4d533257..2f01f7ebab 100644
--- a/usr/src/lib/extendedFILE/spec/versions
+++ b/usr/src/lib/extendedFILE/common/mapfile-vers
@@ -1,7 +1,4 @@
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
@@ -21,5 +18,14 @@
#
# CDDL HEADER END
#
+
+#
+# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
# ident "%Z%%M% %I% %E% SMI"
#
+{
+ local:
+ *;
+};
diff --git a/usr/src/lib/extendedFILE/i386/Makefile b/usr/src/lib/extendedFILE/i386/Makefile
index 85f8644b6f..381121ced8 100644
--- a/usr/src/lib/extendedFILE/i386/Makefile
+++ b/usr/src/lib/extendedFILE/i386/Makefile
@@ -26,7 +26,6 @@
#
# lib/extendedFILE/i386/Makefile
-MAPDIR= ../spec/i386
include ../Makefile.com
.KEEP_STATE:
diff --git a/usr/src/lib/extendedFILE/sparc/Makefile b/usr/src/lib/extendedFILE/sparc/Makefile
index ec425e3705..0ab0130f48 100644
--- a/usr/src/lib/extendedFILE/sparc/Makefile
+++ b/usr/src/lib/extendedFILE/sparc/Makefile
@@ -26,7 +26,6 @@
#
# lib/extendedFILE/sparc/Makefile
-MAPDIR= ../spec/sparc
include ../Makefile.com
.KEEP_STATE:
diff --git a/usr/src/lib/extendedFILE/spec/Makefile b/usr/src/lib/extendedFILE/spec/Makefile
deleted file mode 100644
index 78ba8b1869..0000000000
--- a/usr/src/lib/extendedFILE/spec/Makefile
+++ /dev/null
@@ -1,59 +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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-
-i386_ARCHITECTURES = i386
-sparc_ARCHITECTURES = sparc
-
-all := TARGET= all
-install := TARGET= install
-clean := TARGET= clean
-clobber := TARGET= clobber
-lint := TARGET= lint
-
-.KEEP_STATE:
-
-all install clean clobber: $($(MACH)_ARCHITECTURES)
-
-$($(MACH)_ARCHITECTURES): FRC
- @cd $@; pwd; $(MAKE) $(TARGET)
-
-#
-# This will make sure that any target not
-# explicitly defined will not break the build.
-#
-# XXX pmake on intel does not like the following rules
-# %: ignore_and_exit_quietly
-# ignore_and_exit_quietly:
-#
-# So here it is manually
-#
-IGNORE= _msg catalog install_h delete \
- package tcov debug private_h \
- check analyse test dynamic lint
-$(IGNORE):
-
-FRC:
diff --git a/usr/src/lib/extendedFILE/spec/Makefile.targ b/usr/src/lib/extendedFILE/spec/Makefile.targ
deleted file mode 100644
index 13900068e7..0000000000
--- a/usr/src/lib/extendedFILE/spec/Makefile.targ
+++ /dev/null
@@ -1,35 +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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
-# lib/libplot/plot/spec/Makefile.targ
-
-LIBRARY = extendedFILE.a
-VERS = .1
-
-OBJECTS = extendedFILE.o
-
-TRANSCPP =
-SPECCPP =
diff --git a/usr/src/lib/extendedFILE/spec/extendedFILE.spec b/usr/src/lib/extendedFILE/spec/extendedFILE.spec
deleted file mode 100644
index b916eb9dd4..0000000000
--- a/usr/src/lib/extendedFILE/spec/extendedFILE.spec
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# 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
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# lib/extendedFILE/spec/extendedFILE.spec
diff --git a/usr/src/lib/extendedFILE/spec/i386/Makefile b/usr/src/lib/extendedFILE/spec/i386/Makefile
deleted file mode 100644
index 37a82ccaac..0000000000
--- a/usr/src/lib/extendedFILE/spec/i386/Makefile
+++ /dev/null
@@ -1,41 +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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
-# lib/extendedFILE/spec/i386/Makefile
-
-include ../Makefile.targ
-
-# Add arch specific objects here
-OBJECTS +=
-
-include $(SRC)/lib/Makefile.lib
-
-# Uncomment the following if the linker complains
-#i386_C_PICFLAGS = -K PIC
-
-include $(SRC)/lib/Makefile.spec
-
-install: $(ROOTABILIB)
diff --git a/usr/src/lib/extendedFILE/spec/sparc/Makefile b/usr/src/lib/extendedFILE/spec/sparc/Makefile
deleted file mode 100644
index 53fe30b98a..0000000000
--- a/usr/src/lib/extendedFILE/spec/sparc/Makefile
+++ /dev/null
@@ -1,43 +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 2006 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
-# lib/extendedFILE/spec/sparc/Makefile
-
-.KEEP_STATE:
-
-include ../Makefile.targ
-
-# Add arch specific objects here
-OBJECTS +=
-
-include $(SRC)/lib/Makefile.lib
-
-# Uncomment the following if the linker complains
-#sparc_C_PICFLAGS = -K PIC
-
-include $(SRC)/lib/Makefile.spec
-
-install: $(ROOTABILIB)