On 24/11/15 14:27, Jakub Jelinek wrote:
On Tue, Nov 24, 2015 at 12:23:05PM +0100, Christophe Lyon wrote:
On 24 November 2015 at 12:12, Jakub Jelinek <ja...@redhat.com> wrote:
On Tue, Nov 24, 2015 at 12:08:13PM +0100, Christophe Lyon wrote:
Sure.
I had a build in progress with your proposed patch, but it didn't
complete before you committed :-)
So... it still does not work for me. I re-tried several times, made sure I had
everything cleanup before starting new builds from scratch, hence the delay.
I'm still seeing:
/tmp/2050111_1.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc:326:44:
error: 'ARM_VFPREGS_SIZE' was not declared in this scope
unsigned struct_user_vfpregs_struct_sz = ARM_VFPREGS_SIZE;
So cut'n'paste the sanitizer_platform_limits_posix.cc compilation command
line and replace -c with -E -dD, then look if the wrapper asm/ptrace.h is
included or not and why?
It pulls the one from the sysroot:
sysroot-arm-none-linux-gnueabihf/usr/include/asm/ptrace.h
(I configure GCC --with-sysroot=XXX)
Then you should figure out where the sysroot include dirs are added in the
sanitizer_common/Makefile and make sure -isystem $(top_srcdir)/include/system
comes before that.
Jakub
It seems that I placed new header into wrong directory, it should be
libsanitizer/include/system/asm/ptrace.h
instead of
libsanitizer/include/system/linux/asm/ptrace.h
This should work:
$ cat .libs/sanitizer_platform_limits_posix.i
.....
# 1
"/home/max/workspace/downloads/gcc/libsanitizer/include/system/asm/ptrace.h"
1 3 4
# 1
"/home/max/install/armv7l-tizen/armv7l-tizen-linux-gnueabi/sys-root/usr/include/asm/ptrace.h"
1 3 4
# 11
"/home/max/install/armv7l-tizen/armv7l-tizen-linux-gnueabi/sys-root/usr/include/asm/ptrace.h"
3 4
#define __ASM_ARM_PTRACE_H~
# 1
"/home/max/install/armv7l-tizen/armv7l-tizen-linux-gnueabi/sys-root/usr/include/asm/hwcap.h"
1 3 4
#define __ASMARM_HWCAP_H~
.....
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index c392c57..895d3bd 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,5 +1,10 @@
2015-11-24 Maxim Ostapenko <m.ostape...@partner.samsung.com>
+ * include/system/linux/asm/ptrace.h: Move to ...
+ * include/system/asm/ptrace.h: ... this.
+
+2015-11-24 Maxim Ostapenko <m.ostape...@partner.samsung.com>
+
* include/system/linux/asm/ptrace.h: New header.
2015-11-23 Maxim Ostapenko <m.ostape...@partner.samsung.com>
diff --git a/libsanitizer/include/system/asm/ptrace.h b/libsanitizer/include/system/asm/ptrace.h
new file mode 100644
index 0000000..5d2fe9b
--- /dev/null
+++ b/libsanitizer/include/system/asm/ptrace.h
@@ -0,0 +1,7 @@
+#include_next <asm/ptrace.h>
+/* ARM_VFPREGS_SIZE has been added in 3.0 */
+#if defined(__arm__) && !defined(ARM_VFPREGS_SIZE)
+/* The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS
+ and core dumps. */
+#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )
+#endif
diff --git a/libsanitizer/include/system/linux/asm/ptrace.h b/libsanitizer/include/system/linux/asm/ptrace.h
deleted file mode 100644
index d4249fe..0000000
--- a/libsanitizer/include/system/linux/asm/ptrace.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include_next <linux/asm/ptrace.h>
-/* ARM_VFPREGS_SIZE has been added in 3.0 */
-#if defined(__arm__) && !defined(ARM_VFPREGS_SIZE)
-/* The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS
- and core dumps. */
-#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )
-#endif
