diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-10-04 17:46:32 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-04 17:47:22 +0200 |
| commit | 4a42f84a70f38ee848b01baeaa6da5219dfe9b53 (patch) | |
| tree | d11131b0ec6926ae60cfc45aa57799a06b133478 /solenv | |
| parent | 4bcf34ae5a524d4c35407bd087aef52c4592011c (diff) | |
Clean up HAVE_THREADSAFE_STATICS
Change-Id: I042269aabaa2e9952c5d2f41cf93e55d654f6313
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 4 | ||||
| -rw-r--r-- | solenv/inc/unxgcc.mk | 3 | ||||
| -rw-r--r-- | solenv/inc/unxiosr.mk | 3 | ||||
| -rw-r--r-- | solenv/inc/unxsogs.mk | 4 | ||||
| -rw-r--r-- | solenv/inc/wntgcci.mk | 3 |
6 files changed, 17 insertions, 4 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 0cc86e3c73d2..1e349f0a8325 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -81,6 +81,10 @@ gb_CXXFLAGS_COMMON := \ -fno-common \ -pipe \ +ifneq ($(HAVE_THREADSAFE_STATICS),TRUE) +gb_CXXFLAGS_COMMON += -fno-threadsafe-statics +endif + ifeq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE) gb_VISIBILITY_FLAGS := -DHAVE_GCC_VISIBILITY_FEATURE -fvisibility=hidden ifneq ($(HAVE_GCC_VISIBILITY_BROKEN),TRUE) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 2e2c20302132..ecb7d71076ff 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -87,10 +87,6 @@ ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE) gb_CXXFLAGS += -Wno-long-double endif -ifneq ($(HAVE_THREADSAFE_STATICS),TRUE) -gb_CXXFLAGS += -fno-threadsafe-statics -endif - # these are to get g++ to switch to Objective-C++ mode # (see toolkit module for a case where it is necessary to do it this way) gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk index 3ac4956ff216..04419863f32a 100644 --- a/solenv/inc/unxgcc.mk +++ b/solenv/inc/unxgcc.mk @@ -93,6 +93,9 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions # -fpermissive should be removed as soon as possible CFLAGSCXX= -pipe $(ARCH_FLAGS) +.IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE" +CFLAGSCXX += -fno-threadsafe-statics +.END .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" && "$(HAVE_GCC_VISIBILITY_BROKEN)" != "TRUE" CFLAGSCXX+=-fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk index 089dc3d588aa..f1a64929e20c 100644 --- a/solenv/inc/unxiosr.mk +++ b/solenv/inc/unxiosr.mk @@ -64,6 +64,9 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions # Normal C++ compilation flags CFLAGSCXX=-pipe -fsigned-char $(ARCH_FLAGS) -Wno-ctor-dtor-privacy +.IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE" +CFLAGSCXX += -fno-threadsafe-statics +.END # No PIC needed as we don't build dynamic objects PICSWITCH:= diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk index a4151439beb8..f75c4aa0883e 100644 --- a/solenv/inc/unxsogs.mk +++ b/solenv/inc/unxsogs.mk @@ -58,6 +58,10 @@ CFLAGSEXCEPTIONS=-fexceptions CFLAGS_NO_EXCEPTIONS=-fno-exceptions CFLAGSCXX= -pipe $(ARCH_FLAGS) +.IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE" +CFLAGSCXX += -fno-threadsafe-statics +.END + PICSWITCH:=-fPIC CFLAGSOBJGUIMT= CFLAGSOBJCUIMT= diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index c8e39d1570bb..496e8c22c319 100644 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -46,6 +46,9 @@ CFLAGS+=-fmessage-length=0 -c CFLAGSCC=-pipe $(ARCH_FLAGS) CFLAGSCXX=-pipe $(ARCH_FLAGS) +.IF "$(HAVE_THREADSAFE_STATICS)" != "TRUE" +CFLAGSCXX += -fno-threadsafe-statics +.END .IF "$(HAVE_CXX0X)" == "TRUE" # FIXME still does not compile fully CFLAGSCXX+=-std=gnu++0x |