ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Norman Feske 2013-09-19 12:35:42 +02:00
parent 9a7ed1de21
commit c45cd8ad6e
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
base-fiasco/patches/c++11.patch Normal file
View File

@ -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"\
)