diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-23 12:45:43 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-23 12:45:43 +0000 |
| commit | e37c335e4639fbb0e0f2fc5f4efd7712783da31d (patch) | |
| tree | 09af878cd21ad63b1a23dc7b759e1739561330a7 /usr | |
| parent | dec418ad77ca1ad8b6560e627d4f4d4cee27ab5c (diff) | |
| parent | 82201043d5f4a0049e59f7176465e780eb8d8730 (diff) | |
| download | illumos-joyent-e37c335e4639fbb0e0f2fc5f4efd7712783da31d.tar.gz | |
[illumos-gate merge]
commit 82201043d5f4a0049e59f7176465e780eb8d8730
7595 sgs native-proto fails on pre-7029 illumos-gate
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/cmd/sgs/include/conv.h | 7 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/ld/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/liblddbg/Makefile.com | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/usr/src/cmd/sgs/include/conv.h b/usr/src/cmd/sgs/include/conv.h index da1320f347..14b6a185a3 100644 --- a/usr/src/cmd/sgs/include/conv.h +++ b/usr/src/cmd/sgs/include/conv.h @@ -26,6 +26,7 @@ * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 DEY Storage Systems, Inc. All rights reserved. * Copyright (c) 2015, Joyent, Inc. All rights reserved. + * Copyright 2016 RackTop Systems. */ #ifndef _CONV_H @@ -42,7 +43,9 @@ #include <sgs.h> #include <sgsmsg.h> +#ifndef NATIVE_BUILD #include <sys/secflags.h> +#endif #ifdef __cplusplus extern "C" { @@ -328,12 +331,14 @@ typedef union { char buf[CONV_CNOTE_PROC_FLAG_BUFSIZE]; } Conv_cnote_proc_flag_buf_t; +#ifndef NATIVE_BUILD /* conv_prsecflags() */ #define CONV_PRSECFLAGS_BUFSIZE 57 typedef union { Conv_inv_buf_t inv_buf; char buf[CONV_PRSECFLAGS_BUFSIZE]; } Conv_secflags_buf_t; +#endif /* conv_cnote_sigset() */ #define CONV_CNOTE_SIGSET_BUFSIZE 639 @@ -831,8 +836,10 @@ extern const char *conv_cnote_pr_why(short, Conv_fmt_flags_t, Conv_inv_buf_t *); extern const char *conv_cnote_priv(int, Conv_fmt_flags_t, Conv_inv_buf_t *); +#ifndef NATIVE_BUILD extern const char *conv_prsecflags(secflagset_t, Conv_fmt_flags_t, Conv_secflags_buf_t *); +#endif extern const char *conv_cnote_psetid(int, Conv_fmt_flags_t, Conv_inv_buf_t *); extern const char *conv_cnote_sa_flags(int, Conv_fmt_flags_t, diff --git a/usr/src/cmd/sgs/ld/Makefile.com b/usr/src/cmd/sgs/ld/Makefile.com index 1462a7af29..01ba9c1ff1 100644 --- a/usr/src/cmd/sgs/ld/Makefile.com +++ b/usr/src/cmd/sgs/ld/Makefile.com @@ -21,6 +21,7 @@ # # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2016 RackTop Systems. # PROG = ld @@ -52,6 +53,7 @@ CLEANFILES += $(LINTOUTS) native := LDFLAGS = -R$(SGSPROTO) $(ZNOVERSION) native := LDLIBS = -L$(SGSPROTO) $(LD_LIB) -lelf $(CONVLIBDIR) \ $(CONV_LIB) +native := CPPFLAGS += -DNATIVE_BUILD BLTDEFS= msg.h BLTDATA= msg.c diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.com b/usr/src/cmd/sgs/liblddbg/Makefile.com index d1dc9dd27c..860c62369a 100644 --- a/usr/src/cmd/sgs/liblddbg/Makefile.com +++ b/usr/src/cmd/sgs/liblddbg/Makefile.com @@ -21,6 +21,7 @@ # # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2016 RackTop Systems. # LIBRARY = liblddbg.a @@ -67,6 +68,7 @@ DYNFLAGS += $(VERSREF) $(CC_USE_PROTO) '-R$$ORIGIN' LDLIBS += $(CONVLIBDIR) $(CONV_LIB) -lc native := DYNFLAGS += $(CONVLIBDIR) +native := CPPFLAGS += -DNATIVE_BUILD BLTDEFS = msg.h BLTDATA = msg.c |