* config/tc-mips.h: Define TARGET_FORMAT if OBJ_ELF.

	* config/tc-mips.c (GPOPT): Define if OBJ_ECOFF or OBJ_ELF.
	(various): Change all references to GP references to apply if
	GPOPT, not if OBJ_ECOFF.
	(s_change_sec): Rearrange somewhat.  If OBJ_ELF, use .rodata
	instead of .rdata.  If OBJ_ELF, set section flags for .rodata and
	.sdata sections.
	(s_frame, s_loc, s_mask): Comment out entire functions, rather
	than just body.  They're not used anyhow.
	* configure.in: Set cpu_type to mips for mips*.  Accept
	mips-*-elfl* and mips-*-elf*.

3 files changed, 81 insertions, 27 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b127dea..cdca726 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,17 @@
+Fri Oct  8 14:09:35 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* config/tc-mips.h: Define TARGET_FORMAT if OBJ_ELF.
+	* config/tc-mips.c (GPOPT): Define if OBJ_ECOFF or OBJ_ELF.
+	(various): Change all references to GP references to apply if
+	GPOPT, not if OBJ_ECOFF.
+	(s_change_sec): Rearrange somewhat.  If OBJ_ELF, use .rodata
+	instead of .rdata.  If OBJ_ELF, set section flags for .rodata and
+	.sdata sections.
+	(s_frame, s_loc, s_mask): Comment out entire functions, rather
+	than just body.  They're not used anyhow.
+	* configure.in: Set cpu_type to mips for mips*.  Accept
+	mips-*-elfl* and mips-*-elf*.
+
 Thu Oct  7 18:36:29 1993  Michael Meissner  (meissner@osf.org)
 
 	* config/obj-elf.c (obj_elf_common): Allow the alignment field to
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 6ab42a1..f7b1947 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -46,6 +46,16 @@
 #define GP  28
 #define RA  31
 
+/* Decide whether to do GP reference optimizations based on the object
+   file format.  */
+#undef GPOPT
+#ifdef OBJ_ECOFF
+#define GPOPT
+#endif
+#ifdef OBJ_ELF
+#define GPOPT
+#endif
+
 /* MIPS ISA (Instruction Set Architecture) level.  */
 static int mips_isa = -1;
 
@@ -55,7 +65,7 @@ static int mips_nomove;
 static int mips_noat;
 static int mips_nobopt;
 
-#ifdef OBJ_ECOFF
+#ifdef GPOPT
 /* The size of the small data section.  */
 static int g_switch_value = 8;
 #endif
@@ -195,10 +205,12 @@ static long get_number PARAMS ((void));
 static void s_ent PARAMS ((int));
 static void s_mipsend PARAMS ((int));
 static void s_file PARAMS ((int));
+#if 0
 static void s_frame PARAMS ((int));
 static void s_loc PARAMS ((int));
 static void s_mask PARAMS ((char));
 #endif
+#endif
 
 /* Pseudo-op table.
 
@@ -361,7 +373,7 @@ md_begin ()
   /* FIXME: This should be handled in a different way.  */
   target_big_endian = byte_order == BIG_ENDIAN;
 
-#ifdef OBJ_ECOFF
+#ifdef GPOPT
   bfd_set_gp_size (stdoutput, g_switch_value);
 #endif
 
@@ -955,7 +967,7 @@ static int
 gp_reference (ep)
      expressionS *ep;
 {
-#ifdef OBJ_ECOFF
+#ifdef GPOPT
   symbolS *sym;
   const char *symname;
   const char *segname;
@@ -987,10 +999,10 @@ gp_reference (ep)
 	  || strcmp (segname, ".sbss") == 0
 	  || strcmp (segname, ".lit8") == 0
 	  || strcmp (segname, ".lit4") == 0);
-#else /* ! defined (OBJ_ECOFF) */
-  /* The GP register is only used for ECOFF.  */
+#else /* ! defined (GPOPT) */
+  /* We are not optimizing for the GP register.  */
   return 0;
-#endif /* ! defined (OBJ_ECOFF) */  
+#endif /* ! defined (GPOPT) */  
 }
 
 /* Build an instruction created by a macro expansion.  This is passed
@@ -3782,7 +3794,7 @@ md_parse_option (argP, cntP, vecP)
     }
 
 
-#ifdef OBJ_ECOFF
+#ifdef GPOPT
   if (**argP == 'G')
     {
       if ((*argP)[1] != '\0')
@@ -4087,23 +4099,16 @@ static void
 s_change_sec (sec)
      int sec;
 {
-  segT segment;
+#ifdef GPOPT
+  segT seg;
+#endif
 
   mips_emit_delays ();
-  segment = now_seg;
   switch (sec)
     {
     case 't':
       s_text (0);
       break;
-    case 'r':
-#ifdef OBJ_ECOFF
-      subseg_new (".rdata", (subsegT) get_absolute_expression ());
-      demand_empty_rest_of_line ();
-      break;
-#else
-      /* Fall through.  */
-#endif
     case 'd':
       s_data (0);
       break;
@@ -4111,17 +4116,45 @@ s_change_sec (sec)
       subseg_set (bss_section, (subsegT) get_absolute_expression ());
       demand_empty_rest_of_line ();
       break;
-    case 's':
+
+    case 'r':
 #ifdef OBJ_ECOFF
-      subseg_new (".sdata", (subsegT) get_absolute_expression ());
+      subseg_new (".rdata", (subsegT) get_absolute_expression ());
       demand_empty_rest_of_line ();
       break;
-#else
+#else /* ! defined (OBJ_ECOFF) */
+#ifdef OBJ_ELF
+      seg = subseg_new (".rodata", (subsegT) get_absolute_expression ());
+      bfd_set_section_flags (stdoutput, seg,
+			     (SEC_ALLOC
+			      | SEC_LOAD
+			      | SEC_READONLY
+			      | SEC_RELOC
+			      | SEC_DATA));
+      demand_empty_rest_of_line ();
+      break;
+#else /* ! defined (OBJ_ELF) */
+      s_data (0);
+      break;
+#endif /* ! defined (OBJ_ELF) */
+#endif /* ! defined (OBJ_ECOFF) */
+
+    case 's':
+#ifdef GPOPT
+      seg = subseg_new (".sdata", (subsegT) get_absolute_expression ());
+#ifdef OBJ_ELF
+      bfd_set_section_flags (stdoutput, seg,
+			     SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_DATA);
+#endif
+      demand_empty_rest_of_line ();
+      break;
+#else /* ! defined (GPOPT) */
       as_bad ("Global pointers not supported; recompile -G 0");
       demand_empty_rest_of_line ();
       return;
-#endif
+#endif /* ! defined (GPOPT) */
     }
+
   auto_align = 1;
 }
 
@@ -4587,11 +4620,11 @@ s_ent (aent)
 
 /* The .frame directive.  */
 
+#if 0
 static void
 s_frame (x)
      int x;
 {
-#if 0
   char str[100];
   symbolS *symP;
   int frame_reg;
@@ -4627,16 +4660,16 @@ s_frame (x)
       /* bob perhaps I should have used pseudo set */
     }
   demand_empty_rest_of_line ();
-#endif
 }
+#endif
 
 /* The .fmask and .mask directives.  */
 
+#if 0
 static void
 s_mask (reg_type)
      char reg_type;
 {
-#if 0
   char str[100], *strP;
   symbolS *symP;
   int i;
@@ -4686,16 +4719,16 @@ s_mask (reg_type)
       symP->sy_forward = proc_lastP->proc_isym;
       /* bob perhaps I should have used pseudo set */
     }
-#endif
 }
+#endif
 
 /* The .loc directive.  */
 
+#if 0
 static void
 s_loc (x)
      int x;
 {
-#if 0
   symbolS *symbolP;
   int lineno;
   int addroff;
@@ -4710,7 +4743,7 @@ s_loc (x)
   S_SET_OTHER (symbolP, 0);
   S_SET_DESC (symbolP, lineno);
   symbolP->sy_segment = now_seg;
-#endif
 }
+#endif
 
 #endif /* ! defined (OBJ_ECOFF) */
diff --git a/gas/config/tc-mips.h b/gas/config/tc-mips.h
index 1a8ffdf..dca09a8 100644
--- a/gas/config/tc-mips.h
+++ b/gas/config/tc-mips.h
@@ -68,6 +68,13 @@
 #define TARGET_FORMAT "ecoff-littlemips"
 #endif
 #endif /* OBJ_ECOFF */
+#ifdef OBJ_ELF
+#ifdef TARGET_BYTES_BIG_ENDIAN
+#define TARGET_FORMAT "elf32-bigmips"
+#else
+#define TARGET_FORMAT "elf32-littlemips"
+#endif
+#endif /* OBJ_ELF */
 #endif /* ! defined (TARGET_FORMAT) */
 
 struct mips_cl_insn {