← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic

« back to all changes in this revision

Viewing changes to libavutil/arm/asm.S

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-12-21 15:32:13 UTC
  • mto: (1.2.18)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: package-import@ubuntu.com-20121221153213-fudzrugjzivtv0wp
Tags: upstream-9~beta3
Import upstream version 9~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavutil/arm/asm.S
46
46
 
47
47
#if   HAVE_NEON
48
48
        .fpu            neon
49
 
#elif HAVE_ARMVFP
 
49
#elif HAVE_VFP
50
50
        .fpu            vfp
51
51
#endif
52
52
 
89
89
\name:
90
90
.endm
91
91
 
92
 
#if !HAVE_ARMV6T2
 
92
#if !HAVE_ARMV6T2_EXTERNAL
93
93
.macro  movw    rd, val
94
94
        mov     \rd, \val &  255
95
95
        orr     \rd, \val & ~255
97
97
#endif
98
98
 
99
99
.macro  mov32   rd, val
100
 
#if HAVE_ARMV6T2
 
100
#if HAVE_ARMV6T2_EXTERNAL
101
101
        movw            \rd, #(\val) & 0xffff
102
102
    .if (\val) >> 16
103
103
        movt            \rd, #(\val) >> 16
146
146
.macro  movrel rd, val
147
147
#if CONFIG_PIC
148
148
        ldpic           \rd, \val
149
 
#elif HAVE_ARMV6T2 && !defined(__APPLE__)
 
149
#elif HAVE_ARMV6T2_EXTERNAL && !defined(__APPLE__)
150
150
        movw            \rd, #:lower16:\val
151
151
        movt            \rd, #:upper16:\val
152
152
#else