[FFmpeg-cvslog] r19412 - in trunk: common.mak configure

[Alexander Strange]

On Jul 12, 2009, at 9:29 AM, mru wrote:

> Author: mru
> Date: Sun Jul 12 15:29:53 2009
> New Revision: 19412
>
> Log:
> Pass ASFLAGS to assembler instead of CFLAGS
>
> Modified:
>   trunk/common.mak
>   trunk/configure

This broke ebx available detection on Darwin, since -mdynamic-no-pic  
isn't in ASFLAGS.
(Maybe there should be a FATE test for that?

Why is check_asm calling $as with C code, anyway?


> Modified: trunk/common.mak
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- trunk/common.mak	Sun Jul 12 15:29:51 2009	(r19411)
> +++ trunk/common.mak	Sun Jul 12 15:29:53 2009	(r19412)
> @@ -24,7 +24,7 @@ CPPFLAGS += -DHAVE_AV_CONFIG_H -I$(BUILD
> 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c $(CC_O) $<
>
> %.o: %.S
> -	$(AS) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
> +	$(AS) $(CPPFLAGS) $(ASFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
>
> %.ho: %.h
> 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x  
> c $<
>
> Modified: trunk/configure
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- trunk/configure	Sun Jul 12 15:29:51 2009	(r19411)
> +++ trunk/configure	Sun Jul 12 15:29:53 2009	(r19412)
> @@ -520,6 +520,10 @@ add_cflags(){
>     append CFLAGS "$@"
> }
>
> +add_asflags(){
> +    append ASFLAGS "$@"
> +}
> +
> add_ldflags(){
>     append LDFLAGS "$@"
> }
> @@ -551,7 +555,7 @@ check_as(){
>     log check_as "$@"
>     cat > $TMPC
>     log_file $TMPC
> -    check_cmd $as $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC
> +    check_cmd $as $CPPFLAGS $ASFLAGS "$@" -c -o $TMPO $TMPC
> }
>
> check_asm(){
> @@ -1494,6 +1498,7 @@ test -n "$cc_type" && enable $cc_type ||
> set_default as dep_cc ld
>
> add_cflags $extra_cflags
> +add_asflags $extra_cflags
>
> if test -n "$sysroot"; then
>     case "$cc_type" in
> @@ -1920,6 +1925,7 @@ if test $cpu != "generic"; then
> fi
>
> add_cflags $cpuflags
> +add_asflags $cpuflags
>
> check_cc <<EOF || die "Symbol mangling check failed."
> int ff_extern;
> @@ -2498,6 +2504,7 @@ enabled stripping &&
>
> echo "CPPFLAGS?=$CPPFLAGS" >> config.mak
> echo "CFLAGS=$CFLAGS" >> config.mak
> +echo "ASFLAGS=$ASFLAGS" >> config.mak
> echo "CC_O=$CC_O" >> config.mak
> echo "LDFLAGS=$LDFLAGS" >> config.mak
> echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
> _______________________________________________
> ffmpeg-cvslog mailing list
> ffmpeg-cvslog at mplayerhq.hu
> https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-cvslog