From patchwork Wed Jan 8 10:00:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Reutner-Fischer X-Patchwork-Id: 308140 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 56BFA2C00AD for ; Wed, 8 Jan 2014 21:00:59 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 35E7A8C18E; Wed, 8 Jan 2014 10:00:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FPqM3LkPSx5c; Wed, 8 Jan 2014 10:00:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 226D28C147; Wed, 8 Jan 2014 10:00:57 +0000 (UTC) X-Original-To: uclibc@lists.busybox.net Delivered-To: uclibc@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 973AD1C2913 for ; Wed, 8 Jan 2014 10:00:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 931068B824 for ; Wed, 8 Jan 2014 10:00:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3gRYz4_GXU27 for ; Wed, 8 Jan 2014 10:00:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A8C9B8B0FB for ; Wed, 8 Jan 2014 10:00:55 +0000 (UTC) Received: by mail-lb0-f180.google.com with SMTP id x18so1120563lbi.39 for ; Wed, 08 Jan 2014 02:00:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=qCN8embC6acK//ON+9KC3kX2on+NSK91aDMRTTkULAo=; b=gIf+OFtlnWtlomd0jXqgw35MEzTbwCuOYXLU9LmRD6dp+vB9yRNIjhA2zqrEFwtSLB OmQ7uJB7UZXJh+qn0wqG3l2P5jcwsIZOihUQXbFTEYIZg2ty6AurBd5cRRX/zKk/3i/Q 7VUMaMoqPwI1Acrx1XdRZhDFY/NlA0fDOTYk9F6lOgpi/a0ozAHXMFQRu4CqgX75qS1Q HArG2zuLAfQITDdldSm91X32enEQS+LhUaizmMJ4qs1TKK85TbbeAA7kpDPZqyffoyPS BIuPYT1ihdzf4DX/W5lIr7hKzG+KICai92gV4FWxrOSWfdbRBeHdxcBPzK8xz9Ezi1zc ptgg== MIME-Version: 1.0 X-Received: by 10.112.137.138 with SMTP id qi10mr46553259lbb.21.1389175253741; Wed, 08 Jan 2014 02:00:53 -0800 (PST) Received: by 10.114.95.98 with HTTP; Wed, 8 Jan 2014 02:00:53 -0800 (PST) In-Reply-To: References: <20131223135909.GB4435@tarshish> <1431fd02010.2760.0f39ed3bcad52ef2c88c90062b7714dc@gmail.com> <52C64261.6090001@synopsys.com> <52CBED25.7050705@synopsys.com> Date: Wed, 8 Jan 2014 11:00:53 +0100 Message-ID: Subject: Re: update unifdef causing partial header generation and From: Bernhard Reutner-Fischer To: Tony Finch Cc: uclibc-mailing list , Vineet Gupta , francois Bedard X-BeenThere: uclibc@uclibc.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Discussion and development of uClibc \(the embedded C library\)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: uclibc-bounces@uclibc.org Sender: uclibc-bounces@uclibc.org On 7 January 2014 20:51, Tony Finch wrote: > Bernhard Reutner-Fischer wrote: > >> >> ./extra/scripts/unifdef -B -t -f .//include/generated/unifdef_config.h -U_LIBC >> >> -U__UCLIBC_GEN_LOCALE -U__NO_CTYPE include/bits/uClibc_config.h > > By the way, why are you using the -t option? It should only be necessary > if you are using unifdef with languages other than C, e.g. where the > input files have mismatched quotes. (This is one of the weird features > unifdef inherited from 1980s pre-standard C...) Except that not using the -t switch fails to produce correct output for me. Given the data in the tarball from yesterday if you omit -t i get: $ ../extra/scripts/unifdef -x 2 -B -d -f ./unifdef_config.h -U_LIBC -U__UCLIBC_GEN_LOCALE -U__NO_CTYPE features.h -o broken-nontext.h 2>&1 >& broken-nontext.LOG ; echo $? 2 $ ../extra/scripts/unifdef -t -x 2 -B -d -f ./unifdef_config.h -U_LIBC -U__UCLIBC_GEN_LOCALE -U__NO_CTYPE features.h -o ok-text.h 2>&1 >& ok-text.LOG ; echo $? 0 $ diff -u ok-text.h broken-nontext.h and you see the missing/wrong STRING_LITERAL, again: --- broken-nontext.LOG 2014-01-08 10:52:59.119913165 +0100 +++ ok-text.LOG 2014-01-08 10:53:08.520076936 +0100 [] unifdef: #define -unifdef: addsym __TARGET_ARCH__= +unifdef: addsym __TARGET_ARCH__="x86_64" unifdef: parser line 37 state NO comment START line unifdef: #define unifdef: addsym __FORCE_OPTIONS_FOR_ARCH__=1 unifdef: parser line 38 state NO comment START line unifdef: #define -unifdef: addsym __TARGET_SUBARCH__= +unifdef: addsym __TARGET_SUBARCH__="" unifdef: parser line 39 state NO comment START line unifdef: parser line 40 state NO comment START line unifdef: parser line 41 state NO comment START line Can you reproduce this? > > Also regarding the comment in install_headers.sh about unifdef's exit > status, you might want to use the -x2 option. I have changed our invocation to use -x 2 now, yes. Oh, would you mind to sed -i -e s/portabiity/portability/g unifdef.h TIA :) PS: you are using non-standard err*() and warn*(), see http://git.uclibc.org/uClibc/tree/extra/scripts/unifdef.h#n37 Just in case you want to do something about this, but i'm fine to keep these local, of course. cheers, > > Tony. > -- > f.anthony.n.finch http://dotat.at/ > Forties, Cromarty: East, veering southeast, 4 or 5, occasionally 6 at first. > Rough, becoming slight or moderate. Showers, rain at first. Moderate or good, > occasionally poor at first. --- ok-text.h 2014-01-08 10:53:08.520076936 +0100 +++ broken-nontext.h 2014-01-08 10:47:57.898468714 +0100 @@ -415,4 +415,3 @@ # define __USE_EXTERN_INLINES 1 #endif -#endif /* features.h */