diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-10-15 13:44:56 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-10-15 13:44:56 +0000 |
| commit | 16d3daed247b1695bbf21679b70086c38d044eb7 (patch) | |
| tree | b6f459dfe48396dbd24f046a2f746892a3d8e630 /usr/src/lib/libc/sparc | |
| parent | 8fe8a39ea9f7811d9c1e2e48a46932561906883f (diff) | |
| parent | a6d101109bfb442cf0db6d8ebb5fb7c32cb16d7e (diff) | |
| download | illumos-joyent-16d3daed247b1695bbf21679b70086c38d044eb7.tar.gz | |
[illumos-gate merge]
commit a6d101109bfb442cf0db6d8ebb5fb7c32cb16d7e
9472 Add smbutil discon command
commit 4226f635096bf9d814aa9fb335518c4855bbe3a3
6375 Add native name demangling support
commit 83b4671e6262c5aa6b4f9fb5a384b1946dfc2e7f
9664 loader: need UEFI32 support
commit e1bf37b1abeb6653a6e35e2bd6924131cced1efe
9884 cw(1) should use -fpic rather than -Kpic
Conflicts:
usr/src/test/util-tests/tests/Makefile
usr/src/cmd/mdb/common/mdb/mdb_demangle.c
Diffstat (limited to 'usr/src/lib/libc/sparc')
| -rw-r--r-- | usr/src/lib/libc/sparc/Makefile.com | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com index 4e09e44571..0bdbdd1bb7 100644 --- a/usr/src/lib/libc/sparc/Makefile.com +++ b/usr/src/lib/libc/sparc/Makefile.com @@ -1131,7 +1131,7 @@ MAPFILES = $(LIBCDIR)/port/mapfile-vers CFLAGS += $(EXTN_CFLAGS) CPPFLAGS= -D_REENTRANT -Dsparc $(EXTN_CPPFLAGS) $(THREAD_DEBUG) \ -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc $(CPPFLAGS.master) -ASFLAGS= $(EXTN_ASFLAGS) -K pic -P -D__STDC__ -D_ASM $(CPPFLAGS) $(sparc_AS_XARCH) +ASFLAGS= $(EXTN_ASFLAGS) $(AS_PICFLAGS) -P -D__STDC__ -D_ASM $(CPPFLAGS) $(sparc_AS_XARCH) # As a favor to the dtrace syscall provider, libc still calls the # old syscall traps that have been obsoleted by the *at() interfaces. @@ -1383,7 +1383,7 @@ $(STRETS:%=pics/%): $(LIBCBASE)/crt/stret.s $(POST_PROCESS_O) $(LIBCBASE)/crt/_rtbootld.s: $(LIBCBASE)/crt/_rtboot.s $(LIBCBASE)/crt/_rtld.c - $(CC) $(CPPFLAGS) $(CTF_FLAGS) -O -S -K pic \ + $(CC) $(CPPFLAGS) $(CTF_FLAGS) -O -S $(C_PICFLAGS) \ $(LIBCBASE)/crt/_rtld.c -o $(LIBCBASE)/crt/_rtld.s $(CAT) $(LIBCBASE)/crt/_rtboot.s $(LIBCBASE)/crt/_rtld.s > $@ $(RM) $(LIBCBASE)/crt/_rtld.s |