diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-05-19 12:16:11 +0300 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2017-05-25 19:33:02 +0300 |
| commit | 15b59a15b42c4918c9e0b7bb4a3cbfd46d9b539e (patch) | |
| tree | b1dd938dcb676c5b337462c0494961e06263dc84 /newlib/libc/sys/rtems | |
| parent | 9b1167219a11311dd5a3db4b6802feea2f2ee765 (diff) | |
Add generic <machine/_align.h> for RTEMS
It uses __BIGGEST_ALIGNMENT__ which is available in recent GCC and
LLVM/clang.
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
Diffstat (limited to 'newlib/libc/sys/rtems')
| -rw-r--r-- | newlib/libc/sys/rtems/include/machine/_align.h | 38 | ||||
| -rw-r--r-- | newlib/libc/sys/rtems/include/machine/param.h | 15 |
2 files changed, 42 insertions, 11 deletions
diff --git a/newlib/libc/sys/rtems/include/machine/_align.h b/newlib/libc/sys/rtems/include/machine/_align.h new file mode 100644 index 000000000..f141c7820 --- /dev/null +++ b/newlib/libc/sys/rtems/include/machine/_align.h @@ -0,0 +1,38 @@ +/*- + * Copyright (c) 2017 embedded brains GmbH + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _MACHINE__ALIGN_H_ +#define _MACHINE__ALIGN_H_ + +#ifdef __BIGGEST_ALIGNMENT__ +#define _ALIGNBYTES (__BIGGEST_ALIGNMENT__ - 1UL) +#else +#define _ALIGNBYTES (sizeof(long long) - 1UL) +#endif + +#define _ALIGN(_p) (((unsigned long)(_p) + _ALIGNBYTES) & ~_ALIGNBYTES) + +#endif /* !_MACHINE__ALIGN_H_ */ diff --git a/newlib/libc/sys/rtems/include/machine/param.h b/newlib/libc/sys/rtems/include/machine/param.h index 74891f504..622194bbb 100644 --- a/newlib/libc/sys/rtems/include/machine/param.h +++ b/newlib/libc/sys/rtems/include/machine/param.h @@ -14,17 +14,10 @@ #define MID_MACHINE MID_I386 */ -/* - * Round p (pointer or byte index) up to a correctly-aligned value - * for all data types (int, long, ...). The result is unsigned int - * and must be cast to any desired pointer type. - */ -#if defined(__sparc__) -#define ALIGNBYTES (sizeof(double) - 1) -#else -#define ALIGNBYTES (sizeof(int) - 1) -#endif -#define ALIGN(p) (((unsigned)(p) + ALIGNBYTES) & ~ALIGNBYTES) +#include <machine/_align.h> + +#define ALIGNBYTES _ALIGNBYTES +#define ALIGN(p) _ALIGN(p) #define PAGE_SHIFT 12 /* LOG2(PAGE_SIZE) */ #define PAGE_SIZE (1<<PAGE_SHIFT) /* bytes/page */ |