diff options
| author | Patrick Mooney <pmooney@pfmooney.com> | 2016-09-08 20:32:04 +0000 |
|---|---|---|
| committer | Patrick Mooney <pmooney@pfmooney.com> | 2016-09-23 22:14:00 +0000 |
| commit | d21e83058c8edeb1becd9202380d088cb056f0c4 (patch) | |
| tree | e9e15674780879aa849b8b4cd4f765008cd5544d /usr/src/lib/libc | |
| parent | 9608e4c230925bfc3f7987c1f8d43ad6e01e8f86 (diff) | |
| download | illumos-joyent-d21e83058c8edeb1becd9202380d088cb056f0c4.tar.gz | |
OS-5637 lxbrand vdso busts golang stack budget
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Ryan Zezeski <rpz@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Jerry Jelinek <jerry.jelinek@joyent.com>
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/amd64/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc/i386/Makefile.com | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc/i386/sys/__clock_gettime.c | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile index a2803faedf..b5514c4bed 100644 --- a/usr/src/lib/libc/amd64/Makefile +++ b/usr/src/lib/libc/amd64/Makefile @@ -37,8 +37,8 @@ CPP= /usr/lib/cpp TARGET_ARCH= amd64 # include comm page definitions -include $(SRC)/lib/commpage/Makefile.shared.targ include $(SRC)/lib/commpage/Makefile.shared.com +include $(SRC)/lib/commpage/Makefile.shared.targ # objects are grouped by source directory @@ -1066,7 +1066,7 @@ BUILD.AR= $(RM) $@ ; \ $(AR) q $@ `$(LORDER) $(MOSTOBJS:%=$(DIR)/%) | $(GREP) -v ' L ' | $(TSORT)` # extra files for the clean target -CLEANFILES= \ +CLEANFILES+= \ $(LIBCDIR)/port/gen/errlst.c \ $(LIBCDIR)/port/gen/new_list.c \ assym.h \ diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com index 7c768d1019..d3176ce802 100644 --- a/usr/src/lib/libc/i386/Makefile.com +++ b/usr/src/lib/libc/i386/Makefile.com @@ -35,8 +35,8 @@ CPP= /usr/lib/cpp TARGET_ARCH= i386 # include comm page definitions -include $(SRC)/lib/commpage/Makefile.shared.targ include $(SRC)/lib/commpage/Makefile.shared.com +include $(SRC)/lib/commpage/Makefile.shared.targ VALUES= values-Xa.o @@ -1127,7 +1127,7 @@ BUILD.AR= $(RM) $@ ; \ $(AR) q $@ `$(LORDER) $(MOSTOBJS:%=$(DIR)/%) | $(GREP) -v ' L ' | $(TSORT)` # extra files for the clean target -CLEANFILES= \ +CLEANFILES+= \ $(LIBCDIR)/port/gen/errlst.c \ $(LIBCDIR)/port/gen/new_list.c \ assym.h \ diff --git a/usr/src/lib/libc/i386/sys/__clock_gettime.c b/usr/src/lib/libc/i386/sys/__clock_gettime.c index cdc40f7747..d8782323ed 100644 --- a/usr/src/lib/libc/i386/sys/__clock_gettime.c +++ b/usr/src/lib/libc/i386/sys/__clock_gettime.c @@ -25,16 +25,14 @@ __clock_gettime(clockid_t clock_id, timespec_t *tp) { comm_page_t *cp = (comm_page_t *)__uberdata.ub_comm_page; - if (cp != NULL && __cp_can_gettime(cp) == 0) { + if (cp != NULL && __cp_can_gettime(cp) != 0) { switch (clock_id) { case __CLOCK_REALTIME0: case CLOCK_REALTIME: - __cp_clock_gettime_realtime(cp, tp); - return (0); + return (__cp_clock_gettime_realtime(cp, tp)); case CLOCK_MONOTONIC: - hrt2ts(__cp_gethrtime(cp), tp); - return (0); + return (__cp_clock_gettime_monotonic(cp, tp)); default: /* Fallback */ |