From: Evgeniy Ivanov <lolkaantimat@gmail.com>
Date: Tue, 12 Jul 2011 16:44:29 +0000 (+0000)
Subject: Update minix-port.patch.
X-Git-Tag: v3.2.0~469
X-Git-Url: http://zhaoyanbai.com/repos/%22/xml/v3/mem/static/tz-link.htm?a=commitdiff_plain;h=48331843ea1480ca54df18bd3f2ec8a855b68390;p=minix.git

Update minix-port.patch.
---

diff --git a/lib/nbsd_libm/minix-port.patch b/lib/nbsd_libm/minix-port.patch
index 18957fddb..ebe0d4cd9 100644
--- a/lib/nbsd_libm/minix-port.patch
+++ b/lib/nbsd_libm/minix-port.patch
@@ -1,17 +1,13 @@
 diff -ru nbsdsrc/src/lib/libm/Makefile lib/nbsd_libm/Makefile
 --- nbsdsrc/src/lib/libm/Makefile
 +++ lib/nbsd_libm/Makefile
-@@ -13,6 +13,14 @@
+@@ -13,6 +13,10 @@
  #
  #
  
-+.warning  MACHINE_ARCH is first ${MACHINE_ARCH}
-+
 +.if ${MACHINE_ARCH} == "unknown"
 +MACHINE_ARCH:= ${MACHINE}
 +.endif
-+
-+.warning  MACHINE_ARCH is now ${MACHINE_ARCH}
 +
  #
  # There are two options in making libm at fdlibm compile time:
diff --git a/nbsd_include/minix-port.patch b/nbsd_include/minix-port.patch
index b3b07a6f5..8928d1cd6 100644
--- a/nbsd_include/minix-port.patch
+++ b/nbsd_include/minix-port.patch
@@ -285,7 +285,16 @@ diff -ru nbsdsrc/src/include/stdio.h nbsd_include/stdio.h
 diff -ru nbsdsrc/src/include/stdlib.h nbsd_include/stdlib.h
 --- nbsdsrc/src/include/stdlib.h
 +++ nbsd_include/stdlib.h
-@@ -265,9 +265,11 @@
+@@ -244,6 +244,8 @@
+ void	*alloca(int);     /* built-in for gcc */
+ #elif defined(__PCC__) && !defined(__GNUC__)
+ #define alloca(size) __builtin_alloca(size)
++#elif (__GNUC__ >= 2)
++#define alloca(size) __builtin_alloca(size)
+ #else
+ void	*alloca(size_t);
+ #endif /* __GNUC__ */
+@@ -265,9 +267,11 @@
  void	 csetexpandtc(int);
  
  int	 daemon(int, int);
@@ -297,7 +306,7 @@ diff -ru nbsdsrc/src/include/stdlib.h nbsd_include/stdlib.h
  
  #define	HN_DECIMAL		0x01
  #define	HN_NOSPACE		0x02
-@@ -280,7 +282,9 @@
+@@ -280,7 +284,9 @@
  int	 humanize_number(char *, size_t, int64_t, const char *, int, int);
  int	 dehumanize_number(const char *, int64_t *);