From owner-freebsd-current@FreeBSD.ORG Sat Feb 5 21:43:39 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95FFF106564A for ; Sat, 5 Feb 2011 21:43:39 +0000 (UTC) (envelope-from keramida@ceid.upatras.gr) Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36]) by mx1.freebsd.org (Postfix) with ESMTP id 27BBF8FC0A for ; Sat, 5 Feb 2011 21:43:38 +0000 (UTC) X-Spam-Status: No X-Hellug-MailScanner-From: keramida@ceid.upatras.gr X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-2.9, required 5, autolearn=not spam, ALL_TRUSTED -1.00, BAYES_00 -1.90) X-Hellug-MailScanner: Found to be clean X-Hellug-MailScanner-ID: p15LUtON029058 Received: from gkeramidas-glaptop.linux.gr (h-64-105-143-250.snvacaid.static.covad.net [64.105.143.250]) (authenticated bits=0) by igloo.linux.gr (8.14.3/8.14.3/Debian-9.4) with ESMTP id p15LUtON029058 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 5 Feb 2011 23:31:31 +0200 From: Giorgos Keramidas To: Alexander Best References: <20110203221257.GA76849@freebsd.org> <201102040756.12109.jhb@freebsd.org> <20110204201948.GA27893@freebsd.org> Date: Sat, 05 Feb 2011 13:30:22 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Cc: freebsd-current@freebsd.org Subject: Re: [RFC] removing broken includes X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Feb 2011 21:43:39 -0000 On Fri, 4 Feb 2011 20:19:48 +0000, Alexander Best wrote: >On Fri Feb 4 11, John Baldwin wrote: >>On Thursday, February 03, 2011 5:12:57 pm Alexander Best wrote: >>> hi everybody, >>> i've started to check the source for broken includes, such as the one fixed in >>> r218189. so far i've run through arch=amd64 and found only two broken includes, >>> which should be fixed by the attached patch. the commands i'm using are: >> >> The sys/conf/files fix should definitely go in. > > as a side note: while checking the tinderbox output i saw a few gas related > warnings, which complained about VCS IDs being spammed to object files. Maybe it's intentional for these objects to _have_ the VCS id in them, like some of the "@(#)" strings that are passed down to the ELF binary. This sort of object data is often used to determine what bits have gone into the binary, so we should check if they are intentional before ifdef'ing them all out. % Index: sbin/routed/rtquery/rtquery.c % =================================================================== % --- sbin/routed/rtquery/rtquery.c (revision 218217) % +++ sbin/routed/rtquery/rtquery.c (working copy) % @@ -49,6 +49,7 @@ % #include % #endif % % +#if 0 % #define UNUSED __attribute__((unused)) % #ifndef __RCSID % #define __RCSID(_s) static const char rcsid[] UNUSED = _s % @@ -67,6 +68,7 @@ % __RCSID("$Revision: 2.26 $"); % #ident "$Revision: 2.26 $" % #endif % +#endif We can avoid this by building rtquery.c with -D NO__RCSID. See below for the same trick about lukemftpd... % #ifndef sgi % #define _HAVE_SIN_LEN % Index: contrib/lukemftp/src/main.c % =================================================================== % --- contrib/lukemftp/src/main.c (revision 218217) % +++ contrib/lukemftp/src/main.c (working copy) % @@ -96,8 +96,10 @@ % % #include % #ifndef lint % +#if 0 % __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\n\ % The Regents of the University of California. All rights reserved.\n"); % +#endif % #endif /* not lint */ This looks 'harmless' to include in the resulting binary, but maybe we should just define NO_COPYRIGHT while building lukemftp? This will disable the spamming of the object code with the static string and we don't have to modify vendor code at all. So, how about this instead? % diff -r bd0305f6cb2b libexec/lukemftpd/Makefile % --- a/libexec/lukemftpd/Makefile Sat Feb 05 02:39:55 2011 +0100 % +++ b/libexec/lukemftpd/Makefile Sat Feb 05 22:28:12 2011 +0100 % @@ -13,6 +13,7 @@ SRCS= cmds.c conf.c ftpd.c ftpcmd.y pope % SRCS+= strsuftoll.c % % WFORMAT= 0 % +CFLAGS+= -DNO_COPYRIGHT % % .if ${MK_INET6_SUPPORT} != "no" % CFLAGS+= -DINET6 > also i noticed a lot of these warnings: > > usr/subversion-src/lib/libc/i386/string/memcpy.S:7: Warning: ignoring incorrect section type for .note.GNU-stack > > i think i've seen some recent commits dealing with that new section. That looks like something more useful to fix now, rather than later.