Update.

2001-02-27  Philip Blundell  <pb@futuretv.com>

	* elf/elf.h: Add new ARM definitions from latest (B-01)
	specification.  Correct naming of EF_ARM_ALIGN8 et al.

2001-03-04  Ulrich Drepper  <drepper@redhat.com>

	* stdio-common/tst-printf.sh: Remove bashisms.
	Patch by Matthew Clarke <Matthew_Clarke@mindlink.bc.ca>.

	* shlib-versions: Add entry for libanl.

4 files changed, 35 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 80e81fd05a..b13de3d828 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,17 @@
+2001-02-27  Philip Blundell  <pb@futuretv.com>
+
+	* elf/elf.h: Add new ARM definitions from latest (B-01)
+	specification.  Correct naming of EF_ARM_ALIGN8 et al.
+
+2001-03-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdio-common/tst-printf.sh: Remove bashisms.
+	Patch by Matthew Clarke <Matthew_Clarke@mindlink.bc.ca>.
+
 2001-03-03  Ulrich Drepper  <drepper@redhat.com>
 
 	* Versions.def: Add libanl definition.
-	* shlig-versions: Add entry for libanl.
+	* shlib-versions: Add entry for libanl.
 	* resolv/Makefile (distribute): Add gai_misc.h and ga_test.c.
 	(routines): Add gai_sigqueue.
 	(extra-libs): Add libanl.
diff --git a/NEWS b/NEWS
index 34f43c18f9..7a1a2343b4 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Please send GNU C library bug reports using the `glibcbug' script to
 
 Version 2.2.3
 
-* Intel's IA-64 math library is large integrated.  It provides fast and
+* Intel's IA-64 math library is largely integrated.  It provides fast and
   accurate implementatations for most basic and standard math functions
   in float, double, and long double format.
 
diff --git a/elf/elf.h b/elf/elf.h
index b7c3fb7977..504681b3fb 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -1772,9 +1772,21 @@ typedef Elf32_Addr Elf32_Conflict;
 #define EF_ARM_APCS_26     0x08
 #define EF_ARM_APCS_FLOAT  0x10
 #define EF_ARM_PIC         0x20
-#define EF_ALIGN8          0x40		/* 8-bit structure alignment is in use */
-#define EF_NEW_ABI         0x80
-#define EF_OLD_ABI         0x100
+#define EF_ARM_ALIGN8      0x40		/* 8-bit structure alignment is in use */
+#define EF_ARM_NEW_ABI     0x80
+#define EF_ARM_OLD_ABI     0x100
+
+/* Other constants defined in the ARM ELF spec. version B-01.  */
+/* NB. These conflict with values defined above.  */
+#define EF_ARM_SYMSARESORTED	0x04
+#define EF_ARM_DYNSYMSUSESEGIDX 0x08
+#define EF_ARM_MAPSYMSFIRST	0x10
+#define EF_ARM_EABIMASK		0XFF000000
+
+#define EF_ARM_EABI_VERSION(flags) ((flags) & EF_ARM_EABIMASK)
+#define EF_ARM_EABI_UNKNOWN  0x00000000
+#define EF_ARM_EABI_VER1     0x01000000
+#define EF_ARM_EABI_VER2     0x02000000
 
 /* Additional symbol types for Thumb */
 #define STT_ARM_TFUNC      0xd
@@ -1814,6 +1826,12 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_ARM_GOTPC		25	/* 32 bit PC relative offset to GOT */
 #define R_ARM_GOT32		26	/* 32 bit GOT entry */
 #define R_ARM_PLT32		27	/* 32 bit PLT address */
+#define R_ARM_ALU_PCREL_7_0	32
+#define R_ARM_ALU_PCREL_15_8	33
+#define R_ARM_ALU_PCREL_23_15	34
+#define R_ARM_LDR_SBREL_11_0	35
+#define R_ARM_ALU_SBREL_19_12	36
+#define R_ARM_ALU_SBREL_27_20	37
 #define R_ARM_GNU_VTENTRY	100
 #define R_ARM_GNU_VTINHERIT	101
 #define R_ARM_THM_PC11		102	/* thumb unconditional branch */
diff --git a/stdio-common/tst-printf.sh b/stdio-common/tst-printf.sh
index 0c5d784d68..8d971fa652 100644
--- a/stdio-common/tst-printf.sh
+++ b/stdio-common/tst-printf.sh
@@ -138,7 +138,7 @@ printf ("%hhu", 257) = 1
 printf ("%hu", 65537) = 1
 --- Should be no further output. ---
 EOF
-cmp - ${common_objpfx}stdio-common/tst-printf.out >& /dev/null ||
+cmp - ${common_objpfx}stdio-common/tst-printf.out > /dev/null 2>&1 ||
 cat <<'EOF' |
 %.4x:	`0012'
 %04x:	`0012'
@@ -249,7 +249,7 @@ printf ("%hhu", 257) = 1
 printf ("%hu", 65537) = 1
 --- Should be no further output. ---
 EOF
-cmp - ${common_objpfx}stdio-common/tst-printf.out >& /dev/null ||
+cmp - ${common_objpfx}stdio-common/tst-printf.out > /dev/null 2>&1 ||
 {
   status=1
   echo "*** output comparison failed"