nbsd libc: disable i386 exec*() optimisation

diff --git a/lib/nbsd_libc/gen/execl.c b/lib/nbsd_libc/gen/execl.c
index 9de075cb7a279a84b9f42e83a2ff8fdfd3a52802..35aab72d8336eff75626f7f6d6f6da69e78a9f57 100644 (file)
--- a/lib/nbsd_libc/gen/execl.c
+++ b/lib/nbsd_libc/gen/execl.c
@@ -56,7 +56,7 @@ int
 execl(const char *name, const char *arg, ...)
 {
        int r;
-#if defined(__i386__) || defined(__m68k__)
+#if (defined(__i386__) || defined(__m68k__)) && !defined(__minix)
        r = execve(name, __UNCONST(&arg), environ);
        return r;
 #else

diff --git a/lib/nbsd_libc/gen/execle.c b/lib/nbsd_libc/gen/execle.c
index 1d9a4a46225bfc3b533d80d42973dceebf1e8937..37980b98273396ae2d2b76cb2c98975591b76186 100644 (file)
--- a/lib/nbsd_libc/gen/execle.c
+++ b/lib/nbsd_libc/gen/execle.c
@@ -50,7 +50,7 @@ __weak_alias(execle,_execle)
 int
 execle(const char *name, const char *arg, ...)
 {
-#if defined(__i386__) || defined(__m68k__)
+#if (defined(__i386__) || defined(__m68k__)) && !defined(__minix)
        va_list ap;
        char **envp;
 

diff --git a/lib/nbsd_libc/gen/execlp.c b/lib/nbsd_libc/gen/execlp.c
index 8b84cd1bf115a5ea9c0f4450ca87c1ce85dde9b8..8358221e734a0df85d7d95e41e5137d9c9a33cd1 100644 (file)
--- a/lib/nbsd_libc/gen/execlp.c
+++ b/lib/nbsd_libc/gen/execlp.c
@@ -50,7 +50,7 @@ __weak_alias(execlp,_execlp)
 int
 execlp(const char *name, const char *arg, ...)
 {
-#if defined(__i386__) || defined(__m68k__)
+#if (defined(__i386__) || defined(__m68k__)) && !defined(__minix)
        return execvp(name, __UNCONST(&arg));
 #else
        va_list ap;