From fe58a6517dcfc9e0466fb71954f999a268d71060 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri, 3 Aug 2012 11:35:12 +0200
Subject: [PATCH] m68k: remove ASM_{TYPE,SIZE}_DIRECTIVE and ALIGNARG

---
 ports/ChangeLog.m68k            |  9 +++++++++
 ports/sysdeps/m68k/asm-syntax.h | 11 +----------
 ports/sysdeps/m68k/sysdep.h     | 16 ++++------------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 2e180a7f4b..e91f34b56b 100644
--- a/ports/ChangeLog.m68k
+++ b/ports/ChangeLog.m68k
@@ -1,3 +1,12 @@
+2012-08-03  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/m68k/sysdep.h (ALIGNARG, ASM_TYPE_DIRECTIVE)
+	(ASM_SIZE_DIRECTIVE): Remove.
+	(ENTRY, END): Use .p2align.  Use .type and .size instead of
+	ASM_TYPE_DIRECTIVE and ASM_SIZE_DIRECTIVE.
+	* sysdeps/m68k/asm-syntax.h (ALIGNARG, PROLOG, EPILOG, ALIGN)
+	(GLOBL): Remove unused macros.
+
 2012-08-01  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/m68k/kernel-features.h
diff --git a/ports/sysdeps/m68k/asm-syntax.h b/ports/sysdeps/m68k/asm-syntax.h
index 53f5259b0e..f011ff2de8 100644
--- a/ports/sysdeps/m68k/asm-syntax.h
+++ b/ports/sysdeps/m68k/asm-syntax.h
@@ -1,5 +1,5 @@
 /* Definitions for 68k syntax variations.
-   Copyright (C) 1992, 1994, 1996, 1997, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1992-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.  Its master source is NOT part of
    the C library, however.  The master source lives in the GNU MP Library.
 
@@ -17,11 +17,6 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
-/* ELF uses byte-counts for .align, most others use log2 of count of bytes.  */
-#define ALIGNARG(log2) 1<<log2
-/* For ELF we need the `.type' directive to make shared libs work right.  */
-#define PROLOG(name) .type name,@function
-#define EPILOG(name) .size name,.-name
 /* For ELF we need to prefix register names and local labels.  */
 #define R_(r) %##r
 #define R(r) R_(r)
@@ -35,8 +30,6 @@
 #define MEM_PREDEC(memory_base)R(memory_base)@-
 #define MEM_POSTINC(memory_base)R(memory_base)@+
 #define TEXT .text
-#define ALIGN .even
-#define GLOBL .globl
 /* Use variable sized opcodes.  */
 #define bcc jcc
 #define bcs jcs
@@ -56,8 +49,6 @@
 #define MEM_INDX1_(base,idx,size_suffix,scale)(R(base),R(idx##.##size_suffix*scale))
 #define MEM_INDX1(base,idx,size_suffix,scale)MEM_INDX1_(base,idx,size_suffix,scale)
 #define TEXT .text
-#define ALIGN .align ALIGNARG(2)
-#define GLOBL .globl
 #define bcc jbcc
 #define bcs jbcs
 #define bls jbls
diff --git a/ports/sysdeps/m68k/sysdep.h b/ports/sysdeps/m68k/sysdep.h
index 980cae5b84..a621830dbb 100644
--- a/ports/sysdeps/m68k/sysdep.h
+++ b/ports/sysdeps/m68k/sysdep.h
@@ -1,5 +1,5 @@
 /* Assembler macros for m68k.
-   Copyright (C) 1998, 2003, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1998-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -20,14 +20,6 @@
 
 #ifdef __ASSEMBLER__
 
-/* Syntactic details of assembler.  */
-
-/* ELF uses byte-counts for .align, most others use log2 of count of bytes.  */
-# define ALIGNARG(log2) 1<<log2
-/* For ELF we need the `.type' directive to make shared libs work right.  */
-# define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg
-# define ASM_SIZE_DIRECTIVE(name) .size name,.-name
-
 /* Define an entry point visible from C.
 
    There is currently a bug in gdb which prevents us from specifying
@@ -35,8 +27,8 @@
    the current source file.  */
 # define ENTRY(name)							      \
   .globl C_SYMBOL_NAME(name);						      \
-  ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),@function);			      \
-  .align ALIGNARG(2);							      \
+  .type C_SYMBOL_NAME(name),@function;					      \
+  .p2align 2;								      \
   C_LABEL(name)								      \
   cfi_startproc;							      \
   CALL_MCOUNT
@@ -44,7 +36,7 @@
 # undef END
 # define END(name)							      \
   cfi_endproc;								      \
-  ASM_SIZE_DIRECTIVE(name)
+  .size name,.-name
 
 
 /* If compiled for profiling, call `_mcount' at the start of each function.  */