From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14382 invoked by alias); 18 Mar 2008 11:21:47 -0000 Received: (qmail 14367 invoked by uid 22791); 18 Mar 2008 11:21:46 -0000 X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_92 X-Spam-Check-By: sourceware.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (83.160.170.119) by sourceware.org (qpsmtpd/0.31) with ESMTP; Tue, 18 Mar 2008 11:21:08 +0000 Received: from dijkstra.wildebeest.org ([192.168.1.29]) by gnu.wildebeest.org with esmtp (Exim 4.63) (envelope-from ) id 1JbZsM-0007T4-P7; Tue, 18 Mar 2008 12:21:04 +0100 Subject: Re: [SCM] master: Merge branch 'master' into topic/elfutils From: Mark Wielaard To: frysk@sourceware.org Cc: moore@sourceware.org In-Reply-To: <20080317160343.18782.qmail@sourceware.org> References: <20080317160343.18782.qmail@sourceware.org> Content-Type: text/plain Date: Tue, 18 Mar 2008 11:21:00 -0000 Message-Id: <1205839262.3390.30.camel@dijkstra.wildebeest.org> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-3.fc8) Content-Transfer-Encoding: 7bit X-Spam-Score: -4.4 (----) X-IsSubscribed: yes Mailing-List: contact frysk-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-owner@sourceware.org X-SW-Source: 2008-q1/txt/msg00156.txt.bz2 Hi Tim, On Mon, 2008-03-17 at 16:03 +0000, moore@sourceware.org wrote: > commit 581f34133cec7c18be6fbfc298817021ba1ddd9c > Author: Tim Moore > Date: Thu Mar 13 18:24:17 2008 +0100 > > Bug fixes to elfutils > > frysk-imports/elfutils/libelf/ChangeLog: > 2008-03-13 Tim Moore > > * elf_getdata_rawchunk.c (elf_getdata_rawchunk): Cast offset and > size computation to uint64_t. > > frysk-imports/elfutils/libdwfl/ChangeLog: > 2008-03-13 Tim Moore > > * dwfl_module_addrsym.c (dwfl_module_addrsym): Start min_label > from 0 to allow sizeless symbols below the address. Choose the > best sizeless symbol. Did you push these two upstream? I also noticed: > diff --git a/frysk-imports/elfutils/ChangeLog b/frysk-imports/elfutils/ChangeLog > index c4e46d3..fee15a4 100644 > --- a/frysk-imports/elfutils/ChangeLog > +++ b/frysk-imports/elfutils/ChangeLog > @@ -1,13 +1,14 @@ > +2007-12-20 Ulrich Drepper > + > + * configure.ac: Add support for --enable-debugpred. > + Update likely/unlikely macros for it. > + > 2007-06-05 Ulrich Drepper > > * Makefile.am: Remove traces of mini builds. > * configure.ac: Don't use libelf-po/POTFILES.in as config file > anymore. > > -2007-05-28 Nurdin Premji > - > - * libdwfl/libdwfl.h: Publicize elf_from_remote_memory. > - > 2007-05-16 Roland McGrath > > * configure.ac (AM_INIT_AUTOMAKE): Use -Wno-portability. > @@ -20,11 +21,6 @@ > > * configure.ac: Use AM_MAINTAINER_MODE. > > -2006-08-19 Stepan Kasal > - > - * Makefile.am: Do not run installcheck nor uninstall either. > - Do not define all targets on one line, attach explanation. > - > 2006-07-12 Ulrich Drepper > > * configure.ac (internal_function): Don't use internal visibility. > @@ -34,10 +30,6 @@ > * configure.ac: Add dummy automake conditional to get dependencies > for non-generic linker right. See src/Makefile.am. > > -2006-06-27 Rick Moseley > - > - * Makefile.am: Change to not install for frysk. > - > 2005-11-18 Roland McGrath > > * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. So, our own ChangeLog entries disappear on a merge. It might make sense to add a ChangeLog.frysk file to add our ChangeLog entries to so they stay around when we do a new merge. Cheers, Mark