Fixing cross build i386 on minix

diff --git a/lib/libc/db/hash/ndbmdatum.c b/lib/libc/db/hash/ndbmdatum.c
index 2ae7a27905c82eb16ccfea53f8a03704628632e7..561e28793668622c2872926eb716cb8bad966c43 100644 (file)
--- a/lib/libc/db/hash/ndbmdatum.c
+++ b/lib/libc/db/hash/ndbmdatum.c
@@ -160,7 +160,7 @@ dbm_store(DBM *db, datum key, datum data, int flags)
            (u_int)((flags == DBM_INSERT) ? R_NOOVERWRITE : 0)));
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(dbm_delete, __dbm_delete13)
 __weak_alias(dbm_fetch, __dbm_fetch13)
 __weak_alias(dbm_firstkey, __dbm_firstkey13)

diff --git a/lib/libc/gen/alphasort.c b/lib/libc/gen/alphasort.c
index 4ea5dba4e99f28d5959aae0a04e44c41bd0720cc..e6f166b4cf2cf709f1dba09b6dc00837d2c69c17 100644 (file)
--- a/lib/libc/gen/alphasort.c
+++ b/lib/libc/gen/alphasort.c
@@ -58,6 +58,6 @@ alphasort(const void *d1, const void *d2)
            (*(const struct dirent *const *)d2)->d_name));
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(alphasort, __alphasort30)
 #endif

diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index bcf005b1fa7c77c67f70a70cb7fd1ac0301e93dc..16af0d43b1f15acdfcfc80ef924af6058d7bada7 100644 (file)
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -1235,7 +1235,7 @@ bail:
        return ret;
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(fts_children, __fts_children60)
 __weak_alias(fts_close, __fts_close60)
 __weak_alias(fts_open, __fts_open60)

diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index 61020f75b483e6345c202878631670d638200d9f..a3f912eca737c37423ab7643f22e3e76f7fe33ea 100644 (file)
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -2604,7 +2604,7 @@ setpwent(void)
        mutex_unlock(&_pwmutex);
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(getpwent, __getpwent50)
 __weak_alias(getpwent_r, __getpwent_r50)
 __weak_alias(getpwnam, __getpwnam50)

diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 220ac765836f1298dc159dd6362c37e24922475c..d4068dd5cd8f80976f11f9a9ce14730dd039cfca 100644 (file)
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -1169,7 +1169,7 @@ qprintf(const char *str, Char *s)
 }
 #endif
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(glob, __glob30)
 __weak_alias(globfree, __globfree30)
 #endif

diff --git a/lib/libc/gen/minix/utime.c b/lib/libc/gen/minix/utime.c
index df212b90d16672ed3f04a7de8c9fa6a4df721aac..ab91a000000b85948c5b6bbafc1178a41713cab6 100644 (file)
--- a/lib/libc/gen/minix/utime.c
+++ b/lib/libc/gen/minix/utime.c
@@ -23,6 +23,6 @@ int utime(const char *name, const struct utimbuf *timp)
   return(_syscall(VFS_PROC_NR, UTIME, &m));
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(utime, __utime50)
 #endif

diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c
index bda04a8e48ae39e0f6cbc76719e3b4e762346a88..ffe840cab6ef789b56bc0ce0c9c6baf54d005f1f 100644 (file)
--- a/lib/libc/gen/pwcache.c
+++ b/lib/libc/gen/pwcache.c
@@ -642,6 +642,6 @@ main(int argc, char *argv[])
 #endif /* TEST_PWCACHE */
 #endif /* !HAVE_PWCACHE_USERDB */
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(pwcache_userdb, __pwcache_userdb50)
 #endif

diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c
index 59f5105ac02c422b75bb47b063d0559b550ebd42..136d881db88999e1bbe696302007b439c656a1af 100644 (file)
--- a/lib/libc/gen/readdir.c
+++ b/lib/libc/gen/readdir.c
@@ -146,7 +146,7 @@ readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
        return (0);
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(readdir, __readdir30)
 __weak_alias(readdir_r, __readdir_r30)
 __weak_alias(readdir_unlocked, ___readdir_unlocked50)

diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
index 7409289400362f60740e08714c0d4ed5cf395b2f..80964fef4be1d4d95fdf7f92fa8bc17b9bbbc23c 100644 (file)
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -155,6 +155,6 @@ bad:
        return -1;
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(scandir, __scandir30)
 #endif

diff --git a/lib/libc/gen/sigsetops.c b/lib/libc/gen/sigsetops.c
index 5dfa50a8552b86228ce6feecff5655b62a8146f3..9e8b6c0b4daf44a1a655dfebbfc59d02f0d5bcb6 100644 (file)
--- a/lib/libc/gen/sigsetops.c
+++ b/lib/libc/gen/sigsetops.c
@@ -45,7 +45,7 @@ __RCSID("$NetBSD: sigsetops.c,v 1.16 2010/07/31 00:04:43 joerg Exp $");
 #include <errno.h>
 #include <signal.h>
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(sigaddset, __sigaddset14)
 __weak_alias(sigdelset, __sigdelset14)
 __weak_alias(sigemptyset, __sigemptyset14)

diff --git a/lib/libc/gen/time.c b/lib/libc/gen/time.c
index da0db1034a7fc20a166c6f51da48efb7ead545e6..0e85066b69315516e30912dc6603c919cf33056e 100644 (file)
--- a/lib/libc/gen/time.c
+++ b/lib/libc/gen/time.c
@@ -56,6 +56,6 @@ time(time_t *t)
        return (time_t)tt.tv_sec;
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(time, __time50)
 #endif

diff --git a/lib/libc/gen/utmp.c b/lib/libc/gen/utmp.c
index 2b3698201dfa05b05535d9249503ec11e9246c6b..ae722fc281c19ca7f3264914bbc85534d0aa486b 100644 (file)
--- a/lib/libc/gen/utmp.c
+++ b/lib/libc/gen/utmp.c
@@ -105,6 +105,6 @@ utmpname(const char *fname)
        return 1;
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(getutent, __getutent50)
 #endif

diff --git a/lib/libc/gen/utmpx.c b/lib/libc/gen/utmpx.c
index 43fd1f08b82afb3729bd77f1901c4c1664eb14a7..deab17decad4e75b3845ac64d2c433b6edab1cc7 100644 (file)
--- a/lib/libc/gen/utmpx.c
+++ b/lib/libc/gen/utmpx.c
@@ -518,7 +518,7 @@ updlastlogx(const char *fname, uid_t uid, struct lastlogx *ll)
        return error;
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(getlastlogx, __getlastlogx50)
 __weak_alias(getutmp, __getutmp50)
 __weak_alias(getutmpx, __getutmpx50)

diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index 469a1c063637fd5f649bbe5f7893526a8e7f34cb..6b7ab52d72a295159a856147ebf9e16da2720dd5 100644 (file)
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -109,6 +109,6 @@ setlocale(int category, const char *locale)
        return __setlocale(category, locale);
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(setlocale, __setlocale50)
 #endif

diff --git a/lib/libc/stdlib/unsetenv.c b/lib/libc/stdlib/unsetenv.c
index eb1c21ff94c3cdb2904edb7dfd65ce503b97c4e5..21086d816aadc5c9768307403dffb3133aeefd89 100644 (file)
--- a/lib/libc/stdlib/unsetenv.c
+++ b/lib/libc/stdlib/unsetenv.c
@@ -105,6 +105,6 @@ unsetenv(const char *name)
        return 0;
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(unsetenv, __unsetenv13)
 #endif

diff --git a/lib/libc/sys-minix/getdents.c b/lib/libc/sys-minix/getdents.c
index 58a696b2e62e1c9ca8d34f21e9cae8671600b71a..ef17e54409db75c091080facd751bc2234d083b4 100644 (file)
--- a/lib/libc/sys-minix/getdents.c
+++ b/lib/libc/sys-minix/getdents.c
@@ -14,6 +14,6 @@ ssize_t getdents(int fd, char *buffer, size_t nbytes)
   return _syscall(VFS_PROC_NR, GETDENTS, &m);
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(getdents, __getdents30)
 #endif

diff --git a/lib/libc/sys-minix/getitimer.c b/lib/libc/sys-minix/getitimer.c
index 7407ce70206353d7316a0b199e2923eff3016ce9..e6f382f0e313c97aa8b31019cbbed9409f26b069 100644 (file)
--- a/lib/libc/sys-minix/getitimer.c
+++ b/lib/libc/sys-minix/getitimer.c
@@ -19,6 +19,6 @@ int getitimer(int which, struct itimerval *value)
   return _syscall(PM_PROC_NR, ITIMER, &m);
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(getitimer, __getitimer50)
 #endif

diff --git a/lib/libc/sys-minix/mknod.c b/lib/libc/sys-minix/mknod.c
index 885e3a2454c4624044e8abd6a1d428b11de4c308..606e0205c48b411f9816979c807be49ec272f32a 100644 (file)
--- a/lib/libc/sys-minix/mknod.c
+++ b/lib/libc/sys-minix/mknod.c
@@ -19,6 +19,6 @@ int mknod(const char *name, mode_t mode, dev_t dev)
   return(_syscall(VFS_PROC_NR, MKNOD, &m));
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(mknod, __mknod50)
 #endif

diff --git a/lib/libc/sys-minix/nanosleep.c b/lib/libc/sys-minix/nanosleep.c
index 5e1f4e3d5feec879fb1ce5658004b451525dd3d9..5478d9a3b9748ea0ce54f779e3103560abde4a7b 100644 (file)
--- a/lib/libc/sys-minix/nanosleep.c
+++ b/lib/libc/sys-minix/nanosleep.c
@@ -91,6 +91,6 @@ int nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
 }
 
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(nanosleep, __nanosleep50)
 #endif

diff --git a/lib/libc/sys-minix/select.c b/lib/libc/sys-minix/select.c
index c543339921296456bfc572c851f1f75916cd93e6..a703d7cf1ed9d6839376c05864117b185d3215b1 100644 (file)
--- a/lib/libc/sys-minix/select.c
+++ b/lib/libc/sys-minix/select.c
@@ -21,6 +21,6 @@ int select(int nfds,
 }
 
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(select, __select50)
 #endif

diff --git a/lib/libc/sys-minix/setitimer.c b/lib/libc/sys-minix/setitimer.c
index f85a2292e25b760332d767ea2c5a66548feb842b..1552b9ddc327f42756406c418ee1979cbbdc38f7 100644 (file)
--- a/lib/libc/sys-minix/setitimer.c
+++ b/lib/libc/sys-minix/setitimer.c
@@ -25,6 +25,6 @@ int setitimer(int which, const struct itimerval *__restrict value,
   return _syscall(PM_PROC_NR, ITIMER, &m);
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(setitimer, __setitimer50)
 #endif

diff --git a/lib/libc/sys-minix/settimeofday.c b/lib/libc/sys-minix/settimeofday.c
index 602c952c525e0c261340f63c539295fbe58ac33b..ae0e6b5786cb8c6538354299bc7f83e4e889b0ac 100644 (file)
--- a/lib/libc/sys-minix/settimeofday.c
+++ b/lib/libc/sys-minix/settimeofday.c
@@ -14,6 +14,6 @@ int settimeofday(const struct timeval *tp, const void *tzp)
        return stime(&sec);
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(settimeofday, __settimeofday50)
 #endif

diff --git a/lib/libc/sys-minix/shmctl.c b/lib/libc/sys-minix/shmctl.c
index 656d19236bc06a776a89ac46bb64b35636bbd274..ee6265e9dd8cbd14a7c2cd644c3a161e765f5c75 100644 (file)
--- a/lib/libc/sys-minix/shmctl.c
+++ b/lib/libc/sys-minix/shmctl.c
@@ -41,6 +41,6 @@ int shmctl(int shmid, int cmd, struct shmid_ds *buf)
        return r;
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(shmctl, __shmctl50)
 #endif

diff --git a/lib/libc/sys-minix/sigaction.c b/lib/libc/sys-minix/sigaction.c
index 50501465acd1b6c95407b84aa944f8336696bd9a..2bb96c8183e3b0310901a747f710298799c5a51b 100644 (file)
--- a/lib/libc/sys-minix/sigaction.c
+++ b/lib/libc/sys-minix/sigaction.c
@@ -19,6 +19,6 @@ int sigaction(int sig, const struct sigaction *act, struct sigaction *oact)
   return(_syscall(PM_PROC_NR, SIGACTION, &m));
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(sigaction, __sigaction14)
 #endif

diff --git a/lib/libc/sys-minix/sigpending.c b/lib/libc/sys-minix/sigpending.c
index f701cfce75b22b3360ad023ff6dfdd1873c7e76a..e52f5edc546a328ac3bd1ee6f1635669705641cc 100644 (file)
--- a/lib/libc/sys-minix/sigpending.c
+++ b/lib/libc/sys-minix/sigpending.c
@@ -14,6 +14,6 @@ sigset_t *set;
   return(m.m_type);
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(sigpending, __sigpending14)
 #endif

diff --git a/lib/libc/sys-minix/sigprocmask.c b/lib/libc/sys-minix/sigprocmask.c
index f4462a9482d9dcba11995787f5fc645452c12478..4770e807493c32241e0f023ed6e5b5baccd4925e 100644 (file)
--- a/lib/libc/sys-minix/sigprocmask.c
+++ b/lib/libc/sys-minix/sigprocmask.c
@@ -23,6 +23,6 @@ sigset_t *oset;
   return(m.m_type);
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(sigprocmask, __sigprocmask14)
 #endif

diff --git a/lib/libc/sys-minix/sigsuspend.c b/lib/libc/sys-minix/sigsuspend.c
index c7948ca2633a5e2df181252886c60a21a3710fc1..64a4023349539507f8cfcb1e78ace66a84264feb 100644 (file)
--- a/lib/libc/sys-minix/sigsuspend.c
+++ b/lib/libc/sys-minix/sigsuspend.c
@@ -13,6 +13,6 @@ const sigset_t *set;
   return(_syscall(PM_PROC_NR, SIGSUSPEND, &m));
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(sigsuspend, __sigsuspend14)
 #endif

diff --git a/lib/libc/time/difftime.c b/lib/libc/time/difftime.c
index 2f55eb2f7543d7dd8b2d9796ee1a168c455f67a4..0849bc856764bf6ebfacd247e85bf245a29a846c 100644 (file)
--- a/lib/libc/time/difftime.c
+++ b/lib/libc/time/difftime.c
@@ -71,6 +71,6 @@ difftime(const time_t time1, const time_t time0)
                (unsigned long) (-(time1 + 1)) + 1);
 }
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(difftime, __difftime50)
 #endif

diff --git a/lib/libc/time/localtime.c b/lib/libc/time/localtime.c
index ba092bbd7e7f7220076b16884fd900cc0e622b26..ec46c2171340b589f80fe910ae75d74256d404b8 100644 (file)
--- a/lib/libc/time/localtime.c
+++ b/lib/libc/time/localtime.c
@@ -2261,7 +2261,7 @@ posix2time(time_t t)
 
 #endif /* defined STD_INSPIRED */
 
-#ifdef __minix
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(gmtime, __gmtime50)
 __weak_alias(gmtime_r, __gmtime_r50)
 __weak_alias(offtime, __offtime50)

diff --git a/lib/libutil/login.c b/lib/libutil/login.c
index 38d0ca9ac85c0ac16180548eccb66d0569d92a07..c3b61cca042d8715d27cac57554738e6887190b7 100644 (file)
--- a/lib/libutil/login.c
+++ b/lib/libutil/login.c
@@ -69,4 +69,6 @@ login(const struct utmp *ut)
        }
 }
 
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(login, __login50)
+#endif

diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
index 27d07fe503ef36a742351beb1275dacb89ab1c9d..593888e40883174a7990c4282e6312542ba9d096 100644 (file)
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
@@ -995,5 +995,7 @@ multiply(u_quad_t n1, u_quad_t n2)
        return (m);
 }
 
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(login_getpwclass, __login_getpwclass50)
 __weak_alias(setusercontext, __setusercontext50)
+#endif

diff --git a/lib/libutil/loginx.c b/lib/libutil/loginx.c
index ee2c6b3ae27f27f39ab7b0c443e38a33c1bb33a1..7a07b026742d0824e115a28bd44728e0d72b1598 100644 (file)
--- a/lib/libutil/loginx.c
+++ b/lib/libutil/loginx.c
@@ -53,4 +53,6 @@ loginx(const struct utmpx *ut)
        (void)updwtmpx(_PATH_WTMPX, ut);
 }
 
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(loginx, __loginx50)
+#endif

diff --git a/lib/libutil/passwd.c b/lib/libutil/passwd.c
index 5c20555960fea3b5a2421d2dc6841b3c06d32876..5c0cbca5b00b5df31747106eb1bb0f550703eaba 100644 (file)
--- a/lib/libutil/passwd.c
+++ b/lib/libutil/passwd.c
@@ -662,6 +662,8 @@ pw_getpwconf(char *data, size_t max, const struct passwd *pwd,
        }
 }
 
+#if defined(__minix) && defined(__weak_alias)
 __weak_alias(pw_copy, __pw_copy50)
 __weak_alias(pw_copyx, __pw_copyx50)
 __weak_alias(pw_getpwconf, __pw_getpwconf50)
+#endif

diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 6090967f6eaca6b043831717431098b812cf0143..7686f42429cd7ed3c52d4e94b5437c7236a619f7 100644 (file)
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -151,11 +151,10 @@ utimes(const char *path, const struct timeval times[2])
 int
 compare(NODE *s, FTSENT *p)
 {
-#if defined(__minix)
        u_int32_t len, val;
-#else
-       u_int32_t len, val, flags;
-#endif /* defined(__minix) */
+#if HAVE_STRUCT_STAT_ST_FLAGS
+       u_int32_t flags;
+#endif
        int fd, label;
        const char *cp, *tab;
 #if !defined(NO_MD5) || !defined(NO_RMD160) || !defined(NO_SHA1) || !defined(NO_SHA2)

diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index 264aa8b171fcc466819a6ba42909581e9b0d3594..8f0e0db12a01793aa0e6e33534909b5032fec3da 100644 (file)
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -317,9 +317,9 @@ statd(FTS *t, FTSENT *parent, uid_t *puid, gid_t *pgid, mode_t *pmode,
        gid_t sgid;
        uid_t suid;
        mode_t smode;
-#if !defined(__minix)
+#if HAVE_STRUCT_STAT_ST_FLAGS
        u_long sflags = 0;
-#endif /* !defined(__minix) */
+#endif
        const char *name = NULL;
        gid_t savegid;
        uid_t saveuid;

diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index 4b7e83d82917535e7697d3fc2a208af1af5e72eb..11aa8dab170756617e28874f3ce8d6d785d8de9a 100644 (file)
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -168,9 +168,9 @@ miss(NODE *p, char *tail)
        int create;
        char *tp;
        const char *type;
-#if !defined(__minix)
+#if HAVE_STRUCT_STAT_ST_FLAGS
        u_int32_t flags;
-#endif /* !defined(__minix) */
+#endif
 
        for (; p; p = p->next) {
                if (p->flags & F_OPT && !(p->flags & F_VISIT))