1575 untangle libmlrpc from SMB server
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
NEX-15554 make-smbsrv needs updates
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-15554 make-smbsrv needs updates
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-9560 drop local ACPI CA changes
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
NEX-5200 native tools must reliably use a native adjunct
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
5773 Extra pointless steps in kernel module builds
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Josef Sipek <jeffpc@josefsipek.net>
Reviewed by: Rich Lowe <richlowe@richlowe.net>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Rich Lowe <richlowe@richlowe.net>
NEX-4083 Upstream changes from illumos 5917 and 5995
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
NEX-3128 remove dependency on sysidtool
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
NEX-3127 nza-kernel can't be built with fresh perl versions
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
NEX-3123 update gate build environment to [open]jdk7
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Jean McCormack <jean.mccormack@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
SMB-56 extended security NTLMSSP, inbound
re #12547 rb4015 Update ACPI CA to version 20130214
--HG--
rename : usr/src/uts/intel/io/acpica/debugger/dbcmds.c => usr/src/uts/intel/io/acpica/components/debugger/dbcmds.c
rename : usr/src/uts/intel/io/acpica/debugger/dbdisply.c => usr/src/uts/intel/io/acpica/components/debugger/dbdisply.c
rename : usr/src/uts/intel/io/acpica/debugger/dbexec.c => usr/src/uts/intel/io/acpica/components/debugger/dbexec.c
rename : usr/src/uts/intel/io/acpica/debugger/dbfileio.c => usr/src/uts/intel/io/acpica/components/debugger/dbfileio.c
rename : usr/src/uts/intel/io/acpica/debugger/dbhistry.c => usr/src/uts/intel/io/acpica/components/debugger/dbhistry.c
rename : usr/src/uts/intel/io/acpica/debugger/dbinput.c => usr/src/uts/intel/io/acpica/components/debugger/dbinput.c
rename : usr/src/uts/intel/io/acpica/debugger/dbmethod.c => usr/src/uts/intel/io/acpica/components/debugger/dbmethod.c
rename : usr/src/uts/intel/io/acpica/debugger/dbnames.c => usr/src/uts/intel/io/acpica/components/debugger/dbnames.c
rename : usr/src/uts/intel/io/acpica/debugger/dbstats.c => usr/src/uts/intel/io/acpica/components/debugger/dbstats.c
rename : usr/src/uts/intel/io/acpica/debugger/dbutils.c => usr/src/uts/intel/io/acpica/components/debugger/dbutils.c
rename : usr/src/uts/intel/io/acpica/debugger/dbxface.c => usr/src/uts/intel/io/acpica/components/debugger/dbxface.c
rename : usr/src/uts/intel/io/acpica/disassembler/dmbuffer.c => usr/src/uts/intel/io/acpica/components/disassembler/dmbuffer.c
rename : usr/src/uts/intel/io/acpica/disassembler/dmnames.c => usr/src/uts/intel/io/acpica/components/disassembler/dmnames.c
rename : usr/src/uts/intel/io/acpica/disassembler/dmobject.c => usr/src/uts/intel/io/acpica/components/disassembler/dmobject.c
rename : usr/src/uts/intel/io/acpica/disassembler/dmopcode.c => usr/src/uts/intel/io/acpica/components/disassembler/dmopcode.c
rename : usr/src/uts/intel/io/acpica/disassembler/dmresrc.c => usr/src/uts/intel/io/acpica/components/disassembler/dmresrc.c
rename : usr/src/uts/intel/io/acpica/disassembler/dmresrcl.c => usr/src/uts/intel/io/acpica/components/disassembler/dmresrcl.c
rename : usr/src/uts/intel/io/acpica/disassembler/dmresrcs.c => usr/src/uts/intel/io/acpica/components/disassembler/dmresrcs.c
rename : usr/src/uts/intel/io/acpica/disassembler/dmutils.c => usr/src/uts/intel/io/acpica/components/disassembler/dmutils.c
rename : usr/src/uts/intel/io/acpica/disassembler/dmwalk.c => usr/src/uts/intel/io/acpica/components/disassembler/dmwalk.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dsargs.c => usr/src/uts/intel/io/acpica/components/dispatcher/dsargs.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dscontrol.c => usr/src/uts/intel/io/acpica/components/dispatcher/dscontrol.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dsfield.c => usr/src/uts/intel/io/acpica/components/dispatcher/dsfield.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dsinit.c => usr/src/uts/intel/io/acpica/components/dispatcher/dsinit.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dsmethod.c => usr/src/uts/intel/io/acpica/components/dispatcher/dsmethod.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dsmthdat.c => usr/src/uts/intel/io/acpica/components/dispatcher/dsmthdat.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dsobject.c => usr/src/uts/intel/io/acpica/components/dispatcher/dsobject.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dsopcode.c => usr/src/uts/intel/io/acpica/components/dispatcher/dsopcode.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dsutils.c => usr/src/uts/intel/io/acpica/components/dispatcher/dsutils.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dswexec.c => usr/src/uts/intel/io/acpica/components/dispatcher/dswexec.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dswload.c => usr/src/uts/intel/io/acpica/components/dispatcher/dswload.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dswload2.c => usr/src/uts/intel/io/acpica/components/dispatcher/dswload2.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dswscope.c => usr/src/uts/intel/io/acpica/components/dispatcher/dswscope.c
rename : usr/src/uts/intel/io/acpica/dispatcher/dswstate.c => usr/src/uts/intel/io/acpica/components/dispatcher/dswstate.c
rename : usr/src/uts/intel/io/acpica/events/evevent.c => usr/src/uts/intel/io/acpica/components/events/evevent.c
rename : usr/src/uts/intel/io/acpica/events/evglock.c => usr/src/uts/intel/io/acpica/components/events/evglock.c
rename : usr/src/uts/intel/io/acpica/events/evgpe.c => usr/src/uts/intel/io/acpica/components/events/evgpe.c
rename : usr/src/uts/intel/io/acpica/events/evgpeblk.c => usr/src/uts/intel/io/acpica/components/events/evgpeblk.c
rename : usr/src/uts/intel/io/acpica/events/evgpeinit.c => usr/src/uts/intel/io/acpica/components/events/evgpeinit.c
rename : usr/src/uts/intel/io/acpica/events/evgpeutil.c => usr/src/uts/intel/io/acpica/components/events/evgpeutil.c
rename : usr/src/uts/intel/io/acpica/events/evmisc.c => usr/src/uts/intel/io/acpica/components/events/evmisc.c
rename : usr/src/uts/intel/io/acpica/events/evregion.c => usr/src/uts/intel/io/acpica/components/events/evregion.c
rename : usr/src/uts/intel/io/acpica/events/evrgnini.c => usr/src/uts/intel/io/acpica/components/events/evrgnini.c
rename : usr/src/uts/intel/io/acpica/events/evsci.c => usr/src/uts/intel/io/acpica/components/events/evsci.c
rename : usr/src/uts/intel/io/acpica/events/evxface.c => usr/src/uts/intel/io/acpica/components/events/evxface.c
rename : usr/src/uts/intel/io/acpica/events/evxfevnt.c => usr/src/uts/intel/io/acpica/components/events/evxfevnt.c
rename : usr/src/uts/intel/io/acpica/events/evxfgpe.c => usr/src/uts/intel/io/acpica/components/events/evxfgpe.c
rename : usr/src/uts/intel/io/acpica/events/evxfregn.c => usr/src/uts/intel/io/acpica/components/events/evxfregn.c
rename : usr/src/uts/intel/io/acpica/executer/exconfig.c => usr/src/uts/intel/io/acpica/components/executer/exconfig.c
rename : usr/src/uts/intel/io/acpica/executer/exconvrt.c => usr/src/uts/intel/io/acpica/components/executer/exconvrt.c
rename : usr/src/uts/intel/io/acpica/executer/excreate.c => usr/src/uts/intel/io/acpica/components/executer/excreate.c
rename : usr/src/uts/intel/io/acpica/executer/exdebug.c => usr/src/uts/intel/io/acpica/components/executer/exdebug.c
rename : usr/src/uts/intel/io/acpica/executer/exdump.c => usr/src/uts/intel/io/acpica/components/executer/exdump.c
rename : usr/src/uts/intel/io/acpica/executer/exfield.c => usr/src/uts/intel/io/acpica/components/executer/exfield.c
rename : usr/src/uts/intel/io/acpica/executer/exfldio.c => usr/src/uts/intel/io/acpica/components/executer/exfldio.c
rename : usr/src/uts/intel/io/acpica/executer/exmisc.c => usr/src/uts/intel/io/acpica/components/executer/exmisc.c
rename : usr/src/uts/intel/io/acpica/executer/exmutex.c => usr/src/uts/intel/io/acpica/components/executer/exmutex.c
rename : usr/src/uts/intel/io/acpica/executer/exnames.c => usr/src/uts/intel/io/acpica/components/executer/exnames.c
rename : usr/src/uts/intel/io/acpica/executer/exoparg1.c => usr/src/uts/intel/io/acpica/components/executer/exoparg1.c
rename : usr/src/uts/intel/io/acpica/executer/exoparg2.c => usr/src/uts/intel/io/acpica/components/executer/exoparg2.c
rename : usr/src/uts/intel/io/acpica/executer/exoparg3.c => usr/src/uts/intel/io/acpica/components/executer/exoparg3.c
rename : usr/src/uts/intel/io/acpica/executer/exoparg6.c => usr/src/uts/intel/io/acpica/components/executer/exoparg6.c
rename : usr/src/uts/intel/io/acpica/executer/exprep.c => usr/src/uts/intel/io/acpica/components/executer/exprep.c
rename : usr/src/uts/intel/io/acpica/executer/exregion.c => usr/src/uts/intel/io/acpica/components/executer/exregion.c
rename : usr/src/uts/intel/io/acpica/executer/exresnte.c => usr/src/uts/intel/io/acpica/components/executer/exresnte.c
rename : usr/src/uts/intel/io/acpica/executer/exresolv.c => usr/src/uts/intel/io/acpica/components/executer/exresolv.c
rename : usr/src/uts/intel/io/acpica/executer/exresop.c => usr/src/uts/intel/io/acpica/components/executer/exresop.c
rename : usr/src/uts/intel/io/acpica/executer/exstore.c => usr/src/uts/intel/io/acpica/components/executer/exstore.c
rename : usr/src/uts/intel/io/acpica/executer/exstoren.c => usr/src/uts/intel/io/acpica/components/executer/exstoren.c
rename : usr/src/uts/intel/io/acpica/executer/exstorob.c => usr/src/uts/intel/io/acpica/components/executer/exstorob.c
rename : usr/src/uts/intel/io/acpica/executer/exsystem.c => usr/src/uts/intel/io/acpica/components/executer/exsystem.c
rename : usr/src/uts/intel/io/acpica/executer/exutils.c => usr/src/uts/intel/io/acpica/components/executer/exutils.c
rename : usr/src/uts/intel/io/acpica/hardware/hwacpi.c => usr/src/uts/intel/io/acpica/components/hardware/hwacpi.c
rename : usr/src/uts/intel/io/acpica/hardware/hwgpe.c => usr/src/uts/intel/io/acpica/components/hardware/hwgpe.c
rename : usr/src/uts/intel/io/acpica/hardware/hwpci.c => usr/src/uts/intel/io/acpica/components/hardware/hwpci.c
rename : usr/src/uts/intel/io/acpica/hardware/hwregs.c => usr/src/uts/intel/io/acpica/components/hardware/hwregs.c
rename : usr/src/uts/intel/io/acpica/hardware/hwsleep.c => usr/src/uts/intel/io/acpica/components/hardware/hwsleep.c
rename : usr/src/uts/intel/io/acpica/hardware/hwtimer.c => usr/src/uts/intel/io/acpica/components/hardware/hwtimer.c
rename : usr/src/uts/intel/io/acpica/hardware/hwvalid.c => usr/src/uts/intel/io/acpica/components/hardware/hwvalid.c
rename : usr/src/uts/intel/io/acpica/hardware/hwxface.c => usr/src/uts/intel/io/acpica/components/hardware/hwxface.c
rename : usr/src/uts/intel/io/acpica/namespace/nsaccess.c => usr/src/uts/intel/io/acpica/components/namespace/nsaccess.c
rename : usr/src/uts/intel/io/acpica/namespace/nsalloc.c => usr/src/uts/intel/io/acpica/components/namespace/nsalloc.c
rename : usr/src/uts/intel/io/acpica/namespace/nsdump.c => usr/src/uts/intel/io/acpica/components/namespace/nsdump.c
rename : usr/src/uts/intel/io/acpica/namespace/nsdumpdv.c => usr/src/uts/intel/io/acpica/components/namespace/nsdumpdv.c
rename : usr/src/uts/intel/io/acpica/namespace/nseval.c => usr/src/uts/intel/io/acpica/components/namespace/nseval.c
rename : usr/src/uts/intel/io/acpica/namespace/nsinit.c => usr/src/uts/intel/io/acpica/components/namespace/nsinit.c
rename : usr/src/uts/intel/io/acpica/namespace/nsload.c => usr/src/uts/intel/io/acpica/components/namespace/nsload.c
rename : usr/src/uts/intel/io/acpica/namespace/nsnames.c => usr/src/uts/intel/io/acpica/components/namespace/nsnames.c
rename : usr/src/uts/intel/io/acpica/namespace/nsobject.c => usr/src/uts/intel/io/acpica/components/namespace/nsobject.c
rename : usr/src/uts/intel/io/acpica/namespace/nsparse.c => usr/src/uts/intel/io/acpica/components/namespace/nsparse.c
rename : usr/src/uts/intel/io/acpica/namespace/nspredef.c => usr/src/uts/intel/io/acpica/components/namespace/nspredef.c
rename : usr/src/uts/intel/io/acpica/namespace/nsrepair.c => usr/src/uts/intel/io/acpica/components/namespace/nsrepair.c
rename : usr/src/uts/intel/io/acpica/namespace/nsrepair2.c => usr/src/uts/intel/io/acpica/components/namespace/nsrepair2.c
rename : usr/src/uts/intel/io/acpica/namespace/nssearch.c => usr/src/uts/intel/io/acpica/components/namespace/nssearch.c
rename : usr/src/uts/intel/io/acpica/namespace/nsutils.c => usr/src/uts/intel/io/acpica/components/namespace/nsutils.c
rename : usr/src/uts/intel/io/acpica/namespace/nswalk.c => usr/src/uts/intel/io/acpica/components/namespace/nswalk.c
rename : usr/src/uts/intel/io/acpica/namespace/nsxfeval.c => usr/src/uts/intel/io/acpica/components/namespace/nsxfeval.c
rename : usr/src/uts/intel/io/acpica/namespace/nsxfname.c => usr/src/uts/intel/io/acpica/components/namespace/nsxfname.c
rename : usr/src/uts/intel/io/acpica/namespace/nsxfobj.c => usr/src/uts/intel/io/acpica/components/namespace/nsxfobj.c
rename : usr/src/uts/intel/io/acpica/parser/psargs.c => usr/src/uts/intel/io/acpica/components/parser/psargs.c
rename : usr/src/uts/intel/io/acpica/parser/psloop.c => usr/src/uts/intel/io/acpica/components/parser/psloop.c
rename : usr/src/uts/intel/io/acpica/parser/psopcode.c => usr/src/uts/intel/io/acpica/components/parser/psopcode.c
rename : usr/src/uts/intel/io/acpica/parser/psparse.c => usr/src/uts/intel/io/acpica/components/parser/psparse.c
rename : usr/src/uts/intel/io/acpica/parser/psscope.c => usr/src/uts/intel/io/acpica/components/parser/psscope.c
rename : usr/src/uts/intel/io/acpica/parser/pstree.c => usr/src/uts/intel/io/acpica/components/parser/pstree.c
rename : usr/src/uts/intel/io/acpica/parser/psutils.c => usr/src/uts/intel/io/acpica/components/parser/psutils.c
rename : usr/src/uts/intel/io/acpica/parser/pswalk.c => usr/src/uts/intel/io/acpica/components/parser/pswalk.c
rename : usr/src/uts/intel/io/acpica/parser/psxface.c => usr/src/uts/intel/io/acpica/components/parser/psxface.c
rename : usr/src/uts/intel/io/acpica/resources/rsaddr.c => usr/src/uts/intel/io/acpica/components/resources/rsaddr.c
rename : usr/src/uts/intel/io/acpica/resources/rscalc.c => usr/src/uts/intel/io/acpica/components/resources/rscalc.c
rename : usr/src/uts/intel/io/acpica/resources/rscreate.c => usr/src/uts/intel/io/acpica/components/resources/rscreate.c
rename : usr/src/uts/intel/io/acpica/resources/rsdump.c => usr/src/uts/intel/io/acpica/components/resources/rsdump.c
rename : usr/src/uts/intel/io/acpica/resources/rsinfo.c => usr/src/uts/intel/io/acpica/components/resources/rsinfo.c
rename : usr/src/uts/intel/io/acpica/resources/rsio.c => usr/src/uts/intel/io/acpica/components/resources/rsio.c
rename : usr/src/uts/intel/io/acpica/resources/rsirq.c => usr/src/uts/intel/io/acpica/components/resources/rsirq.c
rename : usr/src/uts/intel/io/acpica/resources/rslist.c => usr/src/uts/intel/io/acpica/components/resources/rslist.c
rename : usr/src/uts/intel/io/acpica/resources/rsmemory.c => usr/src/uts/intel/io/acpica/components/resources/rsmemory.c
rename : usr/src/uts/intel/io/acpica/resources/rsmisc.c => usr/src/uts/intel/io/acpica/components/resources/rsmisc.c
rename : usr/src/uts/intel/io/acpica/resources/rsutils.c => usr/src/uts/intel/io/acpica/components/resources/rsutils.c
rename : usr/src/uts/intel/io/acpica/resources/rsxface.c => usr/src/uts/intel/io/acpica/components/resources/rsxface.c
rename : usr/src/uts/intel/io/acpica/tables/tbfadt.c => usr/src/uts/intel/io/acpica/components/tables/tbfadt.c
rename : usr/src/uts/intel/io/acpica/tables/tbfind.c => usr/src/uts/intel/io/acpica/components/tables/tbfind.c
rename : usr/src/uts/intel/io/acpica/tables/tbinstal.c => usr/src/uts/intel/io/acpica/components/tables/tbinstal.c
rename : usr/src/uts/intel/io/acpica/tables/tbutils.c => usr/src/uts/intel/io/acpica/components/tables/tbutils.c
rename : usr/src/uts/intel/io/acpica/tables/tbxface.c => usr/src/uts/intel/io/acpica/components/tables/tbxface.c
rename : usr/src/uts/intel/io/acpica/tables/tbxfroot.c => usr/src/uts/intel/io/acpica/components/tables/tbxfroot.c
rename : usr/src/uts/intel/io/acpica/utilities/utalloc.c => usr/src/uts/intel/io/acpica/components/utilities/utalloc.c
rename : usr/src/uts/intel/io/acpica/utilities/utcache.c => usr/src/uts/intel/io/acpica/components/utilities/utcache.c
rename : usr/src/uts/intel/io/acpica/utilities/utclib.c => usr/src/uts/intel/io/acpica/components/utilities/utclib.c
rename : usr/src/uts/intel/io/acpica/utilities/utcopy.c => usr/src/uts/intel/io/acpica/components/utilities/utcopy.c
rename : usr/src/uts/intel/io/acpica/utilities/utdebug.c => usr/src/uts/intel/io/acpica/components/utilities/utdebug.c
rename : usr/src/uts/intel/io/acpica/utilities/utdecode.c => usr/src/uts/intel/io/acpica/components/utilities/utdecode.c
rename : usr/src/uts/intel/io/acpica/utilities/utdelete.c => usr/src/uts/intel/io/acpica/components/utilities/utdelete.c
rename : usr/src/uts/intel/io/acpica/utilities/uteval.c => usr/src/uts/intel/io/acpica/components/utilities/uteval.c
rename : usr/src/uts/intel/io/acpica/utilities/utglobal.c => usr/src/uts/intel/io/acpica/components/utilities/utglobal.c
rename : usr/src/uts/intel/io/acpica/utilities/utids.c => usr/src/uts/intel/io/acpica/components/utilities/utids.c
rename : usr/src/uts/intel/io/acpica/utilities/utinit.c => usr/src/uts/intel/io/acpica/components/utilities/utinit.c
rename : usr/src/uts/intel/io/acpica/utilities/utlock.c => usr/src/uts/intel/io/acpica/components/utilities/utlock.c
rename : usr/src/uts/intel/io/acpica/utilities/utmath.c => usr/src/uts/intel/io/acpica/components/utilities/utmath.c
rename : usr/src/uts/intel/io/acpica/utilities/utmisc.c => usr/src/uts/intel/io/acpica/components/utilities/utmisc.c
rename : usr/src/uts/intel/io/acpica/utilities/utmutex.c => usr/src/uts/intel/io/acpica/components/utilities/utmutex.c
rename : usr/src/uts/intel/io/acpica/utilities/utobject.c => usr/src/uts/intel/io/acpica/components/utilities/utobject.c
rename : usr/src/uts/intel/io/acpica/utilities/utosi.c => usr/src/uts/intel/io/acpica/components/utilities/utosi.c
rename : usr/src/uts/intel/io/acpica/utilities/utresrc.c => usr/src/uts/intel/io/acpica/components/utilities/utresrc.c
rename : usr/src/uts/intel/io/acpica/utilities/utstate.c => usr/src/uts/intel/io/acpica/components/utilities/utstate.c
rename : usr/src/uts/intel/io/acpica/utilities/uttrack.c => usr/src/uts/intel/io/acpica/components/utilities/uttrack.c
rename : usr/src/uts/intel/io/acpica/utilities/utxface.c => usr/src/uts/intel/io/acpica/components/utilities/utxface.c
rename : usr/src/uts/intel/io/acpica/utilities/utxferror.c => usr/src/uts/intel/io/acpica/components/utilities/utxferror.c
8226 nza-kernel needs to be buildable by itself
Re #6790 backspace should perform delete on console
VAAI (XXX ATS support for COMSTAR, YYY Block-copy support for COMSTAR)

@@ -20,10 +20,11 @@
 #
 
 #
 # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright 2017 Nexenta Systems, Inc.  All rights reserved.
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
 # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
 # Copyright 2015 Gary Mills
 # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 # Copyright 2016 Toomas Soome <tsoome@me.com>

@@ -41,11 +42,11 @@
 ADJUNCT_PROTO=
 
 #
 # Adjunct for building things that run on the build machine.
 #
-NATIVE_ADJUNCT= /usr
+NATIVE_ADJUNCT= /
 
 #
 # RELEASE_BUILD should be cleared for final release builds.
 # NOT_RELEASE_BUILD is exactly what the name implies.
 #

@@ -164,13 +165,14 @@
 CAT=            /usr/bin/cat
 ELFDUMP=        /usr/ccs/bin/elfdump
 M4=             /usr/bin/m4
 STRIP=          /usr/ccs/bin/strip
 LEX=            /usr/ccs/bin/lex
-FLEX=           /usr/bin/flex
+FLEX=           $(SFW_ROOT)/bin/flex
 YACC=           /usr/ccs/bin/yacc
 CPP=            /usr/lib/cpp
+ANSI_CPP=       $(GCC_ROOT)/bin/cpp
 JAVAC=          $(JAVA_ROOT)/bin/javac
 JAVAH=          $(JAVA_ROOT)/bin/javah
 JAVADOC=        $(JAVA_ROOT)/bin/javadoc
 RMIC=           $(JAVA_ROOT)/bin/rmic
 JAR=            $(JAVA_ROOT)/bin/jar

@@ -239,11 +241,18 @@
         SVCCFG_DTD=$(SRC)/cmd/svc/dtd/service_bundle.dtd.1 \
         SVCCFG_REPOSITORY=$(SRC)/cmd/svc/seed/global.db \
         SVCCFG_CONFIGD_PATH=$(SRC)/cmd/svc/configd/svc.configd-native \
         $(SRC)/cmd/svc/svccfg/svccfg-native validate $<
 
-INS.file=       $(RM) $@; $(INS) -s -m $(FILEMODE) -f $(@D) $<
+# dmake SOURCEDEBUG=yes ... enables source-level debugging information,
+# and avoids stripping it.
+SOURCEDEBUG     = $(POUND_SIGN)
+SRCDBGBLD       = $(SOURCEDEBUG:yes=)
+
+INS_STRIP=  -s
+$(SRCDBGBLD)INS_STRIP=
+INS.file=       $(RM) $@; $(INS) $(INS_STRIP) -m $(FILEMODE) -f $(@D) $<
 INS.dir=        $(INS) -s -d -m $(DIRMODE) $@
 # installs and renames at once
 #
 INS.rename=     $(INS.file); $(MV) $(@D)/$(<F) $@
 

@@ -439,10 +448,12 @@
 i386_COPTFLAG=          -O
 amd64_COPTFLAG=         -xO3
 
 COPTFLAG= $($(MACH)_COPTFLAG)
 COPTFLAG64= $($(MACH64)_COPTFLAG)
+$(SRCDBGBLD)COPTFLAG            = -g -xs
+$(SRCDBGBLD)COPTFLAG64          = -g -xs
 
 # When -g is used, the compiler globalizes static objects
 # (gives them a unique prefix). Disable that.
 CNOGLOBAL= -W0,-noglobal
 

@@ -461,10 +472,11 @@
 #
 # Default debug format for Sun Studio 11 is dwarf, so force it to
 # generate stabs.
 #
 DEBUGFORMAT=    -xdebugformat=stabs
+$(SRCDBGBLD)DEBUGFORMAT=
 
 #
 # Flags used to build in debug mode for ctf generation.  Bugs in the Devpro
 # compilers currently prevent us from building with cc-emitted DWARF.
 #

@@ -524,15 +536,10 @@
 amd64_XREGSFLAG         =
 
 XREGSFLAG               = $($(MACH)_XREGSFLAG)
 XREGSFLAG64             = $($(MACH64)_XREGSFLAG)
 
-# dmake SOURCEDEBUG=yes ... enables source-level debugging information, and
-# avoids stripping it.
-SOURCEDEBUG     = $(POUND_SIGN)
-SRCDBGBLD       = $(SOURCEDEBUG:yes=)
-
 #
 # These variables are intended ONLY for use by developers to safely pass extra
 # flags to the compilers without unintentionally overriding Makefile-set
 # flags.  They should NEVER be set to any value in a Makefile.
 #

@@ -545,12 +552,10 @@
 CCUSERFLAGS             =
 CCUSERFLAGS64           = $(CCUSERFLAGS)
 
 CSOURCEDEBUGFLAGS       =
 CCSOURCEDEBUGFLAGS      =
-$(SRCDBGBLD)CSOURCEDEBUGFLAGS   = -g -xs
-$(SRCDBGBLD)CCSOURCEDEBUGFLAGS  = -g -xs
 
 CFLAGS=         $(COPTFLAG) $($(MACH)_CFLAGS) $(SPACEFLAG) $(CCMODE) \
                 $(ILDOFF) $(CERRWARN) $(CSTD) $(CCUNBOUND) $(IROPTFLAG) \
                 $(CGLOBALSTATIC) $(CCNOAUTOINLINE) $(CSOURCEDEBUGFLAGS) \
                 $(CUSERFLAGS)

@@ -572,11 +577,11 @@
 CPPFLAGS.first= # Please keep empty.  Only lower makefiles should set this.
 CPPFLAGS.master=$(DTEXTDOM) $(DTS_ERRNO) \
         $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) \
         $(ADJUNCT_PROTO:%=-I%/usr/include)
 CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) \
-                $(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/include
+                $(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/usr/include
 CPPFLAGS=       $(CPPFLAGS.first) $(CPPFLAGS.master)
 AS_CPPFLAGS=    $(CPPFLAGS.first) $(CPPFLAGS.master)
 JAVAFLAGS=      -source 1.6 -target 1.6 -Xlint:deprecation,-options
 
 #

@@ -628,10 +633,13 @@
 i386_CCOPTFLAG=         -O
 amd64_CCOPTFLAG=        -O
 
 CCOPTFLAG=      $($(MACH)_CCOPTFLAG)
 CCOPTFLAG64=    $($(MACH64)_CCOPTFLAG)
+$(SRCDBGBLD)CCOPTFLAG           = -g -xs
+$(SRCDBGBLD)CCOPTFLAG64         = -g -xs
+
 CCFLAGS=        $(CCOPTFLAG) $($(MACH)_CCFLAGS) $(CCSOURCEDEBUGFLAGS) \
                 $(CCUSERFLAGS)
 CCFLAGS64=      $(CCOPTFLAG64) $($(MACH64)_CCFLAGS) $(CCSOURCEDEBUGFLAGS) \
                 $(CCUSERFLAGS64)
 

@@ -882,10 +890,12 @@
 ZREDLOCSYM=     -zredlocsym
 ZTEXT=          -ztext
 ZVERBOSE=       -zverbose
 
 GSHARED=        -G
+$(SRCDBGBLD)GSHARED += -g -xs
+
 CCMT=           -mt
 
 # Handle different PIC models on different ISAs
 # (May be overridden by lower-level Makefiles)