Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GCC 5 build.

Browse Source 
* Add -fgnu89-inline flag for libroot/posix/glibc
* Change __GNUC__ == 4 to __GNUC__ >= 4

Signed-off-by: Adrien Destugues <pulkomandy@pulkomandy.tk>

Fixes #11990, most of the changes had already been done.
This commit is contained in:
Murai Takashi 2015-04-19 17:56:19 +09:00 committed by Adrien Destugues
parent ed3c7f8fc2
commit 949cf6ac85
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/private/media/ServerInterface.h
View File

@ -190,7 +190,7 @@ struct reply_data {
struct command_data {
// yes, it's empty ;)
#if __GNUC__ == 4
#if __GNUC__ >= 4
int32 _padding;
// GCC 2 and GCC 4 treat empty structures differently
#endif

4
src/kits/interface/Rect.cpp
View File

@ -332,7 +332,7 @@ OffsetToCopy__5BRectff(BRect* self, float dx, float dy)
}
#elif __GNUC__ == 4
#elif __GNUC__ >= 4
// TODO: remove this when new GCC 4 packages have to be built anyway
@ -390,4 +390,4 @@ _ZN5BRect12OffsetToCopyEff(BRect* self, float dx, float dy)
}
#endif // __GNUC__ == 4
#endif // __GNUC__ >= 4

2
src/system/runtime_loader/elf_load_image.cpp
View File

@ -552,7 +552,7 @@ load_image(char const* name, image_type type, const char* rpath,
#if __GNUC__ == 2
if ((image->abi & B_HAIKU_ABI_MAJOR) == B_HAIKU_ABI_GCC_4)
sSearchPathSubDir = "x86";
#elif __GNUC__ == 4
#elif __GNUC__ >= 4
if ((image->abi & B_HAIKU_ABI_MAJOR) == B_HAIKU_ABI_GCC_2)
sSearchPathSubDir = "x86_gcc2";
#endif