libcvd-members
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[libcvd-members] libcvd configure configure.in cvd_src/i686/half...


From: Gerhard Reitmayr
Subject: [libcvd-members] libcvd configure configure.in cvd_src/i686/half...
Date: Tue, 13 May 2008 12:45:35 +0000

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Gerhard Reitmayr <gerhard>      08/05/13 12:45:34

Modified files:
        .              : configure configure.in 
        cvd_src/i686   : halfsample.s rgb_to_gray.s yuv422_to_grey.s 
                         yuv422_to_rgb.s 

Log message:
        new fix for not compiling assembler code on OSX. check if lcoal the 
assembler can actually compile our sources, and do not build them, if not

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/i686/halfsample.s?cvsroot=libcvd&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/i686/rgb_to_gray.s?cvsroot=libcvd&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/i686/yuv422_to_grey.s?cvsroot=libcvd&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/i686/yuv422_to_rgb.s?cvsroot=libcvd&r1=1.3&r2=1.4

Patches:
Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- configure   13 May 2008 08:58:27 -0000      1.118
+++ configure   13 May 2008 12:45:32 -0000      1.119
@@ -687,6 +687,7 @@
 have_sse2
 have_sse3
 have_32bit
+have_assembler
 CXXCPP
 have_dvbuffer
 have_v4l2buffer
@@ -5856,6 +5857,19 @@
 
 fi
 
+{ echo "$as_me:$LINENO: checking assembler supports .type pseudo-op" >&5
+echo $ECHO_N "checking assembler supports .type pseudo-op... $ECHO_C" >&6; }
+if echo '.globl test
+.type test, @function' | as &> /dev/null; then
+  have_assembler=yes
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
 
################################################################################
 #
 # Operating system specific parts
@@ -10882,12 +10896,12 @@
 cvd_src/i686/yuv411_to_stuff_MMX                       mmxext 32bit x86
 cvd_src/yuv411_to_stuff                                                END
 
-cvd_src/i686/halfsample,HALFSAMPLE_MMX8                mmx 32bit x86 END
+cvd_src/i686/halfsample,HALFSAMPLE_MMX8                mmx 32bit x86 assembler 
END
 HALFSAMPLE_SSE16                                                       sse2 END
 
 YV402P_MMX                                                                     
mmx END
 
-cvd_src/i686/rgb_to_gray,cvd_src/i686/convert_rgb_to_y 32bit mmxext x86
+cvd_src/i686/rgb_to_gray,cvd_src/i686/convert_rgb_to_y 32bit mmxext x86 
assembler
 cvd_src/noarch/convert_rgb_to_y                                        END
 
 
@@ -10898,7 +10912,7 @@
 cvd_src/i686/gradient                                          sse2
 cvd_src/noarch/gradient                                                END
 
-cvd_src/i686/yuv422_to_rgb,cvd_src/i686/yuv422_to_grey,cvd_src/i686/yuv422_wrapper
 mmxext 32bit x86
+cvd_src/i686/yuv422_to_rgb,cvd_src/i686/yuv422_to_grey,cvd_src/i686/yuv422_wrapper
 mmxext 32bit x86 assembler
 cvd_src/noarch/yuv422_wrapper                                          END
 
 cvd_src/i686/median_3x3                                                sse2
@@ -11754,6 +11768,7 @@
 have_sse2!$have_sse2$ac_delim
 have_sse3!$have_sse3$ac_delim
 have_32bit!$have_32bit$ac_delim
+have_assembler!$have_assembler$ac_delim
 CXXCPP!$CXXCPP$ac_delim
 have_dvbuffer!$have_dvbuffer$ac_delim
 have_v4l2buffer!$have_v4l2buffer$ac_delim
@@ -11777,7 +11792,6 @@
 have_memalign!$have_memalign$ac_delim
 have_fast7!$have_fast7$ac_delim
 have_fast8!$have_fast8$ac_delim
-have_fast9!$have_fast9$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -11819,6 +11833,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+have_fast9!$have_fast9$ac_delim
 have_fast10!$have_fast10$ac_delim
 have_fast11!$have_fast11$ac_delim
 have_fast12!$have_fast12$ac_delim
@@ -11833,7 +11848,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- configure.in        13 May 2008 08:58:27 -0000      1.119
+++ configure.in        13 May 2008 12:45:33 -0000      1.120
@@ -373,6 +373,12 @@
        AC_SUBST(have_32bit,yes)
 fi
 
+AC_MSG_CHECKING([assembler supports .type pseudo-op])
+AS_IF([echo '.globl test
+.type test, @function' | as &> /dev/null], 
+       [AC_SUBST(have_assembler,yes) AC_MSG_RESULT(yes)],
+       [AC_MSG_RESULT(no)])
+
 
################################################################################
 #
 # Operating system specific parts
@@ -830,12 +836,12 @@
 cvd_src/i686/yuv411_to_stuff_MMX                       mmxext 32bit x86
 cvd_src/yuv411_to_stuff                                                END
 
-cvd_src/i686/halfsample,HALFSAMPLE_MMX8                mmx 32bit x86 END
+cvd_src/i686/halfsample,HALFSAMPLE_MMX8                mmx 32bit x86 assembler 
END
 HALFSAMPLE_SSE16                                                       sse2 END
 
 YV402P_MMX                                                                     
mmx END
 
-cvd_src/i686/rgb_to_gray,cvd_src/i686/convert_rgb_to_y 32bit mmxext x86
+cvd_src/i686/rgb_to_gray,cvd_src/i686/convert_rgb_to_y 32bit mmxext x86 
assembler
 cvd_src/noarch/convert_rgb_to_y                                        END
 
 
@@ -846,7 +852,7 @@
 cvd_src/i686/gradient                                          sse2
 cvd_src/noarch/gradient                                                END
 
-cvd_src/i686/yuv422_to_rgb,cvd_src/i686/yuv422_to_grey,cvd_src/i686/yuv422_wrapper
 mmxext 32bit x86
+cvd_src/i686/yuv422_to_rgb,cvd_src/i686/yuv422_to_grey,cvd_src/i686/yuv422_wrapper
 mmxext 32bit x86 assembler
 cvd_src/noarch/yuv422_wrapper                                          END
 
 cvd_src/i686/median_3x3                                                sse2

Index: cvd_src/i686/halfsample.s
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/i686/halfsample.s,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cvd_src/i686/halfsample.s   13 May 2008 08:08:53 -0000      1.3
+++ cvd_src/i686/halfsample.s   13 May 2008 12:45:33 -0000      1.4
@@ -20,8 +20,9 @@
 */
 
        .text
-.globl _cvd_asm_halfsample_mmx
-_cvd_asm_halfsample_mmx:
+.globl cvd_asm_halfsample_mmx
+       .type   cvd_asm_halfsample_mmx, @function
+cvd_asm_halfsample_mmx:
        pushl   %ebp
        movl    %esp, %ebp
        pushl   %ebx
@@ -78,3 +79,4 @@
        popl    %ebx
        popl    %ebp
        ret
+       .size   cvd_asm_halfsample_mmx, .-cvd_asm_halfsample_mmx

Index: cvd_src/i686/rgb_to_gray.s
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/i686/rgb_to_gray.s,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cvd_src/i686/rgb_to_gray.s  13 May 2008 08:08:53 -0000      1.3
+++ cvd_src/i686/rgb_to_gray.s  13 May 2008 12:45:33 -0000      1.4
@@ -1,6 +1,7 @@
        .text
-.globl _cvd_asm_rgb_to_gray
-_cvd_asm_rgb_to_gray:
+.globl cvd_asm_rgb_to_gray
+       .type   cvd_asm_rgb_to_gray, @function
+cvd_asm_rgb_to_gray:
        pushl   %ebp
        movl    %esp, %ebp
        pushl   %eax
@@ -89,3 +90,4 @@
        popl    %eax
        popl    %ebp
        ret
+       .size   cvd_asm_rgb_to_gray, .-cvd_asm_rgb_to_gray

Index: cvd_src/i686/yuv422_to_grey.s
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/i686/yuv422_to_grey.s,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cvd_src/i686/yuv422_to_grey.s       13 May 2008 08:08:53 -0000      1.3
+++ cvd_src/i686/yuv422_to_grey.s       13 May 2008 12:45:34 -0000      1.4
@@ -1,6 +1,9 @@
+       .section        .rodata
+       .align 8
        .text
-.globl _cvd_asm_yuv422_to_grey
-_cvd_asm_yuv422_to_grey:
+.globl cvd_asm_yuv422_to_grey
+       .type   cvd_asm_yuv422_to_grey, @function
+cvd_asm_yuv422_to_grey:
        pushl   %ebp
        movl    %esp, %ebp
        pushl   %eax
@@ -45,3 +48,4 @@
        popl    %eax
        popl    %ebp
        ret
+       .size   cvd_asm_yuv422_to_grey, .-cvd_asm_yuv422_to_grey

Index: cvd_src/i686/yuv422_to_rgb.s
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/i686/yuv422_to_rgb.s,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cvd_src/i686/yuv422_to_rgb.s        13 May 2008 08:08:53 -0000      1.3
+++ cvd_src/i686/yuv422_to_rgb.s        13 May 2008 12:45:34 -0000      1.4
@@ -1,6 +1,7 @@
        .text
-.globl _cvd_asm_yuv422_to_rgb
-_cvd_asm_yuv422_to_rgb:        
+.globl cvd_asm_yuv422_to_rgb
+       .type   cvd_asm_yuv422_to_rgb, @function
+cvd_asm_yuv422_to_rgb: 
        pushl   %ebp
        movl    %esp, %ebp
        subl    $16, %esp
@@ -136,3 +137,4 @@
        emms
        leave
        ret
+       .size   cvd_asm_yuv422_to_rgb, .-cvd_asm_yuv422_to_rgb




reply via email to

[Prev in Thread] Current Thread [Next in Thread]