-/* N_SHARED_LIB gets this reasonable default as of 1999-07-12, but we
- have to work with 2.9.1. Note that N_SHARED_LIB is used in a
- SUN-specific context, not applicable to CRIS. */
-#define N_SHARED_LIB(x) 0
-
-/* The definition here seems not used; just provided as a convention. */
-#define DEFAULT_ARCH bfd_arch_cris
-
-/* ??? Spacing might be essential for the parameters in this macro.
- Do Not Change. */
-#define MY(OP) CAT (cris_aout_,OP)
-#define NAME(x,y) CAT3(cris_aout,_32_,y)
+/* Do not "beautify" the CONCAT* macro args. Traditional C will not
+ remove whitespace added here, and thus will fail to concatenate
+ the tokens. */
+#define MY(OP) CONCAT2 (cris_aout_,OP)
+#define NAME(x, y) CONCAT3 (cris_aout,_32_,y)