* configure.in: Add specific case for cris-*-linux-gnu* with

em=linux.
	* configure: Regenerate.
	* config/tc-cris.c (DEFAULT_CRIS_AXIS_LINUX_GNU): New macro, TRUE
	if TE_LINUX defined, else FALSE.
	(bfd_boolean demand_register_prefix): Set default from
	DEFAULT_CRIS_AXIS_LINUX_GNU.
	(symbols_have_leading_underscore): Similar.
	* config/tc-cris.h (LOCAL_LABELS_DOLLAR): Define to 1.

gas/ChangeLog

@@ -1,3 +1,15 @@
+2003-06-16  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure.in: Add specific case for cris-*-linux-gnu* with
+	em=linux.
+	* configure: Regenerate.
+	* config/tc-cris.c (DEFAULT_CRIS_AXIS_LINUX_GNU): New macro, TRUE
+	if TE_LINUX defined, else FALSE.
+	(bfd_boolean demand_register_prefix): Set default from
+	DEFAULT_CRIS_AXIS_LINUX_GNU.
+	(symbols_have_leading_underscore): Similar.
+	* config/tc-cris.h (LOCAL_LABELS_DOLLAR): Define to 1.
+
 2003-06-13  Richard Earnshaw  <rearnsha@arm.com>
 
 	* tc-arm.c (FPU_DEFAULT, case TE_LINUX): Default to FPU_ARCH_FPA.

gas/config/tc-cris.c

@@ -157,11 +157,21 @@ static char *cris_insn_first_word_frag PARAMS ((void));
 /* Handle to the opcode hash table.  */
 static struct hash_control *op_hash = NULL;
 
+/* If we target cris-axis-linux-gnu (as opposed to generic cris-axis-elf),
+   we default to no underscore and required register-prefixes.  The
+   difference is in the default values.  */
+#ifdef TE_LINUX
+#define DEFAULT_CRIS_AXIS_LINUX_GNU TRUE
+#else
+#define DEFAULT_CRIS_AXIS_LINUX_GNU FALSE
+#endif
+
 /* Whether we demand that registers have a `$' prefix.  Default here.  */
-static bfd_boolean demand_register_prefix = FALSE;
+static bfd_boolean demand_register_prefix = DEFAULT_CRIS_AXIS_LINUX_GNU;
 
 /* Whether global user symbols have a leading underscore.  Default here.  */
-static bfd_boolean symbols_have_leading_underscore = TRUE;
+static bfd_boolean symbols_have_leading_underscore
+  = !DEFAULT_CRIS_AXIS_LINUX_GNU;
 
 /* Whether or not we allow PIC, and expand to PIC-friendly constructs.  */
 static bfd_boolean pic = FALSE;

gas/config/tc-cris.h

@@ -158,6 +158,9 @@ extern void tc_cris_check_adjusted_broken_word PARAMS ((offsetT,
    of two bytes long.  */
 #define DWARF2_LINE_MIN_INSN_LENGTH 2
 
+/* Make port immune to unwanted difference in te-generic.h vs. te-linux.h.  */
+#define LOCAL_LABELS_DOLLAR 1
+
 #endif /* TC_CRIS */
 /*
  * Local variables:

gas/configure.in

@@ -208,6 +208,7 @@ changequote([,])dnl
 
       avr-*-*)				fmt=elf ;;
 
+      cris-*-linux-gnu*)		fmt=multi bfd_gas=yes em=linux ;;
       cris-*-*)				fmt=multi bfd_gas=yes ;;
 
       d10v-*-*)				fmt=elf ;;