Date: Thu, 31 Mar 2011 21:33:33 +0000 (UTC) From: Ryan Stone <rstone@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r220227 - head/sys/tools Message-ID: <201103312133.p2VLXXLA023394@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103312133.p2VLXXLA023394>