about summary refs log tree commit diff
path: root/sysdeps/arm
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-07-27 17:55:05 +0000
committerUlrich Drepper <drepper@redhat.com>1998-07-27 17:55:05 +0000
commit3f62b69af3f0f61299ac7bcbc7c3b35cbd16cf4a (patch)
tree325c502561495d94ab29442c1929afd08ac41686 /sysdeps/arm
parent6730873037b6afad1504bb237399c343cce18451 (diff)
downloadglibc-3f62b69af3f0f61299ac7bcbc7c3b35cbd16cf4a.tar.gz
glibc-3f62b69af3f0f61299ac7bcbc7c3b35cbd16cf4a.tar.xz
glibc-3f62b69af3f0f61299ac7bcbc7c3b35cbd16cf4a.zip
Update.
1998-07-27 17:42  Ulrich Drepper  <drepper@cygnus.com>

	* nss/nss_files/files-parse.c (INT_FIELD): Use strtoul instead of
	strtol.
	(INT_FIELD_MAYBE_NULL): Likewise.

	* posix/globtest.c: Rewrite for extended test suite.
	* posix/globtest.sh: More tests.
	Patch by Brian Wellington <bwelling@anomaly.munge.com>.

	* stdlib/strtol.c: Don't redefine LONG_MAX, LONG_MIN, and ULONG_MAX.
	Use new macro.

	* sysdeps/generic/readv.c: Correct return type.
	* sysdeps/generic/writev.c: Likewise.

1998-07-24  Gordon Matzigkeit  <gord@fig.org>

	* argp/argp-help.c (_GNU_SOURCE): Define, to suck in
	program_invocation_name when compiling outside of glibc.

1998-07-26  Philip Blundell  <philb@gnu.org>

	* sysdeps/unix/sysv/linux/arm/siglist.c: New file; ARM tools don't
	like `@' in .type directives.

	* sysdeps/libm-ieee754/e_expf.c (__ieee754_expf): Check whether
	FE_TONEAREST exists for this platform before using it.
	* sysdeps/libm-ieee754/e_exp.c (__ieee754_exp): Likewise.

	* sysdeps/arm/dl-machine.h (elf_machine_rel): Delete redundant
	debugging code.  Correct handling of PC24 relocs.

	* elf/Makefile (ld-map): Only define if versioning is in use.

	* sysdeps/arm/fpu_control.h: Move to ...
	* sysdeps/arm/fpu/fpu_control.h: ... here.
	* sysdeps/generic/fpu_control.h: Made usable as a dummy
	implementation.

	* sysdeps/unix/sysv/linux/arm/brk.c: New file.

	* sysdeps/arm/machine-gmon.h: Improved profiling for ARM.
	* sysdeps/arm/sysdep.h (CALL_MCOUNT): Replace stub with real
	implementation.
	* sysdeps/unix/sysv/linux/arm/clone.S: Likewise.
	Based on patch from Scott Bambrough and Pat Beirne.

	* shlib-versions: Add appropriate definitions for ARM machines.

	* README.template: Mention that Linux/ARM with ELF works now.

1998-07-18  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Makerules: Generate compilation rules for all object suffixes,
	not only those currently selected, for sources in the current or
	object directory.

1998-07-24  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* posix/fnmatch.c (fnmatch): Allow `/' in character class.  Don't
	match `/' in filename by a character class if requested.
	* posix/testfnm.c: Rewritten.
	* posix/testfnm.args: Removed.

1998-07-25  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* posix/annexc.c (limits_syms): Add missing symbols.
	(stdarg_syms): Move va_list to `maybe' list.
	(stdio_syms): Add FOPEN_MAX.
Diffstat (limited to 'sysdeps/arm')
-rw-r--r--sysdeps/arm/dl-machine.h36
-rw-r--r--sysdeps/arm/fpu/fpu_control.h (renamed from sysdeps/arm/fpu_control.h)0
-rw-r--r--sysdeps/arm/machine-gmon.h42
-rw-r--r--sysdeps/arm/sysdep.h8
4 files changed, 36 insertions, 50 deletions
diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
index 7612285907..912f7863fb 100644
--- a/sysdeps/arm/dl-machine.h
+++ b/sysdeps/arm/dl-machine.h
@@ -398,35 +398,6 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
 	  break;
 	case R_ARM_GLOB_DAT:
 	case R_ARM_JUMP_SLOT:
-
-#if 0
-#define _HEX(i) for (j=28; j>=0; j-=4) b[7-j/4]="0123456789abcdef"[((int)i>>j)&15];
-{
-char b[10];
-int j;
-_HEX(map->l_addr);
-__asm__ (" mov r0, #2; mov r1, %0; mov r2, #9; swi 0x00900004; "
-	: : "r"(b) : "r0", "r1", "r2" );
-_HEX(sym->st_size);
-__asm__ (" mov r0, #2; mov r1, %0; mov r2, #9; swi 0x00900004; "
-	: : "r"(b) : "r0", "r1", "r2" );
-_HEX(&sym->st_value);
-__asm__ (" mov r0, #2; mov r1, %0; mov r2, #9; swi 0x00900004; "
-	: : "r"(b) : "r0", "r1", "r2" );
-_HEX(sym->st_value);
-__asm__ (" mov r0, #2; mov r1, %0; mov r2, #9; swi 0x00900004; "
-	: : "r"(b) : "r0", "r1", "r2" );
-_HEX(sym);
-__asm__ (" mov r0, #2; mov r1, %0; mov r2, #9; swi 0x00900004; "
-	: : "r"(b) : "r0", "r1", "r2" );
-_HEX(reloc_addr);
-__asm__ (" mov r0, #2; mov r1, %0; mov r2, #9; swi 0x00900004; "
-	: : "r"(b) : "r0", "r1", "r2" );
-b[0]=' '; b[1]='\n';
-__asm__ (" mov r0, #2; mov r1, %0; mov r2, #2; swi 0x00900004; "
-	: : "r"(b) : "r0", "r1", "r2" );
-}
-#endif
 	  *reloc_addr = value;
 	  break;
 	case R_ARM_ABS32:
@@ -451,7 +422,12 @@ __asm__ (" mov r0, #2; mov r1, %0; mov r2, #2; swi 0x00900004; "
 	    break;
 	  }
 	case R_ARM_PC24:
-	  *reloc_addr += (value - (Elf32_Addr) reloc_addr);
+	  {
+	    long int disp = (value - (Elf32_Addr) reloc_addr) / 4;
+	    if ((disp >= (1<<24)) || (disp <= -(1<<24)))
+	      assert (! "address out of range for PC24 reloc");
+	    *reloc_addr += disp;
+	  }
 	  break;
 	default:
 	  assert (! "unexpected dynamic reloc type");
diff --git a/sysdeps/arm/fpu_control.h b/sysdeps/arm/fpu/fpu_control.h
index 8a2d338c49..8a2d338c49 100644
--- a/sysdeps/arm/fpu_control.h
+++ b/sysdeps/arm/fpu/fpu_control.h
diff --git a/sysdeps/arm/machine-gmon.h b/sysdeps/arm/machine-gmon.h
index 27643df884..96b4c13c72 100644
--- a/sysdeps/arm/machine-gmon.h
+++ b/sysdeps/arm/machine-gmon.h
@@ -1,5 +1,5 @@
 /* Machine-dependent definitions for profiling support.  ARM version.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 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
@@ -37,19 +37,29 @@ static void mcount_internal (u_long frompc, u_long selfpc);
 #define _MCOUNT_DECL(frompc, selfpc) \
 static void mcount_internal (u_long frompc, u_long selfpc)
 
-#define MCOUNT \
-void _mcount (void)							      \
-{									      \
-  register unsigned long int frompc, selfpc;				      \
-  __asm__("movs fp, fp; "						      \
-          "moveq %0, $0; "						      \
-	  "ldrne %0, [fp, $-4]; "					      \
-	  "ldrne %1, [fp, $-12]; "					      \
-	  "movnes %1, %1; "						      \
-	  "ldrne %1, [%1, $-4]; "					      \
-	  : "=g" (selfpc), "=g" (frompc)				      \
-	  : : "cc"							      \
-	  );								      \
-  if (selfpc)								      \
-    mcount_internal(frompc, selfpc);					      \
+/* This macro/func MUST save r0, r1 because the compiler inserts
+	blind calls to _mount(), ignoring the fact that _mcount may
+	clobber registers; therefore, _mcount may NOT clobber registers */
+/* if (this_fp!=0) {
+	r0 = this_lr
+	r1 = this_fp
+  	r1 = [r1-4] which is caller's fp
+	if (r1!=0) 
+		r1 = caller's lr
+	call mcount_internal(this_lr, caller's_lr)
+   }
+*/  
+#define MCOUNT								\
+void _mcount (void)							\
+{									\
+  __asm__("stmdb	sp!, {r0, r1, r2, r3};"				\
+	  "movs		fp, fp;"				      	\
+	  "moveq	r0, #0;"					\
+	  "ldrne	r0, [fp, $-4];"					\
+	  "ldrne	r1, [fp, $-12];"				\
+	  "movnes	r1, r1;"					\
+	  "ldrne	r1, [r1, $-4];"					\
+	  "movs		r1, r1;"					\
+	  "blne		mcount_internal;"				\
+	  "ldmia	sp!, {r0, r1, r2, r3}");			\
 }
diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index 4fc90aeed0..13d34c741b 100644
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -73,10 +73,10 @@
 
 /* If compiled for profiling, call `mcount' at the start of each function.  */
 #ifdef	PROF
-/* The mcount code relies on a normal frame pointer being on the stack
-   to locate our caller, so push one just for its benefit.  */
-#define CALL_MCOUNT \
-#error Profiling not supported.
+#define CALL_MCOUNT			\
+	str	lr,[sp, #-4]!		\
+	bl	PLTJMP(mcount)		\
+	ldr	lr, [sp], #4
 #else
 #define CALL_MCOUNT		/* Do nothing.  */
 #endif