From patchwork Mon Dec 2 20:43:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omair Javaid X-Patchwork-Id: 21941 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1021B23FCF for ; Mon, 2 Dec 2013 20:43:43 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id g10sf34744321pdj.9 for ; Mon, 02 Dec 2013 12:43:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:date:from:user-agent :mime-version:to:cc:subject:references:in-reply-to:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=QljAIfIh2DZ6/ecYOrOlpYKt5DZMra79arDTaEc5hlQ=; b=e4DG7MZaVl0P7qnMWtI1E+yLGcRt0B0hohMbuTkOSpZsUc0eoj6EPgn5u9AsbizR3m IpB2GbP4rasq9hGwNtp/H7AyfRGjEKBRSJuZ5UGLnAk05U1j2w+xH2XvmssfynxyoNa9 WSQEAlMU67oT59ROnWVyfiigmPFqeBtRtTPg/e5w3XeXTNqcJQli5Vyz+ZAT31x8nIEI DdBfVQNm4bOnQ8ifFrS257wknE+Hb/l4EkOFl0dDaQBYJCeGDpRlAPxj3qAlJcfeHy8/ G6iBVMOnX9ehBGc3PG71XkORM7KE9xiGEbLylQ1WQLEIoXCFYSbgwGJ6XAb+CuNpL0pT wMhA== X-Gm-Message-State: ALoCoQkICA0VdSt+W5vE0RviQYIm8lvWLY5epYoil6xUwm4GudXSnlJALV+Ei1p7w1LEe4qtACmm X-Received: by 10.66.66.163 with SMTP id g3mr21969960pat.3.1386017022835; Mon, 02 Dec 2013 12:43:42 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.18 with SMTP id d18ls4894454qej.14.gmail; Mon, 02 Dec 2013 12:43:42 -0800 (PST) X-Received: by 10.58.46.77 with SMTP id t13mr1747419vem.32.1386017022691; Mon, 02 Dec 2013 12:43:42 -0800 (PST) Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by mx.google.com with ESMTPS id y5si30147076vck.2.2013.12.02.12.43.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Dec 2013 12:43:42 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.46 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.46; Received: by mail-vb0-f46.google.com with SMTP id i12so8808099vbh.19 for ; Mon, 02 Dec 2013 12:43:42 -0800 (PST) X-Received: by 10.58.187.51 with SMTP id fp19mr871020vec.47.1386017022357; Mon, 02 Dec 2013 12:43:42 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp153740vcz; Mon, 2 Dec 2013 12:43:41 -0800 (PST) X-Received: by 10.180.20.15 with SMTP id j15mr20221976wie.4.1386017020974; Mon, 02 Dec 2013 12:43:40 -0800 (PST) Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by mx.google.com with ESMTPS id l10si19025197wiw.46.2013.12.02.12.43.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Dec 2013 12:43:40 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.181 is neither permitted nor denied by best guess record for domain of omair.javaid@linaro.org) client-ip=209.85.212.181; Received: by mail-wi0-f181.google.com with SMTP id hq4so5483549wib.8 for ; Mon, 02 Dec 2013 12:43:40 -0800 (PST) X-Received: by 10.180.108.162 with SMTP id hl2mr10179073wib.56.1386017020388; Mon, 02 Dec 2013 12:43:40 -0800 (PST) Received: from [192.168.1.2] ([182.185.141.185]) by mx.google.com with ESMTPSA id s2sm126353517wiy.7.2013.12.02.12.43.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Dec 2013 12:43:39 -0800 (PST) Message-ID: <529CF0EF.9090704@linaro.org> Date: Tue, 03 Dec 2013 01:43:27 +0500 From: Omair Javaid User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.1 MIME-Version: 1.0 To: Tom Tromey CC: "gdb-patches@sourceware.org" , Patch Tracking , "Abid, Hafiz" Subject: Re: [PATCH] testsuite/gdb.dwarf2: Enable dw2-error.exp tests for arm targets References: <87li4y7f69.fsf@fleche.redhat.com> <87k3icsln0.fsf@fleche.redhat.com> <87k3i2ca3b.fsf@fleche.redhat.com> <87k3hx81cu.fsf@fleche.redhat.com> In-Reply-To: <87k3hx81cu.fsf@fleche.redhat.com> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: omair.javaid@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.46 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , On Tue 01 Oct 2013 08:20:01 PM PKT, Tom Tromey wrote: >>>>>> "Abid" == Abid, Hafiz writes: > >>> +if {[gdb_compile [list ${binfile}1.o ${binfile}2.o ] \ >>> + "${binfile}" executable {}] != ""} { >>> + return -1 >>> +} >>> + >>> +clean_restart ${testfile} >>> + >>> gdb_exit >>> gdb_start >>> gdb_reinitialize_dir $srcdir/$subdir > > Abid> This gdb_exit, gdb_start, gdb_reinitialize_dir sequence right after > Abid> clean_restart tells me that perhaps one of them is redundant. > > Good catch. > Given the rest of the test I think the clean_restart is not needed. > > Tom > Sorry about responding late. I have updated patch with suggested changes. gdb/testsuite/ChangeLog: 2013-12-02 Omair Javaid * gdb.dwarf2/dw2-error.exp: Re-written using dwarf assembler * gdb.dwarf2/dw2-error.S: Delete --- gdb/testsuite/gdb.dwarf2/dw2-error.S | 181 ++++----------------------------- gdb/testsuite/gdb.dwarf2/dw2-error.exp | 25 ++++- 2 files changed, 42 insertions(+), 164 deletions(-) -- diff --git a/gdb/testsuite/gdb.dwarf2/dw2-error.S b/gdb/testsuite/gdb.dwarf2/dw2-error.S index 597753e..3e8b74d 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-error.S +++ b/gdb/testsuite/gdb.dwarf2/dw2-error.S @@ -1,160 +1,21 @@ -/* Copyright (C) 2012-2013 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - - This was created using gcc -g -dA dw2-error.c, then hand-editing - it to change the DWARF version. - - */ - - .file "dw2-error.c" - .text -.Ltext0: - .globl main - .type main, @function -main: -.LFB0: - .file 1 "dw2-error.c" - # dw2-error.c:19 - .loc 1 19 0 - .cfi_startproc - # basic block 2 - pushq %rbp - .cfi_def_cfa_offset 16 - .cfi_offset 6, -16 - movq %rsp, %rbp - .cfi_def_cfa_register 6 - # dw2-error.c:20 - .loc 1 20 0 - movl $23, %eax - # dw2-error.c:21 - .loc 1 21 0 - popq %rbp - .cfi_def_cfa 7, 8 - ret - .cfi_endproc -.LFE0: - .size main, .-main -.Letext0: - .section .debug_info,"",@progbits -.Ldebug_info0: - .long 0x4e # Length of Compilation Unit Info - .value 0x99 # DWARF version number - .long .Ldebug_abbrev0 # Offset Into Abbrev. Section - .byte 0x8 # Pointer Size (in bytes) - .uleb128 0x1 # (DIE (0xb) DW_TAG_compile_unit) - .long .LASF0 # DW_AT_producer: "GNU C 4.6.3 20120306 (Red Hat 4.6.3-2) -mtune=generic -march=x86-64 -g" - .byte 0x1 # DW_AT_language - .long .LASF1 # DW_AT_name: "dw2-error.c" - .long .LASF2 # DW_AT_comp_dir: "/tmp" - .quad .Ltext0 # DW_AT_low_pc - .quad .Letext0 # DW_AT_high_pc - .long .Ldebug_line0 # DW_AT_stmt_list - .uleb128 0x2 # (DIE (0x2d) DW_TAG_subprogram) - # DW_AT_external - .long .LASF3 # DW_AT_name: "main" - .byte 0x1 # DW_AT_decl_file (dw2-error.c) - .byte 0x12 # DW_AT_decl_line - .long 0x4a # DW_AT_type - .quad .LFB0 # DW_AT_low_pc - .quad .LFE0 # DW_AT_high_pc - .uleb128 0x1 # DW_AT_frame_base - .byte 0x9c # DW_OP_call_frame_cfa - # DW_AT_GNU_all_call_sites - .uleb128 0x3 # (DIE (0x4a) DW_TAG_base_type) - .byte 0x4 # DW_AT_byte_size - .byte 0x5 # DW_AT_encoding - .ascii "int\0" # DW_AT_name - .byte 0 # end of children of DIE 0xb - .section .debug_abbrev,"",@progbits -.Ldebug_abbrev0: - .uleb128 0x1 # (abbrev code) - .uleb128 0x11 # (TAG: DW_TAG_compile_unit) - .byte 0x1 # DW_children_yes - .uleb128 0x25 # (DW_AT_producer) - .uleb128 0xe # (DW_FORM_strp) - .uleb128 0x13 # (DW_AT_language) - .uleb128 0xb # (DW_FORM_data1) - .uleb128 0x3 # (DW_AT_name) - .uleb128 0xe # (DW_FORM_strp) - .uleb128 0x1b # (DW_AT_comp_dir) - .uleb128 0xe # (DW_FORM_strp) - .uleb128 0x11 # (DW_AT_low_pc) - .uleb128 0x1 # (DW_FORM_addr) - .uleb128 0x12 # (DW_AT_high_pc) - .uleb128 0x1 # (DW_FORM_addr) - .uleb128 0x10 # (DW_AT_stmt_list) - .uleb128 0x17 # (DW_FORM_sec_offset) - .byte 0 - .byte 0 - .uleb128 0x2 # (abbrev code) - .uleb128 0x2e # (TAG: DW_TAG_subprogram) - .byte 0 # DW_children_no - .uleb128 0x3f # (DW_AT_external) - .uleb128 0x19 # (DW_FORM_flag_present) - .uleb128 0x3 # (DW_AT_name) - .uleb128 0xe # (DW_FORM_strp) - .uleb128 0x3a # (DW_AT_decl_file) - .uleb128 0xb # (DW_FORM_data1) - .uleb128 0x3b # (DW_AT_decl_line) - .uleb128 0xb # (DW_FORM_data1) - .uleb128 0x49 # (DW_AT_type) - .uleb128 0x13 # (DW_FORM_ref4) - .uleb128 0x11 # (DW_AT_low_pc) - .uleb128 0x1 # (DW_FORM_addr) - .uleb128 0x12 # (DW_AT_high_pc) - .uleb128 0x1 # (DW_FORM_addr) - .uleb128 0x40 # (DW_AT_frame_base) - .uleb128 0x18 # (DW_FORM_exprloc) - .uleb128 0x2117 # (DW_AT_GNU_all_call_sites) - .uleb128 0x19 # (DW_FORM_flag_present) - .byte 0 - .byte 0 - .uleb128 0x3 # (abbrev code) - .uleb128 0x24 # (TAG: DW_TAG_base_type) - .byte 0 # DW_children_no - .uleb128 0xb # (DW_AT_byte_size) - .uleb128 0xb # (DW_FORM_data1) - .uleb128 0x3e # (DW_AT_encoding) - .uleb128 0xb # (DW_FORM_data1) - .uleb128 0x3 # (DW_AT_name) - .uleb128 0x8 # (DW_FORM_string) - .byte 0 - .byte 0 - .byte 0 - .section .debug_aranges,"",@progbits - .long 0x2c # Length of Address Ranges Info - .value 0x2 # DWARF Version - .long .Ldebug_info0 # Offset of Compilation Unit Info - .byte 0x8 # Size of Address - .byte 0 # Size of Segment Descriptor - .value 0 # Pad to 16 byte boundary - .value 0 - .quad .Ltext0 # Address - .quad .Letext0-.Ltext0 # Length - .quad 0 - .quad 0 - .section .debug_line,"",@progbits -.Ldebug_line0: - .section .debug_str,"MS",@progbits,1 -.LASF0: - .string "GNU C 4.6.3 20120306 (Red Hat 4.6.3-2) -mtune=generic -march=x86-64 -g" -.LASF2: - .string "/tmp" -.LASF3: - .string "main" -.LASF1: - .string "dw2-error.c" - .ident "GCC: (GNU) 4.6.3 20120306 (Red Hat 4.6.3-2)" - .section .note.GNU-stack,"",@progbits + .section .debug_info +.Lcu1_begin: + .4byte .Lcu1_end - .Lcu1_start +.Lcu1_start: + .2byte 153 /* Version */ + .4byte .Labbrev1_begin /* Abbrevs */ + .byte 4 /* Pointer size */ + .uleb128 2 /* Abbrev (DW_TAG_compile_unit) */ + .sleb128 0x0002 +.Lcu1_end: + .section .debug_abbrev +.Labbrev1_begin: + .uleb128 2 /* Abbrev start */ + .uleb128 0x11 /* DW_TAG_compile_unit */ + .byte 0 /* has_children */ + .uleb128 0x13 /* DW_AT_language */ + .uleb128 0x0d /* DW_FORM_sdata */ + .byte 0x0 /* Terminator */ + .byte 0x0 /* Terminator */ + .byte 0x0 /* Terminator */ + .byte 0x0 /* Terminator */ diff --git a/gdb/testsuite/gdb.dwarf2/dw2-error.exp b/gdb/testsuite/gdb.dwarf2/dw2-error.exp index d0baeea..1fbc2a5 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-error.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-error.exp @@ -20,11 +20,28 @@ if {![dwarf2_support]} { return 0 } -standard_testfile .S +standard_testfile .c dw2-error.S -# We can't use prepare_for_testing here because we need to check the -# 'file' command's output. -if {[build_executable $testfile.exp $testfile $srcfile {nodebug}]} { +# Make some DWARF for the test. +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + + cu { version 153 } { + compile_unit {{language @DW_LANG_C}} + } +} + +if {[gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile}1.o \ + object {nodebug}] != ""} { + return -1 +} + +if {[gdb_compile $asm_file ${binfile}2.o object {nodebug}] != ""} { + return -1 +} + +if {[gdb_compile [list ${binfile}1.o ${binfile}2.o ] \ + "${binfile}" executable {}] != ""} { return -1 }