Remove GCC 4.6 support

All our supported platforms have GCC 4.8 or higher available.
That includes Tizen TV 2.2.1, 2.4 and 3.0, as well as Tizen
Mobile 2.4 and 3.0.
The last known Tizen platform that depends on GCC 4.6 is
Tizen 2.3, which is not supported by the current dev and
beta branches.

Additionally, since the m42 upversion and the Xwalk refactor
work switched over to m42, GCC 4.6 specific hacks were not
carried over to s-chromium and s-blink. So the code being
removed is non-functional anymore anyways.

The only file left over is gcc46_compat_wrappers/ecore_x_wrapper.h
which will be used to support wayland. I deliberately
left this file over to avoid merge conflicts with that work.

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=12987
Reviewed by: Piotr Tworek, SeungSeop Park

Change-Id: Id3cd6ecff1a41a40f300d70d67e7b14bf7ac37ab
Signed-off-by: Antonio Gomes <a1.gomes@samsung.com>

diff --git a/tizen_src/build/deploy_libc_to_target.sh b/tizen_src/build/deploy_libc_to_target.sh
deleted file mode 100755 (executable)
index 5699804..0000000
--- a/tizen_src/build/deploy_libc_to_target.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-SCRIPTDIR=$( cd $(dirname $0) ; pwd -P )
-TOPDIR=$( cd ${SCRIPTDIR}/.. ; pwd -P )
-LIBC_DIR=$( cd ${TOPDIR}/ewk/thirdparty/eglibc-2.18-rpm ; pwd -P )
-
-source ${SCRIPTDIR}/common.sh
-
-# 1/ nuke any previous custom libc deployment.
-# 2/ create our custom libc folder
-# 3/ copy libc rpm to target
-# 4/ extract it and remove unneeded left over.
-sdb root on
-sdb shell "rm -fr /opt/usr/eglibc-2.18"
-sdb shell "mkdir /opt/usr/eglibc-2.18"
-sdb push $LIBC_DIR/eglibc-2.18-5.1.armv7l.rpm /opt/usr/eglibc-2.18
-sdb shell "cd /opt/usr/eglibc-2.18/ ; rpm2cpio eglibc-2.18-5.1.armv7l.rpm | cpio -imdv"
-sdb shell "cd /opt/usr/eglibc-2.18/ ; rm -fr eglibc-2.18-5.1.armv7l.rpm etc sbin usr var"

diff --git a/tizen_src/build/gyp_chromiumefl.sh b/tizen_src/build/gyp_chromiumefl.sh
index 039ff72..3352f07 100755 (executable)
--- a/tizen_src/build/gyp_chromiumefl.sh
+++ b/tizen_src/build/gyp_chromiumefl.sh
@@ -40,9 +40,6 @@ fi
 if [ "$__GYP_CHROMIUMEFL_TARGET" == "crosscompile" ]; then
   buildType=crosscompile
   EXTRA_GYP_ARGS+=" -Dedje_compiler=${TOPDIR}/out.${host_arch}/Dependencies/Root/bin/edje_cc"
-  if [ "$target" == "mobile" ]; then
-    EXTRA_GYP_ARGS+=" -Dcustom_libc_dir=/opt/usr/eglibc-2.18/lib"
-  fi
 fi
 
 ORIGINAL_GYP_DEFINES="$GYP_DEFINES"

diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index 352aec3..697a5fb 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -903,9 +903,6 @@ bool EWebView::ExecuteJavaScript(const char* script, Ewk_View_Script_Execute_Cal
   return true;
 }
 
-#ifdef GCC_4_6_X
-#undef override
-#endif
 bool EWebView::SetUserAgent(const char* userAgent) {
   const content::NavigationController& controller =
       web_contents_->GetController();
@@ -920,9 +917,6 @@ bool EWebView::SetUserAgent(const char* userAgent) {
 
   return true;
 }
-#ifdef GCC_4_6_X
-#define override
-#endif
 
 bool EWebView::SetUserAgentAppName(const char* application_name) {
   EflWebView::VersionInfo::GetInstance()->

diff --git a/tizen_src/ewk/tests_run b/tizen_src/ewk/tests_run
index 77a9a51..4b7e9b6 100755 (executable)
--- a/tizen_src/ewk/tests_run
+++ b/tizen_src/ewk/tests_run
@@ -17,14 +17,10 @@ sdb shell ulimit -c 1000000
 sdb shell 'rpm -qa | grep chromium-e | while read pakiet ; do rpm -e \$pakiet --nodeps ; done '
 
 sdb push ${ewk_dir}thirdparty/nss3.15/* /usr/lib/ ; sdb push ${ewk_dir}thirdparty/nss3.15/* /lib/
-sdb push ${ewk_dir}thirdparty/eglibc-2.18-rpm/eglibc-2.18-5.1.armv7l.rpm /opt/usr/media/Downloads/ && sdb shell rpm -i /opt/usr/media/Downloads/eglibc-2.18-5.1.armv7l.rpm --nodeps --force
 #cd ~/Pobrane && wget http://10.251.52.177/tizenrepo/jpn-dcm/Redwood8974JPNDCM_20131218.006/repos/slp-release/armv7l/packages/armv7l/gconf-dbus-2.16.0-1.4.redwood8974om.armv7l.rpm --no-clobber
 sdb push ~/Pobrane/gconf-dbus-2.16.0-1.4.redwood8974om.armv7l.rpm /opt/usr/media/Downloads/ && sdb shell rpm -i /opt/usr/media/Downloads/gconf-dbus-2.16.0-1.4.redwood8974om.armv7l.rpm
 sdb push ~/Pobrane/gtest-1.3.0.0-3.1.redwood8974om.armv7l.rpm /opt/usr/media/Downloads/ && sdb shell rpm -i /opt/usr/media/Downloads/gtest-1.3.0.0-3.1.redwood8974om.armv7l.rpm
 
-sdb shell  mkdir -p /opt/usr/eglibc-2.18/lib/
-sdb shell cp /lib/ld-linux.so.3 /opt/usr/eglibc-2.18/lib/
-
 for rpm in ${rep_dir}*efl-40*.rpm ; do
   sdb push $rpm /opt/usr/media/Downloads/ && sdb shell rpm -i /opt/usr/media/Downloads/`basename ${rpm}` --nodeps || exit 3
 done

diff --git a/tizen_src/gcc46_compat_wrappers/ecore_x_wrapper.h b/tizen_src/gcc46_compat_wrappers/ecore_x_wrapper.h
index d0cd674..ca644d4 100644 (file)
--- a/tizen_src/gcc46_compat_wrappers/ecore_x_wrapper.h
+++ b/tizen_src/gcc46_compat_wrappers/ecore_x_wrapper.h
@@ -5,12 +5,6 @@
 #ifndef ECORE_X_WRAPPER_H_
 #define ECORE_X_WRAPPER_H_
 
-#ifdef GCC_4_6_X
-#undef override
-#endif
 #include <Ecore_X.h>
-#ifdef GCC_4_6_X
-#define override
-#endif
 
 #endif

diff --git a/tizen_src/gcc46_compat_wrappers/google_streaming_api_pb_wrapper.h b/tizen_src/gcc46_compat_wrappers/google_streaming_api_pb_wrapper.h
deleted file mode 100644 (file)
index 007ceb5..0000000
--- a/tizen_src/gcc46_compat_wrappers/google_streaming_api_pb_wrapper.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef GOOGLE_STREAMING_API_PB_WRAPPER_H_
-#define GOOGLE_STREAMING_API_PB_WRAPPER_H_
-
-#ifdef GCC_4_6_X
-#undef final
-#endif
-#include "content/browser/speech/proto/google_streaming_api.pb.h"
-#ifdef GCC_4_6_X
-#define final
-#endif
-
-#endif

diff --git a/tizen_src/gcc46_compat_wrappers/openssl_evp_wrapper.h b/tizen_src/gcc46_compat_wrappers/openssl_evp_wrapper.h
deleted file mode 100644 (file)
index c2f1e79..0000000
--- a/tizen_src/gcc46_compat_wrappers/openssl_evp_wrapper.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef OPENSSL_EVP_WRAPPER_H_
-#define OPENSSL_EVP_WRAPPER_H_
-
-#ifdef GCC_4_6_X
-#undef final
-#endif
-#include <openssl/evp.h>
-#ifdef GCC_4_6_X
-#define final
-#endif
-
-#endif

diff --git a/tizen_src/gcc46_compat_wrappers/openssl_pem_wrapper.h b/tizen_src/gcc46_compat_wrappers/openssl_pem_wrapper.h
deleted file mode 100644 (file)
index a925a91..0000000
--- a/tizen_src/gcc46_compat_wrappers/openssl_pem_wrapper.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef OPENSSL_PEM_WRAPPER_H_
-#define OPENSSL_PEM_WRAPPER_H_
-
-#ifdef GCC_4_6_X
-#undef final
-#endif
-#include <openssl/pem.h>
-#ifdef GCC_4_6_X
-#define final
-#endif
-
-#endif

diff --git a/tizen_src/gcc46_compat_wrappers/openssl_ssl_wrapper.h b/tizen_src/gcc46_compat_wrappers/openssl_ssl_wrapper.h
deleted file mode 100644 (file)
index 7ce23e7..0000000
--- a/tizen_src/gcc46_compat_wrappers/openssl_ssl_wrapper.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef OPENSSL_SSL_WRAPPER_H_
-#define OPENSSL_SSL_WRAPPER_H_
-
-#ifdef GCC_4_6_X
-#undef final
-#endif
-#include <openssl/ssl.h>
-#ifdef GCC_4_6_X
-#define final
-#endif
-
-#endif

diff --git a/tizen_src/gcc46_compat_wrappers/openssl_x509_wrapper.h b/tizen_src/gcc46_compat_wrappers/openssl_x509_wrapper.h
deleted file mode 100644 (file)
index 3b71b70..0000000
--- a/tizen_src/gcc46_compat_wrappers/openssl_x509_wrapper.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef OPENSSL_X509_WRAPPER_H_
-#define OPENSSL_X509_WRAPPER_H_
-
-#ifdef GCC_4_6_X
-#undef final
-#endif
-#include <openssl/x509.h>
-#ifdef GCC_4_6_X
-#define final
-#endif
-
-#endif

diff --git a/tizen_src/gcc46_compat_wrappers/openssl_x509v3_wrapper.h b/tizen_src/gcc46_compat_wrappers/openssl_x509v3_wrapper.h
deleted file mode 100644 (file)
index 546a303..0000000
--- a/tizen_src/gcc46_compat_wrappers/openssl_x509v3_wrapper.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef OPENSSL_X509V3_WRAPPER_H_
-#define OPENSSL_X509V3_WRAPPER_H_
-
-#ifdef GCC_4_6_X
-#undef final
-#endif
-#include <openssl/x509v3.h>
-#ifdef GCC_4_6_X
-#define final
-#endif
-
-#endif

diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec
index c67b0bf..5fbd38f 100644 (file)
--- a/tizen_src/packaging/chromium-efl.spec
+++ b/tizen_src/packaging/chromium-efl.spec
@@ -322,9 +322,6 @@ fi
 %if 0%{?_remove_webcore_debug_symbols:1}
   -Dremove_webcore_debug_symbols=1 \
 %endif
-%if 0%{?custom_libc_dir:1}
-  -Dcustom_libc_dir=%{custom_libc_dir} \
-%endif
 %if 0%{?chromium_efl_tizen_version:1}
   -Dchromium_efl_tizen_version=%{chromium_efl_tizen_version} \
 %endif

diff --git a/tizen_src/supplement.gypi b/tizen_src/supplement.gypi
index 9436a8d..6870468 100644 (file)
--- a/tizen_src/supplement.gypi
+++ b/tizen_src/supplement.gypi
@@ -68,17 +68,6 @@
         'defines': [ 'EWK_BRINGUP=1' ],
       }], # ewk_bringup==1
 
-      # Mobile gcc 4.6.x hack begin
-      ['clang==0 and gcc_version <= 46', {
-        'defines': [
-          'GCC_4_6_X=1',
-          'override=',
-          'final=',
-        ],
-        'cflags_cc': [ '-std=gnu++0x', '-fpermissive' ],
-      }],
-      # Mobile gcc 4.6.x hack end
-
       ['prebuilt_ld_gold_dir!=""', {
         'ldflags': [
           '-B<(prebuilt_ld_gold_dir)',
@@ -107,10 +96,6 @@
         'defines': [
           'OS_TIZEN=1',
           'WTF_OS_TIZEN=1',
-          # For GCC 4.5.3 bundled arm.h has a bug and don't define __ARM_PCS when it should.
-          # Force define this flag for the whole chromium on gbs gcc 4.5.3.
-          # Non-arm builds will ingore it in any case.
-          '__ARM_PCS',
         ],
         'conditions': [
           ['chromium_efl_tizen_version=="2.4"', {
@@ -160,27 +145,5 @@
       }],
 
     ], # conditions
-
-    # Mobile gcc 4.6.x hack begin
-    'target_conditions': [
-      ['_target_name=="boringssl" or _target_name=="crypto" or _target_name=="genperf" or  _target_name=="yasm" or _target_name=="speech_proto" or _target_name=="skia_library" or  _target_name=="http_server" or _target_name=="libjingle" or  _target_name=="libjingle_webrtc_common" or _target_name=="content_renderer" or _target_name=="mesa_libglslcommon"', {
-        'defines!': [
-          'final=',
-        ],
-      }],
-      ['_target_name=="usrsctplib"', {
-        'defines!': [
-          'override=',
-        ],
-      }],
-      ['_target_name=="webrtc_base" or _target_name=="rtc_base" or _target_name=="v8_base"', {
-        'defines!': [
-          'final=',
-          'override=',
-        ],
-      }],
-    ],
-    # Mobile gcc 4.6.x hack end
-
   }, # target_defaults
 }