]> rtime.felk.cvut.cz Git - l4.git/commitdiff
update
authorl4check <l4check@d050ee49-bd90-4346-b210-929a50b99cfc>
Thu, 19 Sep 2013 13:54:58 +0000 (13:54 +0000)
committerl4check <l4check@d050ee49-bd90-4346-b210-929a50b99cfc>
Thu, 19 Sep 2013 13:54:58 +0000 (13:54 +0000)
git-svn-id: http://svn.tudos.org/repos/oc/tudos/trunk@59 d050ee49-bd90-4346-b210-929a50b99cfc

kernel/fiasco/src/kern/arm/sys_call_page-arm.cpp
l4/pkg/valgrind/src/valgrind-3.6.0-svn/Makefile.am
l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/Makefile.am

index 1d1d71513f52836d8ef4b8714cd65eef0bca8669..8a92b4ef350f91d100da39b9ec53f6a29ca9b7a3 100644 (file)
@@ -40,13 +40,13 @@ Sys_call_page::set_utcb_get_code(Unsigned32 *sys_calls)
   sys_calls[offset++] = 0xe3a02010; // mov     r2, #0x10 -> set tls opcode
   sys_calls[offset++] = 0xe5842000; // str     r2, [r4]
   sys_calls[offset++] = 0xe3a03000; // mov     r3, #0
-  sys_calls[offset++] = 0xe30f2803; // movw    r2, #0xf803
-  sys_calls[offset++] = 0xe3a00002; // mov     r0, #2
-  sys_calls[offset++] = 0xe34f2fff; // movt    r2, #0xffff
-  sys_calls[offset++] = 0xe34f0ff4; // movt    r0, #0xfff4
+  sys_calls[offset++] = 0xe3e020fc; // mvn     r2, #252
+  sys_calls[offset++] = 0xe3c22c07; // bic     r2, r2, #1792
+  sys_calls[offset++] = 0xe59f0008; // ldr     r0, [pc, #8]
   sys_calls[offset++] = 0xe1a0e00f; // mov     lr, pc
   sys_calls[offset++] = 0xe3e0f00b; // mvn     pc, #11
   sys_calls[offset++] = 0xe8bd8010; // pop     {r4, pc}
+  sys_calls[offset++] = 0xfff40002; // .word   0xfff40002
 }
 
 //----------------------------------------------------------------------------
index 7f98e9d799815be65aadb3913b1d71a072379ea1..749a81dbe93f2a8b0fcd0bb127ecd53fc22b874d 100644 (file)
@@ -80,7 +80,7 @@ GENERATED_SUPP_FILES = @GENERATED_SUPP@
 # default.supp, as it is built from the base .supp files at compile-time.
 dist_noinst_DATA = $(SUPP_FILES)
 
-pkglib_DATA = default.supp
+pkgdata_DATA = default.supp
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = valgrind.pc
index 4ae5b188370f748469f383b60d1300aac944fbb5..1313472eea75401ebe71b6069045b7c4826e9ef6 100644 (file)
@@ -515,10 +515,10 @@ endif
 #----------------------------------------------------------------------------
 # gdbserver xml target descriptions
 #----------------------------------------------------------------------------
-pkglib_DATA =
+pkgdata_DATA =
 
 if VGCONF_ARCHS_INCLUDE_ARM
-pkglib_DATA +=         m_gdbserver/arm-core-valgrind-s1.xml \
+pkgdata_DATA +=        m_gdbserver/arm-core-valgrind-s1.xml \
                m_gdbserver/arm-core-valgrind-s2.xml \
                m_gdbserver/arm-core.xml \
                m_gdbserver/arm-vfpv3-valgrind-s1.xml \
@@ -529,25 +529,25 @@ pkglib_DATA +=    m_gdbserver/arm-core-valgrind-s1.xml \
 endif
 
 if VGCONF_ARCHS_INCLUDE_X86
-pkglib_DATA +=         m_gdbserver/32bit-core-valgrind-s1.xml \
+pkgdata_DATA +=        m_gdbserver/32bit-core-valgrind-s1.xml \
                m_gdbserver/32bit-core-valgrind-s2.xml \
                m_gdbserver/32bit-core.xml \
                m_gdbserver/32bit-sse-valgrind-s1.xml \
                m_gdbserver/32bit-sse-valgrind-s2.xml \
                m_gdbserver/32bit-sse.xml
 if VGCONF_OS_IS_LINUX
-pkglib_DATA += m_gdbserver/32bit-linux-valgrind-s1.xml \
+pkgdata_DATA +=        m_gdbserver/32bit-linux-valgrind-s1.xml \
                m_gdbserver/32bit-linux-valgrind-s2.xml \
                m_gdbserver/32bit-linux.xml \
                m_gdbserver/i386-linux-valgrind.xml
 endif
 if VGCONF_OS_IS_DARWIN
-pkglib_DATA += m_gdbserver/i386-coresse-valgrind.xml
+pkgdata_DATA +=        m_gdbserver/i386-coresse-valgrind.xml
 endif
 endif
 
 if VGCONF_ARCHS_INCLUDE_AMD64
-pkglib_DATA += m_gdbserver/64bit-core-valgrind-s1.xml \
+pkgdata_DATA +=        m_gdbserver/64bit-core-valgrind-s1.xml \
                m_gdbserver/64bit-core-valgrind-s2.xml \
                m_gdbserver/64bit-core.xml \
                m_gdbserver/64bit-sse-valgrind-s1.xml \
@@ -555,18 +555,18 @@ pkglib_DATA +=    m_gdbserver/64bit-core-valgrind-s1.xml \
                m_gdbserver/64bit-sse.xml
 
 if VGCONF_OS_IS_LINUX
-pkglib_DATA += m_gdbserver/64bit-linux-valgrind-s1.xml \
+pkgdata_DATA +=        m_gdbserver/64bit-linux-valgrind-s1.xml \
                m_gdbserver/64bit-linux-valgrind-s2.xml \
                m_gdbserver/64bit-linux.xml \
                m_gdbserver/amd64-linux-valgrind.xml
 endif
 if VGCONF_OS_IS_DARWIN
-pkglib_DATA += m_gdbserver/amd64-coresse-valgrind.xml
+pkgdata_DATA +=        m_gdbserver/amd64-coresse-valgrind.xml
 endif
 endif
 
 if VGCONF_ARCHS_INCLUDE_PPC32
-pkglib_DATA += m_gdbserver/power-altivec-valgrind-s1.xml \
+pkgdata_DATA +=        m_gdbserver/power-altivec-valgrind-s1.xml \
                m_gdbserver/power-altivec-valgrind-s2.xml \
                m_gdbserver/power-altivec.xml \
                m_gdbserver/power-core.xml \
@@ -581,7 +581,7 @@ pkglib_DATA +=      m_gdbserver/power-altivec-valgrind-s1.xml \
 endif
 
 if VGCONF_ARCHS_INCLUDE_PPC64
-pkglib_DATA += m_gdbserver/power64-core-valgrind-s1.xml \
+pkgdata_DATA +=        m_gdbserver/power64-core-valgrind-s1.xml \
                m_gdbserver/power64-core-valgrind-s2.xml \
                m_gdbserver/power64-core.xml \
                m_gdbserver/power64-linux-valgrind-s1.xml \
@@ -590,7 +590,7 @@ pkglib_DATA +=      m_gdbserver/power64-core-valgrind-s1.xml \
                m_gdbserver/powerpc-altivec64l-valgrind.xml \
                m_gdbserver/powerpc-altivec64l.xml
 if ! VGCONF_ARCHS_INCLUDE_PPC32
-pkglib_DATA += m_gdbserver/power-altivec-valgrind-s1.xml \
+pkgdata_DATA +=        m_gdbserver/power-altivec-valgrind-s1.xml \
                m_gdbserver/power-altivec-valgrind-s2.xml \
                m_gdbserver/power-altivec.xml \
                m_gdbserver/power-fpu-valgrind-s1.xml \
@@ -606,7 +606,7 @@ endif
 
 all-local: inplace-noinst_PROGRAMS inplace-noinst_DSYMS
        mkdir -p $(inplacedir); \
-       for f in $(pkglib_DATA); do \
+       for f in $(pkgdata_DATA); do \
          rm -f $(inplacedir)/$$f; \
          ln -f -s ../$(subdir)/$$f $(inplacedir); \
        done