Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(534)

Side by Side Diff: ports/cairo/nacl.patch

Issue 730193002: Fix more compile failures caused by recent ARM toolchain upgrade. (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ports/cairo/build.sh ('k') | ports/libgit2/build.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/configure b/configure 1 diff --git a/configure b/configure
2 index 0ceb5bf..55e6f97 100755 2 index 0ceb5bf..4a94244 100755
3 --- a/configure 3 --- a/configure
4 +++ b/configure 4 +++ b/configure
5 @@ -2974,18 +2974,22 @@ $as_echo "/* confdefs.h */" > confdefs.h 5 @@ -2974,18 +2974,22 @@ $as_echo "/* confdefs.h */" > confdefs.h
6 # Predefined preprocessor variables. 6 # Predefined preprocessor variables.
7 7
8 cat >>confdefs.h <<_ACEOF 8 cat >>confdefs.h <<_ACEOF
9 +#undef PACKAGE_NAME 9 +#undef PACKAGE_NAME
10 #define PACKAGE_NAME "$PACKAGE_NAME" 10 #define PACKAGE_NAME "$PACKAGE_NAME"
11 _ACEOF 11 _ACEOF
12 12
13 cat >>confdefs.h <<_ACEOF 13 cat >>confdefs.h <<_ACEOF
14 +#undef PACKAGE_TARNAME 14 +#undef PACKAGE_TARNAME
15 #define PACKAGE_TARNAME "$PACKAGE_TARNAME" 15 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
16 _ACEOF 16 _ACEOF
17 17
18 cat >>confdefs.h <<_ACEOF 18 cat >>confdefs.h <<_ACEOF
19 +#undef PACKAGE_VERSION 19 +#undef PACKAGE_VERSION
20 #define PACKAGE_VERSION "$PACKAGE_VERSION" 20 #define PACKAGE_VERSION "$PACKAGE_VERSION"
21 _ACEOF 21 _ACEOF
22 22
23 cat >>confdefs.h <<_ACEOF 23 cat >>confdefs.h <<_ACEOF
24 +#undef PACKAGE_STRING 24 +#undef PACKAGE_STRING
25 #define PACKAGE_STRING "$PACKAGE_STRING" 25 #define PACKAGE_STRING "$PACKAGE_STRING"
26 _ACEOF 26 _ACEOF
27 27
28 @@ -18805,10 +18809,10 @@ _ACEOF 28 @@ -18160,31 +18164,10 @@ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_A RG \
29 » » » -erroff=E_ENUM_TYPE_MISMATCH_OP"
30
31
32 +# Removed -flto flag as it seems to cause problems with the latest
33 +# version of our arm compiler:
34 +# https://code.google.com/p/nativeclient/issues/detail?id=3995
35
36 -safe_MAYBE_WARN="$MAYBE_WARN"
37 -MAYBE_WARN="$MAYBE_WARN -flto"
38 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
39 -/* end confdefs.h. */
40 -
41 -int
42 -main ()
43 -{
44 -
45 -» int main(int argc, char **argv) { return 0; }
46 -
47 - ;
48 - return 0;
49 -}
50 -_ACEOF
51 -if ac_fn_c_try_link "$LINENO"; then :
52 -
53 -else
54 -
55 -» MAYBE_WARN="$safe_MAYBE_WARN"
56 -
57 -fi
58 -rm -f core conftest.err conftest.$ac_objext \
59 - conftest$ac_exeext conftest.$ac_ext
60
61 MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
62
63 @@ -18805,10 +18788,10 @@ _ACEOF
29 if ac_fn_c_try_compile "$LINENO"; then : 64 if ac_fn_c_try_compile "$LINENO"; then :
30 65
31 66
32 -if strings - conftest.$ac_objext | grep noonsees >/dev/null ; then 67 -if strings - conftest.$ac_objext | grep noonsees >/dev/null ; then
33 +if ${NACLSTRINGS} - conftest.$ac_objext | grep noonsees >/dev/null ; then 68 +if ${NACLSTRINGS} - conftest.$ac_objext | grep noonsees >/dev/null ; then
34 ax_cv_c_float_words_bigendian=yes 69 ax_cv_c_float_words_bigendian=yes
35 fi 70 fi
36 -if strings - conftest.$ac_objext | grep seesnoon >/dev/null ; then 71 -if strings - conftest.$ac_objext | grep seesnoon >/dev/null ; then
37 +if ${NACLSTRINGS} - conftest.$ac_objext | grep seesnoon >/dev/null ; then 72 +if ${NACLSTRINGS} - conftest.$ac_objext | grep seesnoon >/dev/null ; then
38 if test "$ax_cv_c_float_words_bigendian" = unknown; then 73 if test "$ax_cv_c_float_words_bigendian" = unknown; then
39 ax_cv_c_float_words_bigendian=no 74 ax_cv_c_float_words_bigendian=no
40 else 75 else
OLDNEW
« no previous file with comments | « ports/cairo/build.sh ('k') | ports/libgit2/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698