diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-03-18 12:35:05 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-03-18 12:35:05 +0000 |
| commit | 636dc71c0c0c0300fbe44498b2fc903140edc010 (patch) | |
| tree | 1d2f6bdeffe4f6c25e0f4675010290bd860b8855 /ports/sysdeps/arm | |
| parent | 780a701d63b25431f31d77f0701f98bfe5ea2d94 (diff) | |
| download | eglibc2-636dc71c0c0c0300fbe44498b2fc903140edc010.tar.gz | |
Merge changes between r8107 and r8126 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@8127 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'ports/sysdeps/arm')
| -rw-r--r-- | ports/sysdeps/arm/bits/link.h | 4 | ||||
| -rw-r--r-- | ports/sysdeps/arm/eabi/bits/setjmp.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/sysdeps/arm/bits/link.h b/ports/sysdeps/arm/bits/link.h index 8dbd2c7ba..44e4edae9 100644 --- a/ports/sysdeps/arm/bits/link.h +++ b/ports/sysdeps/arm/bits/link.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Copyright (C) 2005, 2009 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 @@ -61,6 +61,6 @@ extern unsigned int la_arm_gnu_pltexit (Elf32_Sym *__sym, unsigned int __ndx, uintptr_t *__defcook, const La_arm_regs *__inregs, La_arm_retval *__outregs, - const char *symname); + const char *__symname); __END_DECLS diff --git a/ports/sysdeps/arm/eabi/bits/setjmp.h b/ports/sysdeps/arm/eabi/bits/setjmp.h index dd7679d20..16c560d61 100644 --- a/ports/sysdeps/arm/eabi/bits/setjmp.h +++ b/ports/sysdeps/arm/eabi/bits/setjmp.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2004, 2005, 2006, 2009 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 @@ -32,7 +32,7 @@ recommends that the buffer contain 64 words. The first 28 words are occupied by v1-v6, sl, fp, sp, pc, d8-d15, and fpscr. (Note that d8-15 require 17 words, due to the use of fstmx.) */ -typedef int __jmp_buf[64] __attribute__((aligned (8))); +typedef int __jmp_buf[64] __attribute__((__aligned__ (8))); #endif #endif |