about summary refs log tree commit diff
path: root/csu
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-05-07 15:31:21 +0000
committerUlrich Drepper <drepper@redhat.com>1997-05-07 15:31:21 +0000
commit51702635af8445431054291c86aaace7c30b0970 (patch)
treee9cc4d28c401bd6046f71f62d186865d37c0141f /csu
parent1f07e6177553845817af5f7c90f148edd2e59d32 (diff)
downloadglibc-51702635af8445431054291c86aaace7c30b0970.tar.gz
glibc-51702635af8445431054291c86aaace7c30b0970.tar.xz
glibc-51702635af8445431054291c86aaace7c30b0970.zip
	* locale/categories.def: Change type of _NL_CTYPE_CLASS_NAMES and
	_NL_CTYPE_MAP_NAMES field to stringlist.
	Change name of _NL_CTYPE_CODESET_NAME to "charmap".
	* locale/localeinfo.h (enum value_type): Add stringlist.
	* locale/programs/locale.c (show_info): Handle stringlist.

	* locale/programs/charmap.c (charmap_read): If charmap file is not
	using the given name try to find it by looking through all available
	charmap files and compare the code set name.
	* locale/programs/locale.c (write_charmaps): Also print names of
	charset in <code_set_name> fields in the files.

	* elf/ldd.bash.in: Correct translatable strings.

	* posix/TESTS: Add some more tests for character class matching.
	* posix/regex.c: Merge with GNU awk version.
	(regex_compile): Use ISO C/amend 1 functions for character class
	handling.
	* posix/regex.h: Merge with GNU awk version.

	* posix/getopt.c: Declare as master copies.
	* posix/getopt1.c: Likewise.
	* posix/getopt.h: Likewise.

	* sysdeps/unix/sysv/linux/sys/mount.h: Add definitions for option
	value to mount functions.
	Patch by a sun <asun@zoology.washington.edu>.

	* stdio-common/bug4.c (main): Use /tmp/bug4.test for concurrency
	with other tests.
	* sunrpc/svc_run.c (svc_exit): New, defined.
	(svc_run): Test for svc_stop variable.
	* sysdeps/m68k/s_cexp.c: Rewritten.
	* sysdeps/m68k/s_cexpf.c: Likewise.
	* sysdeps/m68k/s_cexpl.c: Likewise.
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