i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

runtime_loader: correctly detect gcc7 abi as gcc4 abi compatible.

Browse Source 
Change-Id: I0e3df832e2fcc0b687344f54d5b0a639f5add370
Reviewed-on: https://review.haiku-os.org/649
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Jérôme Duval
2018-11-01 15:25:33 +00:00
committed by waddlesplash
parent fb00a65fc6
commit c30513840a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/runtime_loader/elf_haiku_version.cpp
+6 -4
View File
@@ -117,6 +117,8 @@ analyze_object_gcc_version(int fd, image_t* image, elf_ehdr& eheader,
// GCC: (GNU) 2.95.3-haiku-080322 // GCC: (GNU) 2.95.3-haiku-080322
// GCC: (GNU) 4.1.2 // GCC: (GNU) 4.1.2
// GCC: (2016_02_29) 5.3.0 // GCC: (2016_02_29) 5.3.0
// GCC: (2018_05_01) 7.3.0
// GCC: (GNU) 7.3.0
// FIXME this does not handle binaries generated with clang or other // FIXME this does not handle binaries generated with clang or other
// compilers. // compilers.
@@ -191,10 +193,10 @@ analyze_object_gcc_version(int fd, image_t* image, elf_ehdr& eheader,
else else
image->abi = B_HAIKU_ABI_GCC_2_BEOS; image->abi = B_HAIKU_ABI_GCC_2_BEOS;
} else { } else {
if (gccMajor == 5) { if (gccMajor >= 5) {
// The ABI changes in GCC 5 are optional, and currently we are using // The ABI changes in libstdc++ 5+ are optional, and currently we
// it in backwards compatible mode. So, it is still generating ABI // are using it in backwards compatible mode. So, it is still
// version 4. // generating ABI version 4.
gccMajor = 4; gccMajor = 4;
} }
image->abi = gccMajor << 16; image->abi = gccMajor << 16;