From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29207 invoked by alias); 29 Jun 2009 20:00:36 -0000 Received: (qmail 29189 invoked by uid 22791); 29 Jun 2009 20:00:35 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00,SPF_PASS X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.45.13) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 29 Jun 2009 20:00:26 +0000 Received: from zps78.corp.google.com (zps78.corp.google.com [172.25.146.78]) by smtp-out.google.com with ESMTP id n5TK0OM9014238; Mon, 29 Jun 2009 13:00:24 -0700 Received: from pxi1 (pxi1.prod.google.com [10.243.27.1]) by zps78.corp.google.com with ESMTP id n5TK0LZx008965; Mon, 29 Jun 2009 13:00:22 -0700 Received: by pxi1 with SMTP id 1so708738pxi.5 for ; Mon, 29 Jun 2009 13:00:21 -0700 (PDT) Received: by 10.114.37.1 with SMTP id k1mr12106507wak.28.1246305621868; Mon, 29 Jun 2009 13:00:21 -0700 (PDT) Received: from localhost.localdomain.google.com (adsl-71-133-8-30.dsl.pltn13.pacbell.net [71.133.8.30]) by mx.google.com with ESMTPS id l37sm12572646waf.40.2009.06.29.13.00.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 29 Jun 2009 13:00:21 -0700 (PDT) To: Tom Tromey Cc: gcc-patches@gcc.gnu.org, Binutils Development , gdb-patches@sourceware.org Subject: Re: Patch: merge src and gcc copies of dwarf2.h References: From: Ian Lance Taylor Date: Mon, 29 Jun 2009 20:00:00 -0000 In-Reply-To: (Tom Tromey's message of "Mon\, 29 Jun 2009 12\:12\:35 -0600") Message-ID: User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-System-Of-Record: true 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: 2009-06/txt/msg00845.txt.bz2 Tom Tromey writes: > 2009-06-29 Tom Tromey > * dwarf2.h: Remove. > * Makefile.in (DWARF2_H): New variable. > (except.o): Use it. > (dwarf2out.o): Likewise. > (dwarf2asm.o): Likewise. > * config/i386/t-i386: Use DWARF2_H. > * except.c: Include elf/dwarf2.h. > * unwind-dw2.c: Include elf/dwarf2.h. > * dwarf2out.c: Include elf/dwarf2.h. > (dw_loc_descr_struct) : Now a bitfield. > : New field. > (dwarf_stack_op_name): Don't handle INTERNAL_DW_OP_tls_addr. > (size_of_loc_descr): Likewise. > (output_loc_operands_raw): Likewise. > (output_loc_operands): Handle new dtprel field. > (loc_checksum): Update. > (loc_descriptor_from_tree_1) : Set dtprel field. > * unwind-dw2-fde-glibc.c: Include elf/dwarf2.h. > * unwind-dw2-fde.c: Include elf/dwarf2.h. > * dwarf2asm.c: Include elf/dwarf2.h. > * unwind-dw2-fde-darwin.c: Include elf/dwarf2.h. > * config/mmix/mmix.c: Include elf/dwarf2.h. > * config/rs6000/darwin-fallback.c: Include elf/dwarf2.h. > * config/xtensa/unwind-dw2-xtensa.c: Include elf/dwarf2.h. > * config/sh/sh.c: Include elf/dwarf2.h. > * config/i386/i386.c: Include elf/dwarf2.h. > 2009-06-29 Tom Tromey > * raise-gcc.c: Include elf/dwarf2.h. > 2009-06-29 Tom Tromey > * elf/dwarf2.h: New file. Merged with gdb. > @@ -7280,7 +7285,10 @@ > static inline void > loc_checksum (dw_loc_descr_ref loc, struct md5_ctx *ctx) > { > - CHECKSUM (loc->dw_loc_opc); > + int tem; > + > + tem = ((unsigned int) loc->dw_loc_opc << 1) | loc->dtprel; > + CHECKSUM (tem); This appears to change the checksum, which probably doesn't matter too much, but since it can appear in a .o file it seems to me that we might as well keep the same checksum, as in tem = (loc->dtprel << 8) | ((unsigned int) loc->dw_loc_opc); This patch is OK for gcc with that change. Thanks. Ian