From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18763 invoked by alias); 18 Oct 2011 20:51:59 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 18716 invoked by uid 306); 18 Oct 2011 20:51:56 -0000 Date: Tue, 18 Oct 2011 20:51:00 -0000 Message-ID: <20111018205155.18699.qmail@sourceware.org> From: tromey@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-tromey-ambiguous-linespec: Merge remote-tracking branch 'gdb/master' into duplicate-feature-2 X-Git-Refname: refs/heads/archer-tromey-ambiguous-linespec X-Git-Reftype: branch X-Git-Oldrev: 6db9ed03fb061f4ab7cbbd4bf74e6694d96dce1d X-Git-Newrev: 891ef64091337fe755cf805a9d0aa8de57b453ae X-SW-Source: 2011-q4/txt/msg00030.txt.bz2 List-Id: The branch, archer-tromey-ambiguous-linespec has been updated via 891ef64091337fe755cf805a9d0aa8de57b453ae (commit) via 12c970520ff36a85f28eae041eeae20795eb210f (commit) via f20dce2638c55d92ff9e1d602e3ea7ac69474715 (commit) via 9ea8b6a35c4cf190c0d4380603c81836be763bb5 (commit) via 043614fd2edb2fb8d2f4c659917f1007e1c0829b (commit) via 8f18e079ea82117452b44ae45f07cf77516645db (commit) via 534fddf46153fa6d80c8c6235de16a3ca94247a5 (commit) via a4d7fe8b1a5bd4bbabb724b5175044fdd24cc91e (commit) via 5f23911dced0455799f9fadcfabf86ebd73887cd (commit) via e67eea722ed74ba02691d5d308732328217d6049 (commit) from 6db9ed03fb061f4ab7cbbd4bf74e6694d96dce1d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 891ef64091337fe755cf805a9d0aa8de57b453ae Merge: 6db9ed0 12c9705 Author: Tom Tromey Date: Tue Oct 18 14:30:35 2011 -0600 Merge remote-tracking branch 'gdb/master' into duplicate-feature-2 commit 12c970520ff36a85f28eae041eeae20795eb210f Author: Tom Tromey Date: Tue Oct 18 16:55:43 2011 +0000 * gdb.base/jit-so.exp (one_jit_test): Remove spurious backslash. commit f20dce2638c55d92ff9e1d602e3ea7ac69474715 Author: Julian Brown Date: Tue Oct 18 14:41:55 2011 +0000 Jie Zhang Julian Brown gas/ * config/tc-arm.c (parse_shifter_operand): Fix handling of explicit rotation. (encode_arm_shifter_operand): Likewise. gas/testsuite/ * gas/arm/adrl.d: Adjust. * gas/arm/immed2.d: New test. * gas/arm/immed2.s: New test. ld/testsuite/ * ld-arm/cortex-a8-fix-b-plt.d: Adjust. * ld-arm/cortex-a8-fix-bcc-plt.d: Adjust. * ld-arm/cortex-a8-fix-bl-plt.d: Adjust. * ld-arm/cortex-a8-fix-bl-rel-plt.d: Adjust. * ld-arm/cortex-a8-fix-blx-plt.d: Adjust. * ld-arm/ifunc-1.dd: Adjust. * ld-arm/ifunc-2.dd: Adjust. * ld-arm/ifunc-3.dd: Adjust. * ld-arm/ifunc-4.dd: Adjust. * ld-arm/ifunc-5.dd: Adjust. * ld-arm/ifunc-6.dd: Adjust. * ld-arm/ifunc-7.dd: Adjust. * ld-arm/ifunc-8.dd: Adjust. * ld-arm/ifunc-9.dd: Adjust. * ld-arm/ifunc-10.dd: Adjust. * ld-arm/ifunc-14.dd: Adjust. * ld-arm/ifunc-15.dd: Adjust. * ld-arm/ifunc-16.dd: Adjust. opcodes/ * arm-dis.c (print_insn_arm): Explicitly specify rotation if needed. commit 9ea8b6a35c4cf190c0d4380603c81836be763bb5 Author: Tom Tromey Date: Tue Oct 18 14:13:59 2011 +0000 * gdb.base/source.exp: Don't include full file name in test name. * gdb.python/python.exp: Don't include full file name in test name. commit 043614fd2edb2fb8d2f4c659917f1007e1c0829b Author: Aleksandar Ristovski Date: Tue Oct 18 14:00:37 2011 +0000 * solib-svr4.c (read_program_header): New variables pt_phdr, pt_phdr_p, initialize them from target PT_PHDR p_vaddr, relocate sect_addr by pt_phdr if PT_PHDR was found. * gdb.base/attach-pie-noexec.c: New files. * gdb.base/attach-pie-noexec.exp: New files. commit 8f18e079ea82117452b44ae45f07cf77516645db Author: Mike Frysinger Date: Tue Oct 18 00:30:56 2011 +0000 sim: rename common/aclocal.m4 to common/acinclude.m4 Automake likes to dump macros automatically used into the aclocal.m4 file, but the common/aclocal.m4 naming prevents that. So rename it to the more normal "acinclude.m4" so the aclocal tool can work. Signed-off-by: Mike Frysinger commit 534fddf46153fa6d80c8c6235de16a3ca94247a5 Author: Mike Frysinger Date: Tue Oct 18 00:17:09 2011 +0000 sim: move from common.m4 to SIM_AC_COMMON Now that the sourceware tree generally requires autoconf-2.64, update the sim tree to require that too. This allows us to drop the long standing SIM_AC_COMMON/common.m4 workaround as autoconf 2.64+ seems to work for me. Signed-off-by: Mike Frysinger commit a4d7fe8b1a5bd4bbabb724b5175044fdd24cc91e Author: Mike Frysinger Date: Tue Oct 18 00:16:11 2011 +0000 sim: testsuite: regenerate configure Signed-off-by: Mike Frysinger commit 5f23911dced0455799f9fadcfabf86ebd73887cd Author: gdbadmin Date: Tue Oct 18 00:00:32 2011 +0000 *** empty log message *** commit e67eea722ed74ba02691d5d308732328217d6049 Author: Alan Modra Date: Mon Oct 17 23:00:06 2011 +0000 daily update ----------------------------------------------------------------------- Summary of changes: bfd/version.h | 2 +- gdb/ChangeLog | 6 + gdb/solib-svr4.c | 43 +- gdb/testsuite/ChangeLog | 15 + gdb/testsuite/gdb.base/attach-pie-noexec.c | 25 + gdb/testsuite/gdb.base/attach-pie-noexec.exp | 66 + gdb/testsuite/gdb.base/jit-so.exp | 2 +- gdb/testsuite/gdb.base/source.exp | 3 +- gdb/testsuite/gdb.python/python.exp | 6 +- gdb/version.in | 2 +- opcodes/ChangeLog | 5 + opcodes/arm-dis.c | 24 +- sim/arm/ChangeLog | 10 + sim/arm/configure | 835 ++++---- sim/arm/configure.ac | 10 +- sim/avr/ChangeLog | 10 + sim/avr/configure | 835 ++++---- sim/avr/configure.ac | 10 +- sim/bfin/ChangeLog | 11 + sim/bfin/aclocal.m4 | 12 +- sim/bfin/configure | 832 ++++---- sim/bfin/configure.ac | 10 +- sim/common/ChangeLog | 13 + sim/common/{aclocal.m4 => acinclude.m4} | 2 +- sim/common/aclocal.m4 | 953 +-------- sim/common/common.m4 | 232 -- sim/common/configure | 813 ++++---- sim/common/configure.ac | 7 +- sim/cr16/ChangeLog | 10 + sim/cr16/configure | 835 ++++---- sim/cr16/configure.ac | 10 +- sim/cris/ChangeLog | 10 + sim/cris/configure | 840 ++++---- sim/cris/configure.ac | 10 +- sim/d10v/ChangeLog | 10 + sim/d10v/configure | 835 ++++---- sim/d10v/configure.ac | 10 +- sim/erc32/ChangeLog | 10 + sim/erc32/configure | 835 ++++---- sim/erc32/configure.ac | 10 +- sim/frv/ChangeLog | 10 + sim/frv/configure | 835 ++++---- sim/frv/configure.ac | 10 +- sim/h8300/ChangeLog | 10 + sim/h8300/configure | 835 ++++---- sim/h8300/configure.ac | 10 +- sim/igen/ChangeLog | 10 + sim/igen/configure | 314 +++- sim/igen/configure.ac | 2 +- sim/iq2000/ChangeLog | 10 + sim/iq2000/configure | 835 ++++---- sim/iq2000/configure.ac | 10 +- sim/lm32/ChangeLog | 10 + sim/lm32/configure | 840 ++++---- sim/lm32/configure.ac | 10 +- sim/m32c/ChangeLog | 10 + sim/m32c/configure | 835 ++++---- sim/m32c/configure.ac | 10 +- sim/m32r/ChangeLog | 10 + sim/m32r/configure | 835 ++++---- sim/m32r/configure.ac | 10 +- sim/m68hc11/ChangeLog | 10 + sim/m68hc11/configure | 840 ++++---- sim/m68hc11/configure.ac | 10 +- sim/mcore/ChangeLog | 10 + sim/mcore/configure | 835 ++++---- sim/mcore/configure.ac | 10 +- sim/microblaze/ChangeLog | 10 + sim/microblaze/configure | 835 ++++---- sim/microblaze/configure.ac | 10 +- sim/mips/ChangeLog | 10 + sim/mips/configure | 840 ++++---- sim/mips/configure.ac | 10 +- sim/mn10300/ChangeLog | 10 + sim/mn10300/configure | 840 ++++---- sim/mn10300/configure.ac | 10 +- sim/moxie/ChangeLog | 10 + sim/moxie/configure | 1283 ++++++------ sim/moxie/configure.ac | 12 +- sim/ppc/ChangeLog | 10 + sim/ppc/configure | 328 +++- sim/ppc/configure.ac | 2 +- sim/rx/ChangeLog | 10 + sim/rx/configure | 3037 +++++++++++--------------- sim/rx/configure.ac | 14 +- sim/sh/ChangeLog | 10 + sim/sh/configure | 835 ++++---- sim/sh/configure.ac | 10 +- sim/sh64/ChangeLog | 10 + sim/sh64/configure | 833 ++++---- sim/sh64/configure.ac | 8 +- sim/testsuite/ChangeLog | 4 + sim/testsuite/configure | 1 + sim/v850/ChangeLog | 10 + sim/v850/configure | 835 ++++---- sim/v850/configure.ac | 10 +- 96 files changed, 12102 insertions(+), 13140 deletions(-) create mode 100644 gdb/testsuite/gdb.base/attach-pie-noexec.c create mode 100644 gdb/testsuite/gdb.base/attach-pie-noexec.exp copy sim/common/{aclocal.m4 => acinclude.m4} (99%) delete mode 100644 sim/common/common.m4 First 500 lines of diff: diff --git a/bfd/version.h b/bfd/version.h index 0ccf33f..adde104 100644 --- a/bfd/version.h +++ b/bfd/version.h @@ -1,4 +1,4 @@ -#define BFD_VERSION_DATE 20111017 +#define BFD_VERSION_DATE 20111018 #define BFD_VERSION @bfd_version@ #define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ #define REPORT_BUGS_TO @report_bugs_to@ diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6862c26..5c8b7d4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2011-10-18 Aleksandar Ristovski + + * solib-svr4.c (read_program_header): New variables pt_phdr, pt_phdr_p, + initialize them from target PT_PHDR p_vaddr, relocate sect_addr by + pt_phdr if PT_PHDR was found. + 2011-10-17 Joost van der Sluis * gdbtypes.h: Added TYPE_SAFE_NAME macro to get the name of a diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 2bb31a9..85bf27e 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -364,10 +364,11 @@ static gdb_byte * read_program_header (int type, int *p_sect_size, int *p_arch_size) { enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch); - CORE_ADDR at_phdr, at_phent, at_phnum; + CORE_ADDR at_phdr, at_phent, at_phnum, pt_phdr = 0; int arch_size, sect_size; CORE_ADDR sect_addr; gdb_byte *buf; + int pt_phdr_p = 0; /* Get required auxv elements from target. */ if (target_auxv_search (¤t_target, AT_PHDR, &at_phdr) <= 0) @@ -401,12 +402,23 @@ read_program_header (int type, int *p_sect_size, int *p_arch_size) /* Search for requested PHDR. */ for (i = 0; i < at_phnum; i++) { + int p_type; + if (target_read_memory (at_phdr + i * sizeof (phdr), (gdb_byte *)&phdr, sizeof (phdr))) return 0; - if (extract_unsigned_integer ((gdb_byte *)phdr.p_type, - 4, byte_order) == type) + p_type = extract_unsigned_integer ((gdb_byte *) phdr.p_type, + 4, byte_order); + + if (p_type == PT_PHDR) + { + pt_phdr_p = 1; + pt_phdr = extract_unsigned_integer ((gdb_byte *) phdr.p_vaddr, + 4, byte_order); + } + + if (p_type == type) break; } @@ -427,12 +439,23 @@ read_program_header (int type, int *p_sect_size, int *p_arch_size) /* Search for requested PHDR. */ for (i = 0; i < at_phnum; i++) { + int p_type; + if (target_read_memory (at_phdr + i * sizeof (phdr), (gdb_byte *)&phdr, sizeof (phdr))) return 0; - if (extract_unsigned_integer ((gdb_byte *)phdr.p_type, - 4, byte_order) == type) + p_type = extract_unsigned_integer ((gdb_byte *) phdr.p_type, + 4, byte_order); + + if (p_type == PT_PHDR) + { + pt_phdr_p = 1; + pt_phdr = extract_unsigned_integer ((gdb_byte *) phdr.p_vaddr, + 8, byte_order); + } + + if (p_type == type) break; } @@ -446,6 +469,16 @@ read_program_header (int type, int *p_sect_size, int *p_arch_size) 8, byte_order); } + /* PT_PHDR is optional, but we really need it + for PIE to make this work in general. */ + + if (pt_phdr_p) + { + /* at_phdr is real address in memory. pt_phdr is what pheader says it is. + Relocation offset is the difference between the two. */ + sect_addr = sect_addr + (at_phdr - pt_phdr); + } + /* Read in requested program header. */ buf = xmalloc (sect_size); if (target_read_memory (sect_addr, buf, sect_size)) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 52624e4..c4d300e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,18 @@ +2011-10-18 Tom Tromey + + * gdb.base/jit-so.exp (one_jit_test): Remove spurious backslash. + +2011-10-18 Tom Tromey + + * gdb.base/source.exp: Don't include full file name in test name. + * gdb.python/python.exp: Don't include full file name in test + name. + +2011-10-18 Jan Kratochvil + + * gdb.base/attach-pie-noexec.c: New files. + * gdb.base/attach-pie-noexec.exp: New files. + 2011-10-17 Joseph Myers * lib/gdb.exp (gdb_test_multiple): Expect newline and secondary diff --git a/gdb/testsuite/gdb.base/attach-pie-noexec.c b/gdb/testsuite/gdb.base/attach-pie-noexec.c new file mode 100644 index 0000000..7f430ab --- /dev/null +++ b/gdb/testsuite/gdb.base/attach-pie-noexec.c @@ -0,0 +1,25 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2011 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 . */ + +#include + +int +main (void) +{ + sleep (600); + return 0; +} diff --git a/gdb/testsuite/gdb.base/attach-pie-noexec.exp b/gdb/testsuite/gdb.base/attach-pie-noexec.exp new file mode 100644 index 0000000..a9da642 --- /dev/null +++ b/gdb/testsuite/gdb.base/attach-pie-noexec.exp @@ -0,0 +1,66 @@ +# Copyright (C) 2011 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 . + +# Manipulation with PID on target is not supported. +if [is_remote target] then { + return 0 +} + +set testfile attach-pie-noexec +set executable ${testfile} +set binfile ${objdir}/${subdir}/${executable} + +if { [prepare_for_testing ${testfile}.exp $executable "" [list debug "additional_flags=-fPIE -pie"]] } { + return -1 +} + +clean_restart $executable +set arch "" +set test "show architecture" +gdb_test_multiple $test $test { + -re "The target architecture is set automatically \\(currently (.*)\\)\r\n$gdb_prompt $" { + set arch $expect_out(1,string) + pass $test + } +} +if ![runto_main] { + return 0 +} +set test "sanity check info shared" +gdb_test_multiple "info shared" $test { + -re "From\[ \t\]+To\[ \t\]+Syms Read\[ \t\]+Shared Object Library\r\n0x.*\r\n$gdb_prompt $" { + pass $test + } + -re "No shared libraries loaded at this time\\.\r\n$gdb_prompt $" { + untested ${testfile}.exp + } +} +gdb_exit + +if {$arch == ""} { + untested ${testfile}.exp + return 0 +} + +set testpid [eval exec $binfile &] +exec sleep 2 + +gdb_start +file delete -- $binfile +gdb_test "attach $testpid" "Attaching to process $testpid\r\n.*: No such file or directory\\." "attach" +gdb_test "set architecture $arch" "The target architecture is assumed to be $arch" +gdb_test "info shared" "From\[ \t\]+To\[ \t\]+Syms Read\[ \t\]+Shared Object Library\r\n0x.*" + +eval exec kill -9 $testpid diff --git a/gdb/testsuite/gdb.base/jit-so.exp b/gdb/testsuite/gdb.base/jit-so.exp index c9510cb..1c71e30 100644 --- a/gdb/testsuite/gdb.base/jit-so.exp +++ b/gdb/testsuite/gdb.base/jit-so.exp @@ -117,7 +117,7 @@ proc one_jit_test {count match_str} { gdb_continue_to_breakpoint "break here 2" # All jit librares must have been unregistered gdb_test "info function jit_function" \ - "All functions matching regular expression \"jit_function\":" \ + "All functions matching regular expression \"jit_function\":" set pf_prefix $old_pf_prefix } diff --git a/gdb/testsuite/gdb.base/source.exp b/gdb/testsuite/gdb.base/source.exp index 7a67ff2..5d40eaf 100644 --- a/gdb/testsuite/gdb.base/source.exp +++ b/gdb/testsuite/gdb.base/source.exp @@ -49,7 +49,8 @@ gdb_test_multiple "source ${srcdir}/${subdir}/source-test.gdb" $test { } } -gdb_test "dir ${srcdir}/${subdir}" "Source directories searched: .*" +gdb_test "dir ${srcdir}/${subdir}" "Source directories searched: .*" \ + "set search directories" gdb_test "source -s ./source-test.gdb" \ "test source options" \ "source -s" diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp index ee39dba..ea8a4d5 100644 --- a/gdb/testsuite/gdb.python/python.exp +++ b/gdb/testsuite/gdb.python/python.exp @@ -47,7 +47,9 @@ gdb_test_multiple "python print 23" "verify python support" { # If Python is not supported, verify that sourcing a python script # causes an error. - gdb_test "source $srcdir/$subdir/source2.py" "Error in sourced command file:.*" + gdb_test "source $srcdir/$subdir/source2.py" \ + "Error in sourced command file:.*" \ + "source source2.py when python disabled" return -1 } -re "$gdb_prompt $" {} @@ -73,7 +75,7 @@ gdb_py_test_multiple "indented multi-line python command" \ "foo ()" "" \ "end" "hello, world!" -gdb_test "source $srcdir/$subdir/source2.py" "yes" +gdb_test "source $srcdir/$subdir/source2.py" "yes" "source source2.py" gdb_test "python print gdb.current_objfile()" "None" gdb_test "python print gdb.objfiles()" "\\\[\\\]" diff --git a/gdb/version.in b/gdb/version.in index 77075b6..8e39f9d 100644 --- a/gdb/version.in +++ b/gdb/version.in @@ -1 +1 @@ -7.3.50.20111017-cvs +7.3.50.20111018-cvs diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 42dcc60..e14b99f 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2011-10-18 Jie Zhang + Julian Brown + + * arm-dis.c (print_insn_arm): Explicitly specify rotation if needed. + 2011-10-10 Nick Clifton * po/es.po: Updated Spanish translation. diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c index fafa7f6..03062ad 100644 --- a/opcodes/arm-dis.c +++ b/opcodes/arm-dis.c @@ -3140,13 +3140,23 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info, long given) case 'o': if ((given & 0x02000000) != 0) { - int rotate = (given & 0xf00) >> 7; - int immed = (given & 0xff); + unsigned int rotate = (given & 0xf00) >> 7; + unsigned int immed = (given & 0xff); + unsigned int a, i; + + a = (((immed << (32 - rotate)) + | (immed >> rotate)) & 0xffffffff); + /* If there is another encoding with smaller rotate, + the rotate should be specified directly. */ + for (i = 0; i < 32; i += 2) + if ((a << i | a >> (32 - i)) <= 0xff) + break; - immed = (((immed << (32 - rotate)) - | (immed >> rotate)) & 0xffffffff); - func (stream, "#%d", immed); - value_in_comment = immed; + if (i != rotate) + func (stream, "#%d, %d", immed, rotate); + else + func (stream, "#%d", a); + value_in_comment = a; } else arm_decode_shift (given, func, stream, TRUE); diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 628f901..e2d321b 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,13 @@ +2011-10-17 Mike Frysinger + + * configure.ac: Change include to common/acinclude.m4. + +2011-10-17 Mike Frysinger + + * configure.ac: Change AC_PREREQ to 2.64. Delete AC_CONFIG_HEADER + call. Replace common.m4 include with SIM_AC_COMMON. + * configure: Regenerate. + 2011-07-01 Nick Clifton PR sim/12737 diff --git a/sim/arm/configure b/sim/arm/configure index 49b0695..e50ec89 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -624,13 +624,6 @@ CC_FOR_BUILD INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC target_os target_vendor target_cpu @@ -643,6 +636,13 @@ build_os build_vendor build_cpu build +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC WERROR_CFLAGS WARN_CFLAGS sim_xor_endian @@ -2146,9 +2146,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_headers="$ac_config_headers config.h:config.in" - - # This file contains common code used by all simulators. # # SIM_AC_COMMON invokes AC macros used by all simulators and by the common @@ -2159,9 +2156,9 @@ ac_config_headers="$ac_config_headers config.h:config.in" # The simulator's configure.in should look like: # # dnl Process this file with autoconf to produce a configure script. -# sinclude(../common/aclocal.m4) -# AC_PREREQ(2.5)dnl +# AC_PREREQ(2.64)dnl # AC_INIT(Makefile.in) +# sinclude(../common/aclocal.m4) # # SIM_AC_COMMON # @@ -2196,10 +2193,17 @@ ac_config_headers="$ac_config_headers config.h:config.in" +# _AC_CHECK_DECL_BODY +# ------------------- +# Shell function body for AC_CHECK_DECL. +# _AC_CHECK_DECL_BODY - - - +# _AC_CHECK_DECLS(SYMBOL, ACTION-IF_FOUND, ACTION-IF-NOT-FOUND, +# INCLUDES) +# ------------------------------------------------------------- +# Helper to AC_CHECK_DECLS, which generates the check for a single +# SYMBOL with INCLUDES, performs the AC_DEFINE, then expands +# ACTION-IF-FOUND or ACTION-IF-NOT-FOUND. @@ -2416,171 +2420,6 @@ sim_inline="-DDEFAULT_INLINE=0" -# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around -# it by inlining the macro's contents. -# This file contains common code used by all simulators. -# -# common.m4 invokes AC macros used by all simulators and by the common -# directory. It is intended to be included before any target specific -# stuff. SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate -# the Makefile. It is intended to be invoked last. -# -# The simulator's configure.in should look like: -# -# dnl Process this file with autoconf to produce a configure script. -# AC_PREREQ(2.5)dnl -# AC_INIT(Makefile.in) -# AC_CONFIG_HEADER(config.h:config.in) -# -# sinclude(../common/aclocal.m4) -# sinclude(../common/common.m4) -# -# ... target specific stuff ... - -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done -done -if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi hooks/post-receive -- Repository for Project Archer.