diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-27 09:08:20 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-27 09:08:20 +0000 |
| commit | 131f3644ef87d5406722ee42b0989cb5783156fa (patch) | |
| tree | 6f9c3016cb1696987ba7b0cc8c1b8c5400c6157d /libffi/testsuite | |
| parent | 851ccf1afd9b0e045e7dda2539a3dfa30c16bb64 (diff) | |
| download | gcc-131f3644ef87d5406722ee42b0989cb5783156fa.tar.gz | |
2015-05-27 Basile Starynkevitch <basile@starynkevitch.net>
{{merged with almost GCC 5. i.e. trunk r222129 from 2015-04-15,
using svn merge -r219880:222129
svn+ssh://bstarynk@gcc.gnu.org/svn/gcc/trunk }}
[gcc/]
2015-05-27 Basile Starynkevitch <basile@starynkevitch.net>
{{merged with GCC 5, so}}
* melt-runtime.h (melt_fatal_error, melt_fatal_error_at_line):
Pass UNKNOWN_LOCATION for GCC 5. Re-indented with command:
astyle --style=gnu -s2
* melt-runtime.cc: Re-indented with command:
astyle --style=gnu -s2
(melt_branch_process_arguments, melt_ggcstart_callback)
(melt_reserved_allocation_failure): Use melt_fatal_error instead
of fatal_error.
* melt/generated/meltrunsup-inc.cc: Manually edited for fatal_error.
* melt/generated/warmelt-first.cc: Ditto.
* melt/warmelt-first.melt (melt_assert_failure_fun): Ditto.
* melt/warmelt-modes.melt (generate_runtypesupport_scanning):
Ditto, in the emitted code.
* Makefile.in: mention s-gtype instead of gt-melt-runtime.h in
dependencies.
(TEXI_GCCINT_FILES): Add meltgendoc.texi.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@223739 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi/testsuite')
| -rw-r--r-- | libffi/testsuite/lib/libffi.exp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp index 86ee76639b3..29b9510a35e 100644 --- a/libffi/testsuite/lib/libffi.exp +++ b/libffi/testsuite/lib/libffi.exp @@ -23,6 +23,7 @@ proc load_gcc_lib { filename } { load_lib dg.exp load_lib libgloss.exp +load_gcc_lib target-supports.exp load_gcc_lib target-libpath.exp load_gcc_lib wrapper.exp @@ -219,10 +220,6 @@ proc libffi_target_compile { source dest type options } { lappend options "libs= -lpthread" } - if { [string match "*.cc" $source] } { - lappend options "c++" - } - verbose "options: $options" return [target_compile $source $dest $type $options] } @@ -241,7 +238,7 @@ proc libffi_feature_test { test } { set lines [libffi_target_compile $src "" "preprocess" ""] file delete $src - set last [lindex $lines end] + set last [lindex [split $lines] end] return [regexp -- "xyzzy" $last] } @@ -312,7 +309,8 @@ proc run-many-tests { testcases extra_flags } { set targetabis { "" } if [string match $compiler_vendor "gnu"] { - if [istarget "i?86-*-*"] { + if { ([istarget "i?86-*-*"] || [istarget "x86_64-*-*"]) + && [is-effective-target ia32] && ![istarget "*-*-darwin*"] } { set targetabis { "" "-DABI_NUM=FFI_STDCALL -DABI_ATTR=__STDCALL__" |