diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-08-14 12:23:17 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-08-14 12:23:17 +0000 |
| commit | a67cdbf32a87562bb8953403839403aee9287f2e (patch) | |
| tree | 029814044bc83dfba1bab33b24d760e554e3f39f /usr/src/lib/libc | |
| parent | b50884db8d84f652919a0d7b6fd6dd3d28fb035e (diff) | |
| parent | 223ffd476e2703f912aa332a875dfb72ab5d7010 (diff) | |
| download | illumos-joyent-a67cdbf32a87562bb8953403839403aee9287f2e.tar.gz | |
[illumos-gate merge]
commit 223ffd476e2703f912aa332a875dfb72ab5d7010
9730 Audit Configuration execution profile doesn't work
commit 2c5ec7a875dcd76853e6618614e990f1e8cdd56d
9725 getent has unused variables and implicit function declarations
commit 309b04b88ca20521fb8141c40ad19b8528b37d7d
9723 provide support for VMM's GDT handling
commit 734b3a42d9fd315e40f7ce511604865fb3c2e799
9716 libstand: cstyle cleanup of what we just did touch
commit 857c96d257470e097e846ab8886580991b329c32
9626 move 'static xuio_stats_t xuio_stats' to file where it use
commit 6d75a680fdc4059c56ee980eacd6e8b15587086f
9461 kbd does not switch keyboard layout
commit db132910a923e71326bd3fde5c15548dabd000b9
9711 fts(3C) needs to be largefile aware
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/i386/Makefile.com | 1 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/gen/fts.c | 13 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/mapfile-vers | 11 | ||||
| -rw-r--r-- | usr/src/lib/libc/sparc/Makefile.com | 1 |
4 files changed, 26 insertions, 0 deletions
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com index 9b332269da..255622629c 100644 --- a/usr/src/lib/libc/i386/Makefile.com +++ b/usr/src/lib/libc/i386/Makefile.com @@ -339,6 +339,7 @@ SYSOBJS= \ PORTGEN64= \ _xftw64.o \ attropen64.o \ + fts64.o \ ftw64.o \ mkstemp64.o \ nftw64.o \ diff --git a/usr/src/lib/libc/port/gen/fts.c b/usr/src/lib/libc/port/gen/fts.c index 7cdd4e984b..17a955c1e9 100644 --- a/usr/src/lib/libc/port/gen/fts.c +++ b/usr/src/lib/libc/port/gen/fts.c @@ -38,6 +38,19 @@ #include <string.h> #include <unistd.h> +#if !defined(_LP64) && _FILE_OFFSET_BITS == 64 +#define fts_alloc fts_alloc64 +#define fts_build fts_build64 +#define fts_lfree fts_lfree64 +#define fts_load fts_load64 +#define fts_maxarglen fts_maxarglen64 +#define fts_padjust fts_padjust64 +#define fts_palloc fts_palloc64 +#define fts_sort fts_sort64 +#define fts_stat fts_stat64 +#define fts_safe_changedir fts_safe_changedir64 +#endif + #define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b)) #define ALIGNBYTES _POINTER_ALIGNMENT diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers index 616e5e8d45..d184c2e68c 100644 --- a/usr/src/lib/libc/port/mapfile-vers +++ b/usr/src/lib/libc/port/mapfile-vers @@ -77,6 +77,17 @@ $if _x86 && _ELF64 $add amd64 $endif +SYMBOL_VERSION ILLUMOS_0.26 { # fts(3) LFS +$if lf64 + protected: + fts_children64; + fts_close64; + fts_open64; + fts_read64; + fts_set64; +$endif +} ILLUMOS_0.25; + SYMBOL_VERSION ILLUMOS_0.25 { # inet_* moved from libnsl/libsocket protected: inet_addr; diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com index dd6a170559..cf62c4d6d4 100644 --- a/usr/src/lib/libc/sparc/Makefile.com +++ b/usr/src/lib/libc/sparc/Makefile.com @@ -348,6 +348,7 @@ SYSOBJS= \ PORTGEN64= \ _xftw64.o \ attropen64.o \ + fts64.o \ ftw64.o \ mkstemp64.o \ nftw64.o \ |