From 668c5ebc0937ab5288d831d65de3057e56e2763f Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Sat, 9 Apr 2016 21:23:40 +0100 Subject: [PATCH] MIPS/GAS: Disallow `.option picX' with VxWorks PIC gas/ * config/tc-mips.c (s_option): Reject `.option picX' if VxWorks PIC. * testsuite/gas/mips/option-pic-vxworks-1.l: New list test. * testsuite/gas/mips/option-pic-vxworks-2.l: New list test. * testsuite/gas/mips/option-pic-vxworks-1.s: New test source. * testsuite/gas/mips/option-pic-vxworks-2.s: New test source. * testsuite/gas/mips/mips.exp: Run the new tests. --- gas/ChangeLog | 10 ++++++++++ gas/config/tc-mips.c | 8 +++++--- gas/testsuite/gas/mips/mips.exp | 10 ++++++++++ gas/testsuite/gas/mips/option-pic-vxworks-1.l | 3 +++ gas/testsuite/gas/mips/option-pic-vxworks-1.s | 2 ++ gas/testsuite/gas/mips/option-pic-vxworks-2.l | 3 +++ gas/testsuite/gas/mips/option-pic-vxworks-2.s | 2 ++ 7 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 gas/testsuite/gas/mips/option-pic-vxworks-1.l create mode 100644 gas/testsuite/gas/mips/option-pic-vxworks-1.s create mode 100644 gas/testsuite/gas/mips/option-pic-vxworks-2.l create mode 100644 gas/testsuite/gas/mips/option-pic-vxworks-2.s diff --git a/gas/ChangeLog b/gas/ChangeLog index ee54c5ce5c..da02325fd5 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,13 @@ +2016-04-09 Maciej W. Rozycki + + * config/tc-mips.c (s_option): Reject `.option picX' if VxWorks + PIC. + * testsuite/gas/mips/option-pic-vxworks-1.l: New list test. + * testsuite/gas/mips/option-pic-vxworks-2.l: New list test. + * testsuite/gas/mips/option-pic-vxworks-1.s: New test source. + * testsuite/gas/mips/option-pic-vxworks-2.s: New test source. + * testsuite/gas/mips/mips.exp: Run the new tests. + 2016-04-09 Maciej W. Rozycki * config/tc-mips.c (can_swap_branch_p): Correct call formatting. diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index dff78ac293..701744476f 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -15477,15 +15477,17 @@ s_option (int x ATTRIBUTE_UNUSED) int i; i = atoi (opt + 3); - if (i == 0) + if (i != 0 && i != 2) + as_bad (_(".option pic%d not supported"), i); + else if (mips_pic == VXWORKS_PIC) + as_bad (_(".option pic%d not supported in VxWorks PIC mode"), i); + else if (i == 0) mips_pic = NO_PIC; else if (i == 2) { mips_pic = SVR4_PIC; mips_abicalls = TRUE; } - else - as_bad (_(".option pic%d not supported"), i); if (mips_pic == SVR4_PIC) { diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp index d30b3b5595..02f76cc09c 100644 --- a/gas/testsuite/gas/mips/mips.exp +++ b/gas/testsuite/gas/mips/mips.exp @@ -513,6 +513,11 @@ if { [istarget mips*-*-vxworks*] } { run_dump_test "vxworks1-xgot" run_dump_test "vxworks1-el" run_dump_test "vxworks1-xgot-el" + + run_list_test "option-pic-vxworks-1" "-mvxworks-pic" \ + "MIPS invalid PIC option in VxWorks PIC" + run_list_test "option-pic-vxworks-2" "-mvxworks-pic" \ + "MIPS invalid switch to SVR4 PIC from VxWorks PIC" } elseif { [istarget mips*-*-*] } { set addr32 [expr [istarget mipstx39*-*-*] || [istarget mips-*-linux*] || [istarget mipsel-*-linux*] \ || [istarget mipsisa32-*-linux*] || [istarget mipsisa32el-*-linux*]] @@ -1469,6 +1474,11 @@ if { [istarget mips*-*-vxworks*] } { run_dump_test "li-d" + run_list_test "option-pic-vxworks-1" "-mvxworks-pic" \ + "MIPS invalid PIC option in VxWorks PIC" + run_list_test "option-pic-vxworks-2" "-mvxworks-pic" \ + "MIPS invalid switch to SVR4 PIC from VxWorks PIC" + run_dump_test_arches "r6" [mips_arch_list_matching mips32r6] if $has_newabi { run_dump_test_arches "r6-n32" [mips_arch_list_matching mips64r6] diff --git a/gas/testsuite/gas/mips/option-pic-vxworks-1.l b/gas/testsuite/gas/mips/option-pic-vxworks-1.l new file mode 100644 index 0000000000..c88f7c0b69 --- /dev/null +++ b/gas/testsuite/gas/mips/option-pic-vxworks-1.l @@ -0,0 +1,3 @@ +.*: Assembler messages: +.*:1: Error: \.option pic1 not supported +.*:2: Error: \.option pic3 not supported diff --git a/gas/testsuite/gas/mips/option-pic-vxworks-1.s b/gas/testsuite/gas/mips/option-pic-vxworks-1.s new file mode 100644 index 0000000000..62530cc303 --- /dev/null +++ b/gas/testsuite/gas/mips/option-pic-vxworks-1.s @@ -0,0 +1,2 @@ + .option pic1 + .option pic3 diff --git a/gas/testsuite/gas/mips/option-pic-vxworks-2.l b/gas/testsuite/gas/mips/option-pic-vxworks-2.l new file mode 100644 index 0000000000..8c18b1b7d0 --- /dev/null +++ b/gas/testsuite/gas/mips/option-pic-vxworks-2.l @@ -0,0 +1,3 @@ +.*: Assembler messages: +.*:1: Error: \.option pic0 not supported in VxWorks PIC mode +.*:2: Error: \.option pic2 not supported in VxWorks PIC mode diff --git a/gas/testsuite/gas/mips/option-pic-vxworks-2.s b/gas/testsuite/gas/mips/option-pic-vxworks-2.s new file mode 100644 index 0000000000..96b85c8da3 --- /dev/null +++ b/gas/testsuite/gas/mips/option-pic-vxworks-2.s @@ -0,0 +1,2 @@ + .option pic0 + .option pic2 -- 2.34.1