diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-11-09 10:33:34 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-11-10 18:03:37 -0200 |
| commit | 0a557c105cad94758543e18b4834c15da2c39eb8 (patch) | |
| tree | f7bdf938b1b5987ab5f0fb463dc3557aae187f0a | |
| parent | 3e06601fedba07d837089daa5c71fe397d6c8389 (diff) | |
| download | glibc-0a557c105cad94758543e18b4834c15da2c39eb8.tar.gz glibc-0a557c105cad94758543e18b4834c15da2c39eb8.tar.xz glibc-0a557c105cad94758543e18b4834c15da2c39eb8.zip | |
Fix sh4 build with __ASSUME_ST_INO_64_BIT redefinition
Since 327792c sh4 builds fails with:
../sysdeps/unix/sysv/linux/kernel-features.h:49:0: error: "__ASSUME_ST_INO_64_BIT" redefined [-Werror]
#define __ASSUME_ST_INO_64_BIT 1
^
In file included from ../sysdeps/unix/sysv/linux/sysdep.h:19:0,
from ../sysdeps/unix/sysv/linux/sh/sysdep.h:24,
from ../sysdeps/unix/sysv/linux/sh/sh4/sysdep.h:4,
from <stdin>:1:
../sysdeps/unix/sysv/linux/sh/kernel-features.h:47:0: note: this is the location of the previous definition
#define __ASSUME_ST_INO_64_BIT 0
It is because sh4 kernel-features.sh is included multiple times
without guards and this patch fixes by adding them.
Tested on a sh4-linux-gnu build.
* sysdeps/unix/sysv/linux/sh/kernel-features.h: Add include
guards.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/kernel-features.h | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 4b93266e88..e2a8e0a23a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-11-10 Adhemerval Zanella <adhemerval.zanella@linaro.org> + * sysdeps/unix/sysv/linux/sh/kernel-features.h: Add include + guards. + * sysdeps/unix/sysv/linux/access.c: New file. * sysdeps/unix/sysv/linux/generic/access.c: Remove file. diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h index ea4fdbc8bd..d03aafac75 100644 --- a/sysdeps/unix/sysv/linux/sh/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h @@ -17,6 +17,9 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef __KERNEL_FEATURES_SH__ +# define __KERNEL_FEATURES_SH__ + /* SH uses socketcall. */ #define __ASSUME_SOCKETCALL 1 @@ -50,3 +53,5 @@ the kernel interface for p{read,write}64 adds a dummy long argument before the offset. */ #define __ASSUME_PRW_DUMMY_ARG 1 + +#endif |