From owner-freebsd-current@FreeBSD.ORG  Sat Jun 14 08:36:37 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1206737B401
	for <current@freebsd.org>; Sat, 14 Jun 2003 08:36:37 -0700 (PDT)
Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 650B843F93
	for <current@freebsd.org>; Sat, 14 Jun 2003 08:36:36 -0700 (PDT)
	(envelope-from des@ofug.org)
Received: by flood.ping.uio.no (Postfix, from userid 2602)
	id 6D093530E; Sat, 14 Jun 2003 17:36:33 +0200 (CEST)
X-URL: http://www.ofug.org/~des/
X-Disclaimer: The views expressed in this message do not necessarily
  coincide with those of any organisation or company with
  which I am or have been affiliated.
To: "Matt" <matt@xtaz.co.uk>
References: <53806.192.168.1.10.1055589910.squirrel@webmail.xtaz.co.uk>
	<xzp65n866z8.fsf@flood.ping.uio.no>
From: Dag-Erling Smorgrav <des@ofug.org>
Date: Sat, 14 Jun 2003 17:36:33 +0200
In-Reply-To: <xzp65n866z8.fsf@flood.ping.uio.no> (Dag-Erling Smorgrav's
 message of "Sat, 14 Jun 2003 16:58:51 +0200")
Message-ID: <xzpwufo4qny.fsf@flood.ping.uio.no>
User-Agent: Gnus/5.1001 (Gnus v5.10.1) Emacs/21.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
cc: current@freebsd.org
Subject: Re: i386 Buildworld Failure alloca cdefs.h
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Jun 2003 15:36:37 -0000

--=-=-=

Dag-Erling Smorgrav <des@ofug.org> writes:
> The #error line he added is incorrect as it breaks compliant
> applications which do not use the nonstandard and nonportable
> alloca(3).

The attached patch *may* fix this.  It is currently undergoing
testing.

DES
-- 
Dag-Erling Smorgrav - des@ofug.org


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=alloca.diff

Index: sys/sys/cdefs.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/cdefs.h,v
retrieving revision 1.70
diff -u -r1.70 cdefs.h
--- sys/sys/cdefs.h	14 Jun 2003 06:01:35 -0000	1.70
+++ sys/sys/cdefs.h	14 Jun 2003 15:04:29 -0000
@@ -142,11 +142,6 @@
 #define	__section(x)	__attribute__((__section__(x)))
 #endif
 #endif
-#ifdef __GNUC__
-#define	alloca(sz)	__builtin_alloca(sz)
-#else
-#error FreeBSD alloca support needed for this compiler
-#endif
 
 /* XXX: should use `#if __STDC_VERSION__ < 199901'. */
 #if !(__GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3)
Index: include/stdlib.h
===================================================================
RCS file: /home/ncvs/src/include/stdlib.h,v
retrieving revision 1.48
diff -u -r1.48 stdlib.h
--- include/stdlib.h	12 Mar 2003 20:29:58 -0000	1.48
+++ include/stdlib.h	14 Jun 2003 15:06:02 -0000
@@ -222,7 +222,12 @@
 extern void (*_malloc_message)(const char *, const char *, const char *,
 	    const char *);
 
-void	*alloca(size_t);		/* built-in for gcc */
+#ifdef __GNUC__
+#define alloca(sz)	__builtin_alloca(sz)
+#else
+void	*alloca(size_t);
+#endif
+
 __uint32_t
 	 arc4random(void);
 void	 arc4random_addrandom(unsigned char *dat, int datlen);

--=-=-=--