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

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

Issue 1804293003: Add support for new pnacl native toolchain driver (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Fix according to Brad's comments Created 4 years, 7 months 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
OLDNEW
1 diff --git a/common/cpu.c b/common/cpu.c 1 diff --git a/common/cpu.c b/common/cpu.c
2 --- a/common/cpu.c 2 --- a/common/cpu.c
3 +++ b/common/cpu.c 3 +++ b/common/cpu.c
4 @@ -93,7 +93,7 @@ const x264_cpu_name_t x264_cpu_names[] = 4 @@ -93,7 +93,7 @@ const x264_cpu_name_t x264_cpu_names[] =
5 {"", 0}, 5 {"", 0},
6 }; 6 };
7 7
8 -#if (ARCH_PPC && SYS_LINUX) || (ARCH_ARM && !HAVE_NEON) 8 -#if (ARCH_PPC && SYS_LINUX) || (ARCH_ARM && !HAVE_NEON)
9 +#if (ARCH_PPC && SYS_LINUX) || (ARCH_ARM && HAVE_ARMV6 && !HAVE_NEON) 9 +#if (ARCH_PPC && SYS_LINUX) || (ARCH_ARM && HAVE_ARMV6 && !HAVE_NEON)
10 #include <signal.h> 10 #include <signal.h>
11 #include <setjmp.h> 11 #include <setjmp.h>
12 static sigjmp_buf jmpbuf; 12 static sigjmp_buf jmpbuf;
13 diff --git a/configure b/configure 13 diff --git a/configure b/configure
14 --- a/configure 14 --- a/configure
15 +++ b/configure 15 +++ b/configure
16 @@ -547,6 +547,16 @@ case $host_os in 16 @@ -547,6 +547,16 @@ case $host_os in
17 LDFLAGSCLI="$LDFLAGSCLI -lshell32" 17 LDFLAGSCLI="$LDFLAGSCLI -lshell32"
18 [ $compiler = GNU ] && RC="${RC-${cross_prefix}windres}" || RC="${RC-rc }" 18 [ $compiler = GNU ] && RC="${RC-${cross_prefix}windres}" || RC="${RC-rc }"
19 ;; 19 ;;
20 + *nacl*) 20 + *nacl*)
21 + SYS="NACL" 21 + SYS="NACL"
22 + define HAVE_MALLOC_H 22 + define HAVE_MALLOC_H
23 + if [[ $(basename ${CC}) =~ pnacl-* ]]; then 23 + if [[ $(basename ${CC}) =~ pnacl-* || $(basename ${CC}) =~ le32-nacl-* ]]; then
24 + EXE=.pexe 24 + EXE=.pexe
25 + else 25 + else
26 + EXE=.nexe 26 + EXE=.nexe
27 + fi 27 + fi
28 + libm="-lm" 28 + libm="-lm"
29 + ;; 29 + ;;
30 sunos*|solaris*) 30 sunos*|solaris*)
31 SYS="SunOS" 31 SYS="SunOS"
32 define HAVE_MALLOC_H 32 define HAVE_MALLOC_H
33 @@ -773,11 +783,14 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$stack_alignment" 33 @@ -773,11 +783,14 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$stack_alignment"
34 if [ $compiler = GNU ]; then 34 if [ $compiler = GNU ]; then
35 echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c 35 echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c
36 $CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test fai led" 36 $CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test fai led"
37 + # there is no pnacl-strings binary. 37 + # there is no pnacl-strings binary.
38 + if [[ ! $(basename ${CC}) =~ pnacl-* ]]; then 38 + if [[ ! $(basename ${CC}) =~ pnacl-* && ! $(basename ${CC}) =~ le32-nacl-* ]]; then
39 if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix }strings -a conftest.o | grep -q FPendian) ; then 39 if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix }strings -a conftest.o | grep -q FPendian) ; then
40 define WORDS_BIGENDIAN 40 define WORDS_BIGENDIAN
41 elif !(${cross_prefix}strings -a conftest.o | grep -q EGIB && ${cross_prefi x}strings -a conftest.o | grep -q naidnePF) ; then 41 elif !(${cross_prefix}strings -a conftest.o | grep -q EGIB && ${cross_prefi x}strings -a conftest.o | grep -q naidnePF) ; then
42 die "endian test failed" 42 die "endian test failed"
43 fi 43 fi
44 + fi 44 + fi
45 fi 45 fi
46 46
47 # autodetect options that weren't forced nor disabled 47 # autodetect options that weren't forced nor disabled
OLDNEW
« make_all.sh ('K') | « ports/vim/nacl.patch ('k') | ports/zlib/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698