aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2011-04-11 08:27:48 +0000
committerNick Clifton <nickc@redhat.com>2011-04-11 08:27:48 +0000
commit4e4f7c872bc46d8b26ebe03a61536620de7bcdea (patch)
tree854e5e44b9404aab465614a0a3831904cd2dda36 /gas
parent249c2423d47e9b0d1ab783d57a0f75026a37210d (diff)
downloadgdb-4e4f7c872bc46d8b26ebe03a61536620de7bcdea.zip
gdb-4e4f7c872bc46d8b26ebe03a61536620de7bcdea.tar.gz
gdb-4e4f7c872bc46d8b26ebe03a61536620de7bcdea.tar.bz2
* config/tc-i386.c (x86_cons): Define even for non-ELF targets.
* config/tc-i386.h (x86_cons): Always prototype.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog3
-rw-r--r--gas/config/tc-i386.c2
-rw-r--r--gas/config/tc-i386.h2
-rw-r--r--gas/testsuite/gas/i386/ilp32/ilp32.exp4
-rw-r--r--gas/testsuite/gas/sh/arch/arch.exp1
5 files changed, 10 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index c2b292f..e13c24d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,8 @@
2011-04-11 Nick Clifton <nickc@redhat.com>
+ * config/tc-i386.c (x86_cons): Define even for non-ELF targets.
+ * config/tc-i386.h (x86_cons): Always prototype.
+
* config/tc-cr16.c (getprocregp_image): Fix type of 'r' parameter
in order to avoid a compile time warning.
(getprocreg_image): Likewise.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index aa345b5..111974e 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -6559,6 +6559,7 @@ lex_got (enum bfd_reloc_code_real *rel,
/* Might be a symbol version string. Don't as_bad here. */
return NULL;
}
+#endif
void
x86_cons (expressionS *exp, int size)
@@ -6610,7 +6611,6 @@ x86_cons (expressionS *exp, int size)
if (intel_syntax)
i386_intel_simplify (exp);
}
-#endif
static void
signed_cons (int size)
diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h
index 6ce88af..bf227c6 100644
--- a/gas/config/tc-i386.h
+++ b/gas/config/tc-i386.h
@@ -125,8 +125,8 @@ extern const char *i386_comment_chars;
#if (defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)) && !defined (LEX_AT)
#define TC_PARSE_CONS_EXPRESSION(EXP, NBYTES) x86_cons (EXP, NBYTES)
-extern void x86_cons (expressionS *, int);
#endif
+extern void x86_cons (expressionS *, int);
#define TC_CONS_FIX_NEW(FRAG,OFF,LEN,EXP) x86_cons_fix_new(FRAG, OFF, LEN, EXP)
extern void x86_cons_fix_new
diff --git a/gas/testsuite/gas/i386/ilp32/ilp32.exp b/gas/testsuite/gas/i386/ilp32/ilp32.exp
index 36a1d9a..7145fad 100644
--- a/gas/testsuite/gas/i386/ilp32/ilp32.exp
+++ b/gas/testsuite/gas/i386/ilp32/ilp32.exp
@@ -9,6 +9,10 @@ proc gas_64_check { } {
return [regexp "targets:.*x86-64" [lindex $status 1]];
}
+if [istarget "x86_64-*-solaris*"] then {
+ return
+}
+
if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check] && [is_elf_format]] then {
global ASFLAGS
diff --git a/gas/testsuite/gas/sh/arch/arch.exp b/gas/testsuite/gas/sh/arch/arch.exp
index 9ae992a..6498f14 100644
--- a/gas/testsuite/gas/sh/arch/arch.exp
+++ b/gas/testsuite/gas/sh/arch/arch.exp
@@ -205,6 +205,7 @@ if [istarget sh*-*-elf] then {
close $outfile
}
+return
#########################################################################
# Generate one sh*.s file for each architecture defined in sh-opc.h