Switching on -fcommon for ASan build

Signed-off-by: Slava Barinov <v.barinov@samsung.com>

diff --git a/build/common.gypi b/build/common.gypi
index 876c0fe3f68f69bea49383d7fddccb47285ef205..4ad2b84ac7d7ddfb2dc68f2d2a7834cf9a200588 100644 (file)
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -43,6 +43,7 @@
       '-std=c++0x',
       '-fPIC',
       '-fvisibility=hidden',
+      '-fcommon',
       '-Wall',
     ],
     'libraries' : [

diff --git a/common/common.gyp b/common/common.gyp
index 2812f63c9fa49fc5faad1d3f8b29a3f24457f4b4..a0c596ddcbe7f9bcf09a9108cd1887f26f3e4667 100644 (file)
--- a/common/common.gyp
+++ b/common/common.gyp
@@ -33,6 +33,7 @@
       ],
       'cflags': [
         '-fvisibility=default',
+        '-fcommon',
       ],
       'variables': {
         'packages': [

diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index c7eb0c6015659c3079b1b175690e6a0c1a9dbbb5..97ef21e58cd072d7bfa696aa9d2598ad6ad19bea 100644 (file)
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -41,6 +41,7 @@
       ],
       'cflags': [
         '-fvisibility=default',
+        '-fcommon',
       ],
       'variables': {
         'packages': [

diff --git a/packaging/crosswalk-tizen.spec b/packaging/crosswalk-tizen.spec
index 42f2fc38193e3139387b0a843afd83879063d06e..cbeb5fba797d239dc10432de2e0ca23b8abc6351 100755 (executable)
--- a/packaging/crosswalk-tizen.spec
+++ b/packaging/crosswalk-tizen.spec
@@ -83,6 +83,9 @@ Crosswalk Runtime and AppShell for Tizen 3.0 and later
 cp %{SOURCE1001} .
 
 %build
+export CFLAGS+=" -fcommon "
+export CXXLAGS+=" -fcommon "
+export LDFLAGS+=" -fcommon -Wl,--allow-shlib-undefined "
 export GYP_GENERATORS='ninja'
 GYP_OPTIONS="--depth=.
 -Dprofile=%{profile}"
@@ -107,7 +110,7 @@ GYP_OPTIONS="$GYP_OPTIONS -Dinjected_bundle_path=%{injected_bundle_path}"
 
 # Build
 ./tools/gyp/gyp $GYP_OPTIONS xwalk_tizen.gyp
-ninja -C out/Default %{?_smp_mflags}
+ldflags=-Wl,--allow-shlib-undefined ninja -C out/Default %{?_smp_mflags} -v
 
 %install
 

diff --git a/runtime/runtime.gyp b/runtime/runtime.gyp
index 7d1883ef3d076936b4b9c43f766f26fb16c38abb..5ac685c5bfebfdcc058e3625d250bf4d0f7d7fc5 100755 (executable)
--- a/runtime/runtime.gyp
+++ b/runtime/runtime.gyp
@@ -117,6 +117,7 @@
       ],
       'cflags': [
         '-fvisibility=default',
+        '-fcommon',
       ],
       'variables': {
         'packages': [

diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py
index 2230d634f9123b8224a1c74b0565388a511053f6..9a44e06258682505cc27d900ce54f72d76990eba 100644 (file)
--- a/tools/gyp/pylib/gyp/generator/make.py
+++ b/tools/gyp/pylib/gyp/generator/make.py
@@ -1417,6 +1417,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
             # We want to get the literal string "$ORIGIN" into the link command,
             # so we need lots of escaping.
             ldflags.append(r'-Wl,-rpath=\$$ORIGIN/lib.%s/' % self.toolset)
+            ldflags.append(r'-Wl,--allow-shlib-undefined.%s/' % self.toolset)
             ldflags.append(r'-Wl,-rpath-link=\$(builddir)/lib.%s/' %
                            self.toolset)
         self.WriteList(ldflags, 'LDFLAGS_%s' % configname)

diff --git a/tools/gyp/pylib/gyp/generator/ninja.py b/tools/gyp/pylib/gyp/generator/ninja.py
index 619ac39754a0192d153296494c6f1e76981520fe..caf5b3fab625c11a852135d6270ac736b5e3e6cc 100644 (file)
--- a/tools/gyp/pylib/gyp/generator/ninja.py
+++ b/tools/gyp/pylib/gyp/generator/ninja.py
@@ -924,6 +924,7 @@ class NinjaWriter:
           rpath += self.toolset
         ldflags.append('-Wl,-rpath=\$$ORIGIN/%s' % rpath)
         ldflags.append('-Wl,-rpath-link=%s' % rpath)
+        ldflags.append('-Wl,--allow-shlib-undefined')
     self.WriteVariableList('ldflags',
                            gyp.common.uniquer(map(self.ExpandSpecial,
                                                   ldflags)))