kernel,libroot,boot: remove c++11 and gnu++11 flags.
* c++14 is the default with current GCC * remove pragmas for x86intrin.h
This commit is contained in:
@@ -331,10 +331,6 @@ rule KernelArchitectureSetup architecture
|
|||||||
HAIKU_BOOT_LINKFLAGS = ;
|
HAIKU_BOOT_LINKFLAGS = ;
|
||||||
HAIKU_BOOT_LDFLAGS = -Bstatic ;
|
HAIKU_BOOT_LDFLAGS = -Bstatic ;
|
||||||
|
|
||||||
if $(gccVersion[1]) >= 4 {
|
|
||||||
HAIKU_KERNEL_C++FLAGS += -std=gnu++11 ;
|
|
||||||
}
|
|
||||||
|
|
||||||
if $(gccVersion[1]) >= 6 {
|
if $(gccVersion[1]) >= 6 {
|
||||||
HAIKU_KERNEL_C++FLAGS += -fno-delete-null-pointer-checks ;
|
HAIKU_KERNEL_C++FLAGS += -fno-delete-null-pointer-checks ;
|
||||||
HAIKU_KERNEL_CCFLAGS += -fno-delete-null-pointer-checks ;
|
HAIKU_KERNEL_CCFLAGS += -fno-delete-null-pointer-checks ;
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o :
|
|||||||
$(kernelArchSpecificSources)
|
$(kernelArchSpecificSources)
|
||||||
$(kernelLibArchSpecificSources)
|
$(kernelLibArchSpecificSources)
|
||||||
$(librootOsArchSources)
|
$(librootOsArchSources)
|
||||||
: -std=c++11 # additional flags
|
|
||||||
;
|
;
|
||||||
|
|
||||||
SEARCH on [ FGristFiles $(kernelArchSources) ]
|
SEARCH on [ FGristFiles $(kernelArchSources) ]
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
SubDir HAIKU_TOP src system libroot os arch x86_64 ;
|
SubDir HAIKU_TOP src system libroot os arch x86_64 ;
|
||||||
|
|
||||||
SubDirC++Flags -std=gnu++11 ;
|
|
||||||
|
|
||||||
local architectureObject ;
|
local architectureObject ;
|
||||||
for architectureObject in [ MultiArchSubDirSetup x86_64 ] {
|
for architectureObject in [ MultiArchSubDirSetup x86_64 ] {
|
||||||
on $(architectureObject) {
|
on $(architectureObject) {
|
||||||
|
|||||||
@@ -6,12 +6,7 @@
|
|||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
// disable a warning for GCC 5.4, fixed upstream.
|
|
||||||
// will remove the pragmas after a while.
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#pragma GCC diagnostic ignored "-Wunused-variable"
|
|
||||||
#include <x86intrin.h>
|
#include <x86intrin.h>
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
|
|
||||||
|
|
||||||
static uint64_t cv_factor;
|
static uint64_t cv_factor;
|
||||||
|
|||||||
@@ -7,10 +7,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
|
|||||||
on $(architectureObject) {
|
on $(architectureObject) {
|
||||||
local architecture = $(TARGET_PACKAGING_ARCH) ;
|
local architecture = $(TARGET_PACKAGING_ARCH) ;
|
||||||
|
|
||||||
if $(architecture) != x86_gcc2 {
|
|
||||||
SubDirC++Flags -std=gnu++11 ;
|
|
||||||
}
|
|
||||||
|
|
||||||
UsePrivateSystemHeaders ;
|
UsePrivateSystemHeaders ;
|
||||||
|
|
||||||
MergeObject <$(architecture)>posix_malloc_debug.o :
|
MergeObject <$(architecture)>posix_malloc_debug.o :
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
SubDir HAIKU_TOP src system libroot posix string arch x86_64 ;
|
SubDir HAIKU_TOP src system libroot posix string arch x86_64 ;
|
||||||
|
|
||||||
SubDirC++Flags -std=gnu++11 ;
|
|
||||||
|
|
||||||
local architectureObject ;
|
local architectureObject ;
|
||||||
for architectureObject in [ MultiArchSubDirSetup x86_64 ] {
|
for architectureObject in [ MultiArchSubDirSetup x86_64 ] {
|
||||||
on $(architectureObject) {
|
on $(architectureObject) {
|
||||||
|
|||||||
Reference in New Issue
Block a user