From: Ben Gras <ben@minix3.org>
Date: Wed, 6 Jul 2011 09:34:03 +0000 (+0200)
Subject: nbsd libc: disable i386 exec*() optimisation
X-Git-Tag: v3.2.0~490
X-Git-Url: http://zhaoyanbai.com/repos/Bv9ARM.ch04.html?a=commitdiff_plain;h=9fdd167da4a3971e7331465faf9e4c3a74e931da;p=minix.git

nbsd libc: disable i386 exec*() optimisation
---

diff --git a/lib/nbsd_libc/gen/execl.c b/lib/nbsd_libc/gen/execl.c
index 9de075cb7..35aab72d8 100644
--- 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 1d9a4a462..37980b982 100644
--- 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 8b84cd1bf..8358221e7 100644
--- 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;