alpha.h (ASM_OUTPUT_ALIGN): Move to config/alpha/elf.h

	* config/alpha/alpha.h (ASM_OUTPUT_ALIGN): Move to config/alpha/elf.h
	(ASM_OUTPUT_SKIP): Move to config/alpha/vms.h
	(ASM_OUTPUT_LOCAL): Ditto.
	(ASM_OUTPUT_COMMON): Remove.
	* config/alpha/elf.h (ASM_OUTPUT_DEF_FROM_DECLS): Use ASM_OUTPUT_DEF.
	* config/alpha/vms.h (ASM_OUTPUT_ALIGN): Do not undefine before define.

From-SVN: r185700

4 files changed, 36 insertions, 41 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a3e966fa5ea..3dde73b6935 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,11 +1,20 @@
+2012-03-22  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/alpha/alpha.h (ASM_OUTPUT_ALIGN): Move to config/alpha/elf.h
+	(ASM_OUTPUT_SKIP): Move to config/alpha/vms.h
+	(ASM_OUTPUT_LOCAL): Ditto.
+	(ASM_OUTPUT_COMMON): Remove.
+	* config/alpha/elf.h (ASM_OUTPUT_DEF_FROM_DECLS): Use ASM_OUTPUT_DEF.
+	* config/alpha/vms.h (ASM_OUTPUT_ALIGN): Do not undefine before define.
+
 2012-03-22  Jan Hubicka  <jh@suse.cz>
 
 	PR middle-end/51737
 	* cgraph.c (cgraph_remove_node_and_inline_clones): Add FORBIDDEN_NODE
 	parameter.
 	* cgraph.h (cgraph_remove_node_and_inline_clones): Update prototype.
-	* ipa-inline-transform.c (save_inline_function_body): Remove copied clone
-	if needed.
+	* ipa-inline-transform.c (save_inline_function_body): Remove
+	copied clone if needed.
 	* tree-inline.c (delete_unreachable_blocks_update_callgraph): Update.
 
 2012-03-22  Richard Guenther  <rguenther@suse.de>
@@ -33,9 +42,8 @@
 	(prune_clobbered_mems): New function.
 	(compute_antic_aux): Use it to prune ANTIC_OUT.
 	(compute_partial_antic_aux): Use it to prune PA_IN.
-	(compute_avail): Only insert expressions into EXP_GEN that
-	are not invalidated when translated up to the beginning of
-	the block.
+	(compute_avail): Only insert expressions into EXP_GEN that are not
+	invalidated when translated up to the beginning of the block.
 
 2012-03-22  Richard Guenther  <rguenther@suse.de>
 
diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h
index dc7f22233dc..194e9a257e5 100644
--- a/gcc/config/alpha/alpha.h
+++ b/gcc/config/alpha/alpha.h
@@ -1036,36 +1036,6 @@ do {						\
 
 #define ASM_OUTPUT_ADDR_DIFF_ELT(FILE, BODY, VALUE, REL) \
   fprintf (FILE, "\t.gprel32 $L%d\n", (VALUE))
-
-/* This is how to output an assembler line
-   that says to advance the location counter
-   to a multiple of 2**LOG bytes.  */
-
-#define ASM_OUTPUT_ALIGN(FILE,LOG)	\
-  if ((LOG) != 0)			\
-    fprintf (FILE, "\t.align %d\n", LOG);
-
-/* This is how to advance the location counter by SIZE bytes.  */
-
-#undef ASM_OUTPUT_SKIP
-#define ASM_OUTPUT_SKIP(FILE,SIZE)  \
-  fprintf (FILE, "\t.space "HOST_WIDE_INT_PRINT_UNSIGNED"\n", (SIZE))
-
-/* This says how to output an assembler line
-   to define a global common symbol.  */
-
-#define ASM_OUTPUT_COMMON(FILE, NAME, SIZE, ROUNDED)  \
-( fputs ("\t.comm ", (FILE)),			\
-  assemble_name ((FILE), (NAME)),		\
-  fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED"\n", (SIZE)))
-
-/* This says how to output an assembler line
-   to define a local common symbol.  */
-
-#define ASM_OUTPUT_LOCAL(FILE, NAME, SIZE,ROUNDED)	\
-( fputs ("\t.lcomm ", (FILE)),				\
-  assemble_name ((FILE), (NAME)),			\
-  fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED"\n", (SIZE)))
 
 
 /* Print operand X (an rtx) in assembler syntax to file FILE.
diff --git a/gcc/config/alpha/elf.h b/gcc/config/alpha/elf.h
index 29fdeabbb42..70be527f79a 100644
--- a/gcc/config/alpha/elf.h
+++ b/gcc/config/alpha/elf.h
@@ -27,9 +27,17 @@ along with GCC; see the file COPYING3.  If not see
 
 /* Do not output a .file directive at the beginning of the input file.  */
  
-#undef TARGET_ASM_FILE_START_FILE_DIRECTIVE
+#undef  TARGET_ASM_FILE_START_FILE_DIRECTIVE
 #define TARGET_ASM_FILE_START_FILE_DIRECTIVE false
 
+/* This is how to output an assembler line
+   that says to advance the location counter
+   to a multiple of 2**LOG bytes.  */
+
+#define ASM_OUTPUT_ALIGN(FILE,LOG)		\
+  if ((LOG) != 0)				\
+    fprintf (FILE, "\t.align %d\n", LOG);
+
 /* This says how to output assembler code to declare an
    uninitialized internal linkage data object.  Under SVR4,
    the linker seems to want the alignment of data objects
@@ -105,10 +113,7 @@ do {									\
 	assemble_name (FILE, name);				\
 	fputs ("..ng\n", FILE);					\
       }								\
-    assemble_name(FILE, alias);					\
-    fputs(" = ", FILE);						\
-    assemble_name(FILE, name);					\
-    fputc('\n', FILE);						\
+    ASM_OUTPUT_DEF (FILE, alias, name);				\
   } while (0)
 
 /* Provide a STARTFILE_SPEC appropriate for ELF.  Here we add the
diff --git a/gcc/config/alpha/vms.h b/gcc/config/alpha/vms.h
index 7b4dd30fafd..b1d46b5e979 100644
--- a/gcc/config/alpha/vms.h
+++ b/gcc/config/alpha/vms.h
@@ -217,10 +217,22 @@ typedef struct {int num_args; enum avms_arg_type atypes[6];} avms_arg_info;
    that says to advance the location counter
    to a multiple of 2**LOG bytes.  */
 
-#undef ASM_OUTPUT_ALIGN
 #define ASM_OUTPUT_ALIGN(FILE,LOG)	\
     fprintf (FILE, "\t.align %d\n", LOG);
 
+/* This is how to advance the location counter by SIZE bytes.  */
+
+#define ASM_OUTPUT_SKIP(FILE,SIZE)  \
+  fprintf (FILE, "\t.space "HOST_WIDE_INT_PRINT_UNSIGNED"\n", (SIZE))
+
+/* This says how to output an assembler line
+   to define a global common symbol.  */
+
+#define ASM_OUTPUT_LOCAL(FILE, NAME, SIZE,ROUNDED)	\
+( fputs ("\t.lcomm ", (FILE)),				\
+  assemble_name ((FILE), (NAME)),			\
+  fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED"\n", (SIZE)))
+
 /* Switch into a generic section.  */
 #define TARGET_ASM_NAMED_SECTION vms_asm_named_section