diff options
| author | Chris Metcalf <cmetcalf@ezchip.com> | 2014-12-26 16:22:28 -0500 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@ezchip.com> | 2014-12-26 16:22:28 -0500 |
| commit | 5d24aa6056c7e70dc96948c6c6c84ed4a523ec65 (patch) | |
| tree | b7b87aab14297917a25e47978c0cac913de4248d | |
| parent | 7c1395a7e4d3d994a986ef2bc5457ba3f4aaec22 (diff) | |
| download | glibc-5d24aa6056c7e70dc96948c6c6c84ed4a523ec65.tar.gz glibc-5d24aa6056c7e70dc96948c6c6c84ed4a523ec65.tar.xz glibc-5d24aa6056c7e70dc96948c6c6c84ed4a523ec65.zip | |
tilegx: fix sysdep.h to avoid a redefinition warning
The symbol for HAVE_CLOCK_GETTIME_VSYSCALL was being only conditionally defined under [SHARED]. However, it turns out this causes a preprocessor symbol redefinition warning when building clock_gettime.o. Move the symbol definition down to make it unconditional, like other platforms do.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/tile/sysdep.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 3b01ed88d4..1dc4798eb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-12-26 Chris Metcalf <cmetcalf@ezchip.com> + * sysdeps/unix/sysv/linux/tile/sysdep.h + (HAVE_CLOCK_GETTIME_VSYSCALL): Move definition out of + assembly-specific section to avoid a redefinition warning. + * sysdeps/tile/jmpbuf-unwind.h (_JMPBUF_CFA_UNWINDS_ADJ): Cast to long before casting to pointer to avoid a cast warning. diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h index d3b98bd359..143a0c4cb6 100644 --- a/sysdeps/unix/sysv/linux/tile/sysdep.h +++ b/sysdeps/unix/sysv/linux/tile/sysdep.h @@ -252,9 +252,6 @@ v_ret; \ }) -/* List of system calls which are supported as vsyscalls. */ -# define HAVE_CLOCK_GETTIME_VSYSCALL 1 - # else # define INLINE_VSYSCALL(name, nr, args...) \ INLINE_SYSCALL (name, nr, ##args) @@ -263,6 +260,9 @@ # endif #endif /* not __ASSEMBLER__ */ +/* List of system calls which are supported as vsyscalls. */ +#define HAVE_CLOCK_GETTIME_VSYSCALL 1 + /* Pointer mangling support. */ #if IS_IN (rtld) /* We cannot use the thread descriptor because in ld.so we use setjmp |