]> err.no Git - linux-2.6/commitdiff
Blackfin arch: add proper ENDPROC()
authorMike Frysinger <michael.frysinger@analog.com>
Mon, 11 Jun 2007 07:31:30 +0000 (15:31 +0800)
committerBryan Wu <bryan.wu@analog.com>
Mon, 11 Jun 2007 07:31:30 +0000 (15:31 +0800)
add proper ENDPROC() to close out assembly functions
so size/type is set properly in the final ELF image

Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
21 files changed:
arch/blackfin/kernel/entry.S
arch/blackfin/lib/divsi3.S
arch/blackfin/lib/ins.S
arch/blackfin/lib/memchr.S
arch/blackfin/lib/memcmp.S
arch/blackfin/lib/memcpy.S
arch/blackfin/lib/memmove.S
arch/blackfin/lib/memset.S
arch/blackfin/lib/modsi3.S
arch/blackfin/lib/outs.S
arch/blackfin/lib/smulsi3_highpart.S
arch/blackfin/lib/udivsi3.S
arch/blackfin/lib/umodsi3.S
arch/blackfin/lib/umulsi3_highpart.S
arch/blackfin/mach-common/cache.S
arch/blackfin/mach-common/cacheinit.S
arch/blackfin/mach-common/cplbhdlr.S
arch/blackfin/mach-common/cplbmgr.S
arch/blackfin/mach-common/entry.S
arch/blackfin/mach-common/interrupt.S
arch/blackfin/mach-common/lock.S

index 5880b270bd5006b7a2a4fe824543cd01a16a5600..65c5ba4260b0042d078aac225960eedf48acef3f 100644 (file)
@@ -58,10 +58,12 @@ ENTRY(_ret_from_fork)
        RESTORE_ALL_SYS
        p0 = reti;
        jump (p0);
+ENDPROC(_ret_from_fork)
 
 ENTRY(_sys_fork)
        r0 = -EINVAL;
        rts;
+ENDPROC(_sys_fork)
 
 ENTRY(_sys_vfork)
        r0 = sp;
@@ -72,6 +74,7 @@ ENTRY(_sys_vfork)
        SP += 12;
        rets = [sp++];
        rts;
+ENDPROC(_sys_vfork)
 
 ENTRY(_sys_clone)
        r0 = sp;
@@ -82,6 +85,7 @@ ENTRY(_sys_clone)
        SP += 12;
        rets = [sp++];
        rts;
+ENDPROC(_sys_clone)
 
 ENTRY(_sys_rt_sigreturn)
        r0 = sp;
@@ -92,3 +96,4 @@ ENTRY(_sys_rt_sigreturn)
        SP += 12;
        rets = [sp++];
        rts;
+ENDPROC(_sys_rt_sigreturn)
index 3e29861852b22ba9e6e172d408a421721277fb7d..2ac59c70dd94276bc7c769146bf763f6f4b3ba4e 100644 (file)
@@ -44,6 +44,7 @@
  */
 
 .global   ___divsi3;
+.type ___divsi3, STT_FUNC;
 
 #ifdef CONFIG_ARITHMETIC_OPS_L1
 .section .l1.text
@@ -214,3 +215,5 @@ ___divsi3 :
 .Lret_zero:
   R0 = 0;
   RTS;
+
+.size ___divsi3, .-___divsi3
index 7d5e9846311d717e46d8e082af7845796c9dcb8b..a17cc77ac36f2faefcf9ffa8d214691aa7682f2d 100644 (file)
@@ -46,7 +46,7 @@ ENTRY(_insl)
 .Llong_loop_e:         NOP;
        sti R3;
        RTS;
-
+ENDPROC(_insl)
 
 ENTRY(_insw)
        P0 = R0;        /* P0 = port */
@@ -61,6 +61,7 @@ ENTRY(_insw)
 .Lword_loop_e:         NOP;
        sti R3;
        RTS;
+ENDPROC(_insw)
 
 ENTRY(_insb)
        P0 = R0;        /* P0 = port */
@@ -75,3 +76,4 @@ ENTRY(_insb)
 .Lbyte_loop_e:  NOP;
        sti R3;
        RTS;
+ENDPROC(_insb)
index 498122250d0768091bbc5c20dd0c93cc050e4999..5da428134d32b9f75cad800f42c8bf332ad9f908 100644 (file)
@@ -67,4 +67,4 @@ ENTRY(_memchr)
        R0 += -1;
        RTS;
 
-.size _memchr,.-_memchr
+ENDPROC(_memchr)
index 5b9502368fc6ab0634428c0d9245a6056e4841be..a6b8ee6a6bf2cb959b68ddf2f8a5c9ddd1d36204 100644 (file)
@@ -107,4 +107,4 @@ ENTRY(_memcmp)
        P3 = I1;
        RTS;
 
-.size _memcmp,.-_memcmp
+ENDPROC(_memcmp)
index c1e00eff541c2d35c69fe88880218fa64cdf90c7..34b5a91c215c28c3bd8315b0a77ec3d180d0ee1d 100644 (file)
@@ -140,3 +140,5 @@ ENTRY(_memcpy)
        B[P0--] = R1;
 
        RTS;
+
+ENDPROC(_memcpy)
index 2e5fb7f8df13204e74a4a72d844543b0e6a98720..c371585e9dbd93eb70699abe45dc2d0d634eab84 100644 (file)
@@ -100,4 +100,4 @@ ENTRY(_memmove)
        P3 = I1;
        RTS;
 
-.size _memmove,.-_memmove
+ENDPROC(_memmove)
index ba6d047568ddd50771018c83f37315fe417ef8fb..8159136a29ea2e355ee183d189607d232d14aac2 100644 (file)
@@ -106,4 +106,4 @@ ENTRY(_memset)
        B[P0++] = R1;
        JUMP .Laligned;
 
-.size _memset,.-_memset
+ENDPROC(_memset)
index 528b8b1ccb34db77eb4b1da3dcc1bb43c6ff1557..ca1dd3973b3958424a6148db94217a1622eed291 100644 (file)
@@ -77,3 +77,5 @@ ___modsi3:
        R0 = 0;
 .LRETURN_R0:
        RTS;
+
+.size ___modsi3, .-___modsi3
index f8c876fe8930b7dccf1be5653090a70c271857fc..4c3da8ae094ece20119b6181a9b5991b968ad144 100644 (file)
@@ -40,6 +40,7 @@ ENTRY(_outsl)
 .Llong_loop_s: R0 = [P1++];
 .Llong_loop_e: [P0] = R0;
        RTS;
+ENDPROC(_outsl)
 
 ENTRY(_outsw)
        P0 = R0;        /* P0 = port */
@@ -50,6 +51,7 @@ ENTRY(_outsw)
 .Lword_loop_s: R0 = W[P1++];
 .Lword_loop_e: W[P0] = R0;
        RTS;
+ENDPROC(_outsw)
 
 ENTRY(_outsb)
        P0 = R0;        /* P0 = port */
@@ -60,3 +62,4 @@ ENTRY(_outsb)
 .Lbyte_loop_s: R0 = B[P1++];
 .Lbyte_loop_e: B[P0] = R0;
        RTS;
+ENDPROC(_outsb)
index 10b8f8da576f6cc6c3c079e37d8c3e861e27d60c..e383cd3eca5d9c428e605b144290b4477b57bba3 100644 (file)
@@ -28,3 +28,5 @@ ___smulsi3_highpart:
 
        R0 = R0 + R1;
        RTS;
+
+.size ___smulsi3_highpart, .-___smulsi3_highpart
index d39a129162591748dfaaa9f0b0bb5b2bc6eedb56..58fd96d747665fd8a2f3c8568de1af547c970213 100644 (file)
@@ -296,3 +296,5 @@ ENTRY(___udivsi3)
   R1 = R0 - R3;
   IF CC R0 = R1;
   RTS;
+
+ENDPROC(___udivsi3)
index b55ce96ab89f370d2cda493f21b1c7af81ab6522..4f2b76ee76265fc040dc2a51f8792f3933190ba9 100644 (file)
@@ -34,7 +34,9 @@
 #endif
 
 .extern ___udivsi3;
+.type ___udivsi3, STT_FUNC;
 .globl ___umodsi3
+.type ___umodsi3, STT_FUNC;
 ___umodsi3:
 
        CC=R0==0;
@@ -64,3 +66,5 @@ ___umodsi3:
        R0 = 0;
 .LRETURN_R0:
        RTS;
+
+.size ___umodsi3, .-___umodsi3
index aac8218fb25800e3c292a4b9c2c4914025565a7f..67b799351e3e845ba9da8ff0100d9f5e3d2010e3 100644 (file)
@@ -21,3 +21,5 @@ ___umulsi3_highpart:
        R1 = PACK(R1.l,R0.h);
        R0 = R1 + R2;
        RTS;
+
+.size ___umulsi3_highpart, .-___umulsi3_highpart
index bb9446ef66efa71d60e329106b513ce4d436e58c..8bd2af1935bd022f0e251766df5f57616ef1298f 100644 (file)
@@ -70,6 +70,7 @@ ENTRY(_cache_invalidate)
 .Lno_dcache_b:
        R7 = [SP++];
        RTS;
+ENDPROC(_cache_invalidate)
 
 /* Invalidate the Entire Instruction cache by
  * disabling IMC bit
@@ -106,6 +107,8 @@ ENTRY(_invalidate_entire_icache)
 
        ( R7:5) = [SP++];
        RTS;
+ENDPROC(_invalidate_entire_icache)
+ENDPROC(_icache_invalidate)
 
 /*
  * blackfin_cache_flush_range(start, end)
@@ -129,6 +132,7 @@ ENTRY(_blackfin_icache_flush_range)
        IFLUSH [P0];
        SSYNC;
        RTS;
+ENDPROC(_blackfin_icache_flush_range)
 
 /*
  * blackfin_icache_dcache_flush_range(start, end)
@@ -155,6 +159,7 @@ ENTRY(_blackfin_icache_dcache_flush_range)
        FLUSH [P0];
        SSYNC;
        RTS;
+ENDPROC(_blackfin_icache_dcache_flush_range)
 
 /* Throw away all D-cached data in specified region without any obligation to
  * write them back. However, we must clean the D-cached entries around the
@@ -183,6 +188,7 @@ ENTRY(_blackfin_dcache_invalidate_range)
        FLUSHINV[P0];
        SSYNC;
        RTS;
+ENDPROC(_blackfin_dcache_invalidate_range)
 
 /* Invalidate the Entire Data cache by
  * clearing DMC[1:0] bits
@@ -221,6 +227,8 @@ ENTRY(_dcache_invalidate)
 
        ( R7:6) = [SP++];
        RTS;
+ENDPROC(_dcache_invalidate)
+ENDPROC(_invalidate_entire_dcache)
 
 ENTRY(_blackfin_dcache_flush_range)
        R2 = -L1_CACHE_BYTES;
@@ -241,6 +249,7 @@ ENTRY(_blackfin_dcache_flush_range)
        FLUSH[P0];
        SSYNC;
        RTS;
+ENDPROC(_blackfin_dcache_flush_range)
 
 ENTRY(_blackfin_dflush_page)
        P1 = 1 << (PAGE_SHIFT - L1_CACHE_SHIFT);
@@ -251,3 +260,4 @@ ENTRY(_blackfin_dflush_page)
 .Lfl1: FLUSH [P0++];
        SSYNC;
        RTS;
+ENDPROC(_blackfin_dflush_page)
index 8c17f099e5ebc11cbe080ba208d00a2834429b7a..7924a90d9658ef900d04aa390ec9f13a514b68fb 100644 (file)
@@ -86,6 +86,8 @@ ENTRY(_bfin_icache_init)
        SSYNC;
        STI R2;
        RTS;
+
+ENDPROC(_bfin_icache_init)
 #endif
 
 #if defined(CONFIG_BLKFIN_DCACHE)
@@ -134,4 +136,6 @@ ENTRY(_bfin_dcache_init)
        SSYNC;
        STI R2;
        RTS;
+
+ENDPROC(_bfin_dcache_init)
 #endif
index b979067c49ef90f7e6283cd06dcbdfe276584c9c..2f3c72c239977e77f6b8cc5e60a2c453dfa3cec5 100644 (file)
@@ -42,8 +42,6 @@
 
 .align 2
 
-.global __cplb_hdr;
-.type __cplb_hdr, STT_FUNC;
 ENTRY(__cplb_hdr)
        R2 = SEQSTAT;
 
@@ -128,3 +126,5 @@ ENTRY(__cplb_hdr)
        call _panic_cplb_error;
        SP += 12;
        JUMP _handle_bad_cplb;
+
+ENDPROC(__cplb_hdr)
index f5efc4bc65e67cd6c009a10d03bf5b8dca4f6bb9..e4b47e09cf1311b0123450027ba7a08570cabc8b 100644 (file)
@@ -592,6 +592,7 @@ ENTRY(_cplb_mgr)
        ( R7:4,P5:3 ) = [SP++];
        R0 = CPLB_RELOADED;
        RTS;
+ENDPROC(_cplb_mgr)
 
 .data
 .align 4;
index 7d0368772cdaeccef29ac1af645e4d701fe74f2c..40045b1386ad888d608fd80d02de1dbb5341ecd8 100644 (file)
@@ -103,6 +103,7 @@ ENTRY(_ex_dcplb)
        if !cc jump _return_from_exception;
        /* fall through */
 #endif
+ENDPROC(_ex_dcplb)
 
 ENTRY(_ex_icplb)
        (R7:6,P5:4) = [sp++];
@@ -113,6 +114,7 @@ ENTRY(_ex_icplb)
        RESTORE_ALL_SYS
        SP = RETN;
        rtx;
+ENDPROC(_ex_icplb)
 
 ENTRY(_ex_spinlock)
        /* Transform this into a syscall - twiddle the syscall vector.  */
@@ -123,6 +125,7 @@ ENTRY(_ex_spinlock)
        [p5] = r7;
        csync;
        /* Fall through.  */
+ENDPROC(_ex_spinlock)
 
 ENTRY(_ex_syscall)
        DEBUG_START_HWTRACE
@@ -131,6 +134,7 @@ ENTRY(_ex_syscall)
        raise 15;               /* invoked by TRAP #0, for sys call */
        sp = retn;
        rtx
+ENDPROC(_ex_syscall)
 
 ENTRY(_spinlock_bh)
        SAVE_ALL_SYS
@@ -150,12 +154,14 @@ ENTRY(_spinlock_bh)
        [SP + PT_R0] = R0;
        RESTORE_ALL_SYS
        rti;
+ENDPROC(_spinlock_bh)
 
 ENTRY(_ex_soft_bp)
        r7 = retx;
        r7 += -2;
        retx = r7;
        jump.s _ex_trap_c;
+ENDPROC(_ex_soft_bp)
 
 ENTRY(_ex_single_step)
        r7 = retx;
@@ -191,6 +197,7 @@ _return_from_exception:
        ASTAT = [sp++];
        sp = retn;
        rtx;
+ENDPROC(_ex_soft_bp)
 
 ENTRY(_handle_bad_cplb)
        /* To get here, we just tried and failed to change a CPLB
@@ -250,6 +257,7 @@ ENTRY(_ex_trap_c)
        SP = RETN;
        raise 5;
        rtx;
+ENDPROC(_ex_trap_c)
 
 ENTRY(_exception_to_level5)
        SAVE_ALL_SYS
@@ -314,6 +322,7 @@ ENTRY(_exception_to_level5)
        call _ret_from_exception;
        RESTORE_ALL_SYS
        rti;
+ENDPROC(_exception_to_level5)
 
 ENTRY(_trap) /* Exception: 4th entry into system event table(supervisor mode)*/
        /* Since the kernel stack can be anywhere, it's not guaranteed to be
@@ -342,6 +351,7 @@ ENTRY(_trap) /* Exception: 4th entry into system event table(supervisor mode)*/
        r7 = -ENOSYS;           /* signextending enough */
        [sp + PT_R0] = r7;      /* return value from system call */
        jump .Lsyscall_really_exit;
+ENDPROC(_trap)
 
 ENTRY(_kernel_execve)
        link SIZEOF_PTREGS;
@@ -396,6 +406,7 @@ ENTRY(_kernel_execve)
 1:
        unlink;
        rts;
+ENDPROC(_kernel_execve)
 
 ENTRY(_system_call)
        /* Store IPEND */
@@ -503,6 +514,7 @@ ENTRY(_system_call)
        r5 = [sp + PT_RESERVED];
        rets = r5;
        rts;
+ENDPROC(_system_call)
 
 _sys_trace:
        call _syscall_trace;
@@ -531,6 +543,7 @@ _sys_trace:
 
        call _syscall_trace;
        jump .Lresume_userspace;
+ENDPROC(_sys_trace)
 
 ENTRY(_resume)
        /*
@@ -580,6 +593,7 @@ _new_old_task:
         * in "new" task.
         */
        rts;
+ENDPROC(_resume)
 
 ENTRY(_ret_from_exception)
        p2.l = lo(IPEND);
@@ -638,6 +652,7 @@ ENTRY(_ret_from_exception)
        syscfg = r0;
 5:
        rts;
+ENDPROC(_ret_from_exception)
 
 ENTRY(_return_from_int)
        /* If someone else already raised IRQ 15, do nothing.  */
@@ -680,6 +695,7 @@ ENTRY(_return_from_int)
        rti;
 2:
        rts;
+ENDPROC(_return_from_int)
 
 ENTRY(_lower_to_irq14)
 #if defined(ANOMALY_05000281)
@@ -745,6 +761,7 @@ _schedule_and_signal:
 1:
        RESTORE_CONTEXT
        rti;
+ENDPROC(_lower_to_irq14)
 
 /* Make sure when we start, that the circular buffer is initialized properly
  * R0 and P0 are call clobbered, so we can use them here.
@@ -758,6 +775,7 @@ ENTRY(_init_exception_buff)
        p0.l = _out_ptr_excause;
        [p0] = r0;
        rts;
+ENDPROC(_init_exception_buff)
 
 /*
  * Put these in the kernel data section - that should always be covered by
index dd45664f0d029055328adacaf8e8d367d6254bb9..b69f517a650b839f43e1768dc8242ede9d7611f3 100644 (file)
@@ -66,6 +66,7 @@ ENTRY(_evt_emulation)
        SP += 12;
        /* - GDB stub fills this in by itself (if defined) */
        rte;
+ENDPROC(_evt_emulation)
 #endif
 
 /* Common interrupt entry code.         First we do CLI, then push
@@ -251,3 +252,4 @@ ENTRY(_evt_system_call)
 #endif
        call _system_call;
        jump .Lcommon_restore_context;
+ENDPROC(_evt_system_call)
index 2cbb15b339254dbb46e865fa1da44214fea238a1..386ac8dda076c831d2a1d6a5489dece44db9ff49 100644 (file)
@@ -155,6 +155,7 @@ ENTRY(_cache_grab_lock)
        ( R7:0,P5:0 ) = [SP++];
 
        RTS;
+ENDPROC(_cache_grab_lock)
 
 /* After the execution of critical code, the code is now locked into
  * the cache way. Now we need to set ILOC.
@@ -186,6 +187,7 @@ ENTRY(_cache_lock)
 
        ( R7:0,P5:0 ) = [SP++];
        RTS;
+ENDPROC(_cache_lock)
 
 #endif /* BLKFIN_CACHE_LOCK */
 
@@ -193,7 +195,6 @@ ENTRY(_cache_lock)
  */
 
 ENTRY(_read_iloc)
-
        P1.H = (IMEM_CONTROL >> 16);
        P1.L = (IMEM_CONTROL & 0xFFFF);
        R1 = 0xF;
@@ -202,3 +203,4 @@ ENTRY(_read_iloc)
        R0 = R0 & R1;
 
        RTS;
+ENDPROC(_read_iloc)