From owner-svn-src-all@FreeBSD.ORG  Thu Mar 31 21:33:33 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA4F4106566B;
	Thu, 31 Mar 2011 21:33:33 +0000 (UTC)
	(envelope-from rstone@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D758E8FC17;
	Thu, 31 Mar 2011 21:33:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2VLXXv0023396;
	Thu, 31 Mar 2011 21:33:33 GMT (envelope-from rstone@svn.freebsd.org)
Received: (from rstone@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2VLXXLA023394;
	Thu, 31 Mar 2011 21:33:33 GMT (envelope-from rstone@svn.freebsd.org)
Message-Id: <201103312133.p2VLXXLA023394@svn.freebsd.org>
From: Ryan Stone <rstone@FreeBSD.org>
Date: Thu, 31 Mar 2011 21:33:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220227 - head/sys/tools
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Mar 2011 21:33:34 -0000

Author: rstone
Date: Thu Mar 31 21:33:33 2011
New Revision: 220227
URL: http://svn.freebsd.org/changeset/base/220227

Log:
  GNU awk does not output escaped newlines in multi-line printc statements. This
  leads to compile errors when trying to compile firmware(9) stubs created with
  gawk, as multiple #include statements end up on the same line.  Replace the
  multi-line printc statement that outputs all of the #includes with one printc
  per #include.  This allows modules compatible with firmware(9) to be cross-built
  from a Linux machine without requiring the one true awk to be installed.
  
  I've intentionally done the minimal set of changes necessary to make gawk
  produce valid (but not pretty) C code, to reduce the churn and keep fw_stubs.awk
  as readable as possible.
  
  Approved by:	emaste (mentor)
  MFC after:	2 weeks

Modified:
  head/sys/tools/fw_stub.awk

Modified: head/sys/tools/fw_stub.awk
==============================================================================
--- head/sys/tools/fw_stub.awk	Thu Mar 31 21:30:00 2011	(r220226)
+++ head/sys/tools/fw_stub.awk	Thu Mar 31 21:33:33 2011	(r220227)
@@ -124,14 +124,14 @@ gsub(/[-\.]/, "_", modname);
 printc("/*\
  * Automatically generated by:\
  * $FreeBSD$\
- */\
-#include <sys/param.h>\
-#include <sys/errno.h>\
-#include <sys/kernel.h>\
-#include <sys/module.h>\
-#include <sys/linker.h>\
-#include <sys/firmware.h>\
-#include <sys/systm.h>\n");
+ */");
+printc("#include <sys/param.h>");
+printc("#include <sys/errno.h>");
+printc("#include <sys/kernel.h>");
+printc("#include <sys/module.h>");
+printc("#include <sys/linker.h>");
+printc("#include <sys/firmware.h>");
+printc("#include <sys/systm.h>\n");
 
 if (opt_l) {
 	printc("static long " opt_l "_license_ack = 0;");