From 6e8d9661c3b5fd6b2fe935c07353a3c949abf778 Mon Sep 17 00:00:00 2001 From: l4check Date: Thu, 19 Sep 2013 13:54:58 +0000 Subject: [PATCH] update git-svn-id: http://svn.tudos.org/repos/oc/tudos/trunk@59 d050ee49-bd90-4346-b210-929a50b99cfc --- .../fiasco/src/kern/arm/sys_call_page-arm.cpp | 8 +++---- .../src/valgrind-3.6.0-svn/Makefile.am | 2 +- .../valgrind-3.6.0-svn/coregrind/Makefile.am | 24 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kernel/fiasco/src/kern/arm/sys_call_page-arm.cpp b/kernel/fiasco/src/kern/arm/sys_call_page-arm.cpp index 1d1d71513..8a92b4ef3 100644 --- a/kernel/fiasco/src/kern/arm/sys_call_page-arm.cpp +++ b/kernel/fiasco/src/kern/arm/sys_call_page-arm.cpp @@ -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 } //---------------------------------------------------------------------------- diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/Makefile.am b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/Makefile.am index 7f98e9d79..749a81dbe 100644 --- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/Makefile.am +++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/Makefile.am @@ -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 diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/Makefile.am b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/Makefile.am index 4ae5b1883..1313472ee 100644 --- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/Makefile.am +++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/coregrind/Makefile.am @@ -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 -- 2.39.2