diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 859ddc6..eec725b 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -3466,7 +3466,13 @@ md_begin (void)
 	as_bad (_("-G may not be used in position-independent code"));
       g_switch_value = 0;
     }
-
+  else if (mips_abicalls)
+    {
+      if (g_switch_seen && g_switch_value != 0)
+	as_bad (_("-G may not be used with abicalls"));
+      g_switch_value = 0;
+    }
+ 
   if (! bfd_set_arch_mach (stdoutput, bfd_arch_mips, file_mips_opts.arch))
     as_warn (_("could not set architecture and machine"));
 
@@ -14318,6 +14324,8 @@ md_parse_option (int c, char *arg)
     case OPTION_CALL_SHARED:
       mips_pic = SVR4_PIC;
       mips_abicalls = TRUE;
+      if (!g_switch_seen)
+	g_switch_value = 0;
       break;
 
     case OPTION_CALL_NONPIC:
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 6645e83..c0a65f1 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -741,6 +741,7 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test_arches "rol64-hw"	[mips_arch_list_matching gpr64 ror]
 
     run_dump_test "sb"
+    run_dump_test_arches "sdata-gp"	[mips_arch_list_matching mips3]
     run_dump_test "trunc"
     run_dump_test "ulh"
     run_dump_test_arches "ulh2-eb"	[mips_arch_list_matching mips1 !mips32r6]
diff --git a/gas/testsuite/gas/mips/sdata-gp.d b/gas/testsuite/gas/mips/sdata-gp.d
new file mode 100644
index 0000000..114d6cd
--- /dev/null
+++ b/gas/testsuite/gas/mips/sdata-gp.d
@@ -0,0 +1,11 @@
+#as: -call_nonpic
+#objdump: -D --section=.text --prefix-addresses
+#name: .sdata and abicalls
+
+.*:.*
+
+
+Disassembly of section .text:
+0+0000 <[^>]*> lui	v0,0x0
+0+0004 <[^>]*> lw	v0,0\(v0\)
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/sdata-gp.s b/gas/testsuite/gas/mips/sdata-gp.s
new file mode 100755
index 0000000..fa6fc08
--- /dev/null
+++ b/gas/testsuite/gas/mips/sdata-gp.s
@@ -0,0 +1,7 @@
+	.sdata
+c0101:	.word	0xabcd
+
+	.text
+	.align	4
+test:
+        lw      $2, c0101