diff options
| author | mostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 23:34:05 +0000 |
|---|---|---|
| committer | mostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 23:34:05 +0000 |
| commit | 94ad85d582365e7d4e8eaa1459e38ef3eae20509 (patch) | |
| tree | bca7ef0e1e8335b5d7a8c9dfa699cfb56c9eae18 /third_party/qcms | |
| parent | afb848acb43ba316097ab4fddfa38dbd80bc6a71 (diff) | |
| download | chromium_src-94ad85d582365e7d4e8eaa1459e38ef3eae20509.zip chromium_src-94ad85d582365e7d4e8eaa1459e38ef3eae20509.tar.gz chromium_src-94ad85d582365e7d4e8eaa1459e38ef3eae20509.tar.bz2 | |
silence qcms __force_align_arg_pointer__ warning on mips too
Review URL: https://chromiumcodereview.appspot.com/18112005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/qcms')
| -rw-r--r-- | third_party/qcms/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/qcms/google.patch | 4 | ||||
| -rw-r--r-- | third_party/qcms/src/transform.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/third_party/qcms/README.chromium b/third_party/qcms/README.chromium index ab858a0..c73f12b 100644 --- a/third_party/qcms/README.chromium +++ b/third_party/qcms/README.chromium @@ -28,7 +28,7 @@ google.patch contains the following modifications. Apply with - Do not short-circuit bogus profile check for A2B0 or B2A0 unless v4 enabled. - Only reference code from transform-sse1.c and transform-sse2.c when SSE is enabled. - - Do not use an x86-only attribute on ARM. + - Do not use an x86-only attribute on ARM or MIPS. - Fix integer truncation warning/errors on Win64 build. To regenerate google.patch: git diff b8456f38 src > google.patch diff --git a/third_party/qcms/google.patch b/third_party/qcms/google.patch index a41aacf..ec26a95 100644 --- a/third_party/qcms/google.patch +++ b/third_party/qcms/google.patch @@ -748,11 +748,11 @@ index 9a6562b..7312ced 100644 -#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) +/* __force_align_arg_pointer__ is an x86-only attribute, and gcc/clang warns on unused -+ * attributes. Don't use this on ARM or AMD64. __has_attribute can detect the presence ++ * attributes. Don't use this on ARM, AMD64 or MIPS. __has_attribute can detect the presence + * of the attribute but is currently only supported by clang */ +#if defined(__has_attribute) +#define HAS_FORCE_ALIGN_ARG_POINTER __has_attribute(__force_align_arg_pointer__) -+#elif defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) && !defined(__arm__) ++#elif defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) && !defined(__arm__) && !defined(__mips__) +#define HAS_FORCE_ALIGN_ARG_POINTER 1 +#else +#define HAS_FORCE_ALIGN_ARG_POINTER 0 diff --git a/third_party/qcms/src/transform.c b/third_party/qcms/src/transform.c index 7312ced..8a9fd0f 100644 --- a/third_party/qcms/src/transform.c +++ b/third_party/qcms/src/transform.c @@ -1328,7 +1328,7 @@ qcms_transform* qcms_transform_create( * of the attribute but is currently only supported by clang */ #if defined(__has_attribute) #define HAS_FORCE_ALIGN_ARG_POINTER __has_attribute(__force_align_arg_pointer__) -#elif defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) && !defined(__arm__) +#elif defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) && !defined(__arm__) && !defined(__mips__) #define HAS_FORCE_ALIGN_ARG_POINTER 1 #else #define HAS_FORCE_ALIGN_ARG_POINTER 0 |