From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14257 invoked by alias); 25 Jul 2007 00:49:59 -0000 Received: (qmail 14241 invoked by uid 22791); 25 Jul 2007 00:49:58 -0000 X-Spam-Check-By: sourceware.org Received: from ausmtp05.au.ibm.com (HELO ausmtp05.au.ibm.com) (202.81.18.154) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 25 Jul 2007 00:49:56 +0000 Received: from d23relay01.au.ibm.com (d23relay01.au.ibm.com [202.81.18.232]) by ausmtp05.au.ibm.com (8.13.8/8.13.8) with ESMTP id l6P0p2JG5759116; Wed, 25 Jul 2007 10:51:02 +1000 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.250.242]) by d23relay01.au.ibm.com (8.13.8/8.13.8/NCO v8.4) with ESMTP id l6P0nFGq240108; Wed, 25 Jul 2007 10:49:15 +1000 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id l6P0nqO5031416; Wed, 25 Jul 2007 10:49:52 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.190.163.12]) by d23av01.au.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id l6P0npx5031398; Wed, 25 Jul 2007 10:49:51 +1000 Received: from [10.61.2.156] (haven.au.ibm.com [9.190.164.82]) (using SSLv3 with cipher RC4-MD5 (128/128 bits)) (Client did not present a certificate) by ozlabs.au.ibm.com (Postfix) with ESMTP id 04D7A73515; Wed, 25 Jul 2007 10:49:51 +1000 (EST) Subject: PATCH: remove libiberty/ternary.c et al From: Ben Elliston To: gcc-patches@gcc.gnu.org, gdb-patches@sourceware.org, binutils@sourceware.org Cc: dj@redhat.com, ian@airs.com, dberlin@dberlin.org Content-Type: text/plain Date: Wed, 25 Jul 2007 01:40:00 -0000 Message-Id: <1185324590.19345.28.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.10.1 Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2007-07/txt/msg00264.txt.bz2 Daniel Berlin has confirmed that libiberty/ternary.c was committed with plans to use it in GDB, but that this never eventuated. The following patch removes that file, its header, and stops building it into libiberty. While I was at it, I made a few cosmetic improvements to the comments in libiberty/Makefile.in. Okay for the trunk? Ben libiberty/ChangeLog 2007-07-25 Ben Elliston * Makefile.in (CFILES): Remove ternary.c. (REQUIRED_OFILES): Remove ./ternary.o. (INSTALLED_HEADERS): Remove ternary.h. (ternary.o): Remove. * ternary.c: Remove. include/ChangeLog 2007-07-25 Ben Elliston * ternary.h: Remove. Index: libiberty/Makefile.in =================================================================== --- libiberty/Makefile.in (revision 126890) +++ libiberty/Makefile.in (working copy) @@ -1,7 +1,9 @@ +# Makefile for the libiberty library. +# Originally written by K. Richard Pixley . # -# Makefile -# Copyright (C) 1990, 91-99, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -# Free Software Foundation +# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software +# Foundation # # This file is part of the libiberty library. # Libiberty is free software; you can redistribute it and/or @@ -18,13 +20,6 @@ # License along with libiberty; see the file COPYING.LIB. If not, # write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, # Boston, MA 02110-1301, USA. -# - -# This file was written by K. Richard Pixley . - -# -# Makefile for libiberty directory -# libiberty_topdir = @libiberty_topdir@ srcdir = @srcdir@ @@ -152,7 +147,7 @@ CFILES = alloca.c argv.c asprintf.c atex splay-tree.c stpcpy.c stpncpy.c strcasecmp.c strchr.c strdup.c \ strerror.c strncasecmp.c strncmp.c strrchr.c strsignal.c \ strstr.c strtod.c strtol.c strtoul.c strndup.c strverscmp.c \ - ternary.c tmpnam.c \ + tmpnam.c \ unlink-if-ordinary.c \ vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c \ waitpid.c \ @@ -176,7 +171,6 @@ REQUIRED_OFILES = ./regex.o ./cplus-dem. ./pex-common.o ./pex-one.o @pexecute@ \ ./safe-ctype.o ./sort.o ./spaces.o ./splay-tree.o ./strerror.o \ ./strsignal.o \ - ./ternary.o \ ./unlink-if-ordinary.o \ ./xatexit.o ./xexit.o ./xmalloc.o ./xmemdup.o ./xstrdup.o \ ./xstrerror.o ./xstrndup.o @@ -219,8 +213,7 @@ INSTALLED_HEADERS = $(INCDIR)/partition.h \ $(INCDIR)/safe-ctype.h \ $(INCDIR)/sort.h \ - $(INCDIR)/splay-tree.h \ - $(INCDIR)/ternary.h + $(INCDIR)/splay-tree.h $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) -rm -f $(TARGETLIB) pic/$(TARGETLIB) @@ -1083,13 +1076,6 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/strverscmp.c $(OUTPUT_OPTION) -./ternary.o: $(srcdir)/ternary.c stamp-h $(INCDIR)/ansidecl.h \ - $(INCDIR)/libiberty.h $(INCDIR)/ternary.h - if [ x"$(PICFLAG)" != x ]; then \ - $(COMPILE.c) $(PICFLAG) $(srcdir)/ternary.c -o pic/$@; \ - else true; fi - $(COMPILE.c) $(srcdir)/ternary.c $(OUTPUT_OPTION) - ./tmpnam.o: $(srcdir)/tmpnam.c if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/tmpnam.c -o pic/$@; \