summaryrefslogtreecommitdiff
path: root/usr/src/lib/libc
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/libc')
-rw-r--r--usr/src/lib/libc/Makefile23
-rw-r--r--usr/src/lib/libc/capabilities/Makefile1
-rw-r--r--usr/src/lib/libc/capabilities/sun4u-opl/Makefile1
-rw-r--r--usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile1
-rw-r--r--usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile1
-rw-r--r--usr/src/lib/libc/capabilities/sun4u/Makefile1
-rw-r--r--usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile1
-rw-r--r--usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile1
-rw-r--r--usr/src/lib/libc/i386/etc/Makefile2
-rw-r--r--usr/src/lib/libc/port/gen/sysconf.c5
-rw-r--r--usr/src/lib/libc/port/stdio/ftell.c2
11 files changed, 13 insertions, 26 deletions
diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile
index 9f2e51e4f7..ebc1338484 100644
--- a/usr/src/lib/libc/Makefile
+++ b/usr/src/lib/libc/Makefile
@@ -47,6 +47,7 @@ ROOTVARIANTDIR64= $(ROOTLIB64)/libc
# include common library definitions
include ../Makefile.lib
+include ../Makefile.rootfs
#
# on some architectures, we build multiple libc variants
@@ -94,7 +95,7 @@ $(BUILD64)SUBDIRS += $(MACH64) $(VARIANT_SUBDIRS64)
LIBS = $(DYNLIB)
-ROOTLIBS64= $(ROOTLIBDIR64)/$(DYNLIB)
+ROOTLIBS64= $(ROOTLIB64)/$(DYNLIB)
MACHLIBS64= $(MACH64)/$(DYNLIB)
VARIANTLIBS= $(VARIANTS:%=$(MACH)_%/$(VARBLD)/$(LIBBASENAME)_%.so.1)
VARIANTLIBS64= $(VARIANTS64:%=$(MACH)_%/$(VARBLD64)/$(LIBBASENAME)_%.so.1)
@@ -112,8 +113,8 @@ CLOBBERFILES += THIRDPARTYLICENSE extract-copyright
$(ROOTHDRDIR)/%: port/gen/%
$(INS.file)
-$(ROOTLIBDIR)/$(DYNLIB) := FILEMODE = 755
-$(ROOTLIBDIR64)/$(DYNLIB) := FILEMODE = 755
+$(ROOTLIB)/$(DYNLIB) := FILEMODE = 755
+$(ROOTLIB64)/$(DYNLIB) := FILEMODE = 755
$(ROOTFS_LIBDIR)/$(DYNLIB) := FILEMODE = 755
$(ROOTFS_LIBDIR64)/$(DYNLIB) := FILEMODE = 755
@@ -167,7 +168,9 @@ $($(MACH)_COMP): FRC
install: all \
etc \
inslib32 \
- $(BUILD64) inslib64
+ $(ROOTCOMPATLINKS)
+
+$(BUILD64)install: inslib64 $(ROOTCOMPATLINKS64)
inslib32: $(ROOTFS_LIBS) $(ROOTFS_LINKS) $(ROOTVARIANTLIBS)
@@ -179,15 +182,6 @@ all_h: $(MACH)/assym.h $(MACH64)/assym.h
check: $(CHECKHDRS)
-$(ROOTFS_LIB)/%: $(MACH)/%
- $(INS.file)
-$(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS)
- $(INS.liblink)
-$(ROOTFS_LIB64)/%: $(MACH64)/%
- $(INS.file)
-$(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS)
- $(INS.liblink)
-
$(ROOTVARIANTDIR): $(ROOTLIB)
$(INS.dir)
$(ROOTVARIANTDIR)/%: $(ROOTVARIANTDIR) $(VAR1_BLDDIR)/%
@@ -211,7 +205,6 @@ all := TARGET= all
install := TARGET= install
clean := TARGET= clean
clobber := TARGET= clobber
-lint := TARGET= lint
.PARALLEL: $(SUBDIRS)
@@ -223,7 +216,6 @@ clobber: $(SUBDIRS) etc clobber_local
clobber_local:
$(RM) $(CLOBBERFILES)
-lint:
_msg: $(MSGDOMAIN) catalog
@@ -237,5 +229,6 @@ cscope.out tags: FRC
$(XREF) -x $@
FRC:
+
# include MACH-specific library targets
include ../Makefile.mach
diff --git a/usr/src/lib/libc/capabilities/Makefile b/usr/src/lib/libc/capabilities/Makefile
index ab390454fd..ca514f03e9 100644
--- a/usr/src/lib/libc/capabilities/Makefile
+++ b/usr/src/lib/libc/capabilities/Makefile
@@ -47,7 +47,6 @@ install := TARGET= install
all clean clobber install: \
$(SUBDIRS)
-lint:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libc/capabilities/sun4u-opl/Makefile b/usr/src/lib/libc/capabilities/sun4u-opl/Makefile
index 247f7c3456..cccb8eeab5 100644
--- a/usr/src/lib/libc/capabilities/sun4u-opl/Makefile
+++ b/usr/src/lib/libc/capabilities/sun4u-opl/Makefile
@@ -37,7 +37,6 @@ install := TARGET= install
all clean clobber install: \
$(SUBDIRS)
-lint:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile
index 77aed04fa7..dddbce3b10 100644
--- a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile
+++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap1/Makefile
@@ -39,7 +39,6 @@ install := TARGET= install
all clean clobber install: \
$(SUBDIRS)
-lint:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile
index 77aed04fa7..dddbce3b10 100644
--- a/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile
+++ b/usr/src/lib/libc/capabilities/sun4u-us3-hwcap2/Makefile
@@ -39,7 +39,6 @@ install := TARGET= install
all clean clobber install: \
$(SUBDIRS)
-lint:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libc/capabilities/sun4u/Makefile b/usr/src/lib/libc/capabilities/sun4u/Makefile
index 77aed04fa7..dddbce3b10 100644
--- a/usr/src/lib/libc/capabilities/sun4u/Makefile
+++ b/usr/src/lib/libc/capabilities/sun4u/Makefile
@@ -39,7 +39,6 @@ install := TARGET= install
all clean clobber install: \
$(SUBDIRS)
-lint:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile
index a23938e6d9..44ad706cab 100644
--- a/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile
+++ b/usr/src/lib/libc/capabilities/sun4v-hwcap1/Makefile
@@ -38,7 +38,6 @@ install := TARGET= install
all clean clobber install: \
$(SUBDIRS)
-lint:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile b/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile
index 77aed04fa7..dddbce3b10 100644
--- a/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile
+++ b/usr/src/lib/libc/capabilities/sun4v-hwcap2/Makefile
@@ -39,7 +39,6 @@ install := TARGET= install
all clean clobber install: \
$(SUBDIRS)
-lint:
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libc/i386/etc/Makefile b/usr/src/lib/libc/i386/etc/Makefile
index 98506e66f6..616190a7e8 100644
--- a/usr/src/lib/libc/i386/etc/Makefile
+++ b/usr/src/lib/libc/i386/etc/Makefile
@@ -35,7 +35,6 @@ all:= TARGET= all
install:= TARGET= install
clean:= TARGET= clean
clobber:= TARGET= clobber
-lint:= TARGET= lint
ROOTETC= $(ROOT)/etc
ETCFLASHD= $(ROOTETC)/flash
@@ -61,7 +60,6 @@ install: all .WAIT $(DIRS) .WAIT $(ETCFLASHPREPROG)
cstyle:
-lint:
$(FLASHPREPROG): $(FLASHPRESRC)
$(CP) $@.ksh $@
diff --git a/usr/src/lib/libc/port/gen/sysconf.c b/usr/src/lib/libc/port/gen/sysconf.c
index 8e852ce1c8..904b848027 100644
--- a/usr/src/lib/libc/port/gen/sysconf.c
+++ b/usr/src/lib/libc/port/gen/sysconf.c
@@ -27,7 +27,7 @@
*/
/* Copyright (c) 1988 AT&T */
-/* All Rights Reserved */
+/* All Rights Reserved */
/* sysconf(3C) - returns system configuration information */
@@ -464,6 +464,9 @@ sysconf(int name)
case _SC_EPHID_MAX:
return (_sysconfig(_CONFIG_EPHID_MAX));
+ case _SC_UADDR_MAX:
+ return (_sysconfig(_CONFIG_UADDR_MAX));
+
/* UNIX 03 names - XPG6/SUSv3/POSIX.1-2001 */
case _SC_REGEXP:
diff --git a/usr/src/lib/libc/port/stdio/ftell.c b/usr/src/lib/libc/port/stdio/ftell.c
index dae2abea03..31aabec082 100644
--- a/usr/src/lib/libc/port/stdio/ftell.c
+++ b/usr/src/lib/libc/port/stdio/ftell.c
@@ -91,7 +91,7 @@ ftell_common(FILE *iop)
tres += adjust;
FUNLOCKFILE(lk);
- return ((long)tres);
+ return (tres);
}
long