From c45cd8ad6eafd0737d6ae593dd371d12f8b062d8 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Thu, 19 Sep 2013 12:35:42 +0200 Subject: [PATCH] base-fiasco: Fix bug revealed by C++11 in contrib sources The macro 'enter_kdebug' appended the 'text' argument immediately after the '"' literal. Apparently, the old C++ standard accepted this code but the new standard is more strict. --- base-fiasco/patches/c++11.patch | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 base-fiasco/patches/c++11.patch diff --git a/base-fiasco/patches/c++11.patch b/base-fiasco/patches/c++11.patch new file mode 100644 index 000000000..d24e128dd --- /dev/null +++ b/base-fiasco/patches/c++11.patch @@ -0,0 +1,30 @@ +diff -ur contrib.bak/fiasco/snapshot/l4/pkg/l4sys/include/ARCH-x86/kdebug.h contrib/fiasco/snapshot/l4/pkg/l4sys/include/ARCH-x86/kdebug.h +--- fiasco/snapshot/l4/pkg/l4sys/include/ARCH-x86/kdebug.h 2008-07-30 13:19:01.000000000 +0200 ++++ fiasco/snapshot/l4/pkg/l4sys/include/ARCH-x86/kdebug.h 2013-09-23 09:02:29.875532260 +0200 +@@ -21,7 +21,7 @@ + asm(\ + "int $3 \n\t"\ + "jmp 1f \n\t"\ +- ".ascii \""text "\"\n\t"\ ++ ".ascii \"" text "\"\n\t"\ + "1: \n\t"\ + ) + +@@ -35,7 +35,7 @@ + #define asm_enter_kdebug(text) \ + "int $3 \n\t"\ + "jmp 1f \n\t"\ +- ".ascii \""text "\"\n\t"\ ++ ".ascii \"" text "\"\n\t"\ + "1: \n\t" + + /** +@@ -50,7 +50,7 @@ + "int $3 \n\t"\ + "nop \n\t"\ + "jmp 1f \n\t"\ +- ".ascii \""text "\"\n\t"\ ++ ".ascii \"" text "\"\n\t"\ + "1: \n\t"\ + ) +