OLD | NEW |
| 1 diff --git a/Makefile b/Makefile |
| 2 --- a/Makefile |
| 3 +++ b/Makefile |
| 4 @@ -116,7 +116,9 @@ ffprobe.o cmdutils.o libavcodec/utils.o libavformat/utils.o
libavdevice/avdevice |
| 5 |
| 6 $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) |
| 7 $(CP) $< $@ |
| 8 - $(STRIP) $@ |
| 9 + -if test "$(NACL_ARCH)" != "le32"; then \ |
| 10 + $(STRIP) $@; \ |
| 11 + fi |
| 12 |
| 13 %$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS) |
| 14 $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) |
1 diff --git a/configure b/configure | 15 diff --git a/configure b/configure |
2 --- a/configure | 16 --- a/configure |
3 +++ b/configure | 17 +++ b/configure |
| 18 @@ -2719,7 +2719,7 @@ ln_s="ln -s -f" |
| 19 nm_default="nm -g" |
| 20 objformat="elf" |
| 21 pkg_config_default=pkg-config |
| 22 -if ranlib 2>&1 | grep -q "\-D "; then |
| 23 +if [ $NACL_ARCH != le32 ] && ranlib 2>&1 | grep -q "\-D "; then |
| 24 ranlib_default="ranlib -D" |
| 25 else |
| 26 ranlib_default="ranlib" |
4 @@ -4761,7 +4761,13 @@ if ! disabled network; then | 27 @@ -4761,7 +4761,13 @@ if ! disabled network; then |
5 fi | 28 fi |
6 | 29 |
7 check_builtin atomic_cas_ptr atomic.h "void **ptr; void *oldval, *newval; atomi
c_cas_ptr(ptr, oldval, newval)" | 30 check_builtin atomic_cas_ptr atomic.h "void **ptr; void *oldval, *newval; atomi
c_cas_ptr(ptr, oldval, newval)" |
8 -check_builtin atomic_compare_exchange "" "int *ptr, *oldval; int newval; __atom
ic_compare_exchange_n(ptr, oldval, newval, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST
)" | 31 -check_builtin atomic_compare_exchange "" "int *ptr, *oldval; int newval; __atom
ic_compare_exchange_n(ptr, oldval, newval, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST
)" |
9 +# Check for both __atomic_compare_exchange_n and __atomic_add_fetch since | 32 +# Check for both __atomic_compare_exchange_n and __atomic_add_fetch since |
10 +# HAVE_ATOMIC_COMPARE_EXCHANGE should only be defined if both are present. | 33 +# HAVE_ATOMIC_COMPARE_EXCHANGE should only be defined if both are present. |
11 +# Currently PNaCl supports __atomic_compare_exchange_n but not | 34 +# Currently PNaCl supports __atomic_compare_exchange_n but not |
12 +# __atomic_add_fetch so testing for __atomic_compare_exchange_n was not | 35 +# __atomic_add_fetch so testing for __atomic_compare_exchange_n was not |
13 +# enough. | 36 +# enough. |
(...skipping 16 matching lines...) Expand all Loading... |
30 getrusage(RUSAGE_SELF, &rusage); | 53 getrusage(RUSAGE_SELF, &rusage); |
31 @@ -3955,7 +3955,7 @@ static int64_t getutime(void) | 54 @@ -3955,7 +3955,7 @@ static int64_t getutime(void) |
32 | 55 |
33 static int64_t getmaxrss(void) | 56 static int64_t getmaxrss(void) |
34 { | 57 { |
35 -#if HAVE_GETRUSAGE && HAVE_STRUCT_RUSAGE_RU_MAXRSS | 58 -#if HAVE_GETRUSAGE && HAVE_STRUCT_RUSAGE_RU_MAXRSS |
36 +#if HAVE_GETRUSAGE && HAVE_STRUCT_RUSAGE_RU_MAXRSS && !defined(__native_client_
_) | 59 +#if HAVE_GETRUSAGE && HAVE_STRUCT_RUSAGE_RU_MAXRSS && !defined(__native_client_
_) |
37 struct rusage rusage; | 60 struct rusage rusage; |
38 getrusage(RUSAGE_SELF, &rusage); | 61 getrusage(RUSAGE_SELF, &rusage); |
39 return (int64_t)rusage.ru_maxrss * 1024; | 62 return (int64_t)rusage.ru_maxrss * 1024; |
OLD | NEW |