about summary refs log tree commit diff
path: root/csu
diff options
context:
space:
mode:
Diffstat (limited to 'csu')
-rw-r--r--csu/Makefile4
-rw-r--r--csu/abi-note.S6
2 files changed, 7 insertions, 3 deletions
diff --git a/csu/Makefile b/csu/Makefile
index 9664821ec4..5888d1098e 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -81,6 +81,10 @@ $(objpfx)defs.h: $(objpfx)initfini.s
 
 endif
 
+ifeq (yes,$(elf))
+extra-objs += abi-note.o
+endif
+
 include ../Rules
 
 define link-relocatable
diff --git a/csu/abi-note.S b/csu/abi-note.S
index baa409de4d..d2051e5b3b 100644
--- a/csu/abi-note.S
+++ b/csu/abi-note.S
@@ -32,18 +32,18 @@
 
 #define ELF_NOTE_BEGIN(sectname, sectflags, type, name)			      \
 	.section sectname, sectflags;					      \
-	.align ALIGNARG(2);	/* Notes are 4-byte aligned.  */	      \
+	.align 4;		/* Notes are 4-byte aligned.  */	      \
 	.long 1f - 0f;		/* 32-bit word: length of name field */	      \
 	.long 3f - 2f;		/* 32-bit word: length of desc field */	      \
 	.long (type);		/* 32-bit word: vendor-defined type field */  \
 0:	.asciz name;		/* null-terminated string, any length: name */\
-1:	.align ALIGNARG(2);	/* Name data padded to 4-byte alignment.  */  \
+1:	.align 4;		/* Name data padded to 4-byte alignment.  */  \
 2:	/* Here follows the "note descriptor" data, whose format	      \
 	   is not specified by ELF.  The vendor name and type field	      \
 	   indicate what sort of data is found here.  */
 
 #define ELF_NOTE_END							      \
-3:	.align ALIGNARG(2)	/* Pad to 4-byte align the next note.  */
+3:	.align 4		/* Pad to 4-byte align the next note.  */
 
 
 /* The linker (GNU ld 2.8 and later) recognize an allocated section whose