Author: ian
Date: Wed Dec 31 16:15:43 2014
New Revision: 276470
URL: https://svnweb.freebsd.org/changeset/base/276470
Log:
A couple small fixes to make clang 3.5 happy... Move END(sigcode) to the
end of the actual instruction sequence for the function but before some
misc data in the text segment. This eliminates a strange "size must be
constant" error from the integrated assembler. Also, the build_pagetables
function was missing an END(), but really the problem is that it shouldn't
have an ASENTRY() because it's not a function that needs to be a global
symbol with unwind info and all, it's just a little private subroutine
used in very early kernel init.
Modified:
head/sys/arm/arm/locore-v6.S
Modified: head/sys/arm/arm/locore-v6.S
==============================================================================
--- head/sys/arm/arm/locore-v6.S Wed Dec 31 16:06:26 2014
(r276469)
+++ head/sys/arm/arm/locore-v6.S Wed Dec 31 16:15:43 2014
(r276470)
@@ -339,7 +339,7 @@ END(reinit_mmu)
*
* Addresses must be 1MiB aligned
*/
-ASENTRY_NP(build_pagetables)
+build_pagetables:
/* Set the required page attributed */
#if defined(ARM_NEW_PMAP)
ldr r4, =PTE1_V|PTE1_A|PTE1_AP_KRW|TEX1_CLASS_0
@@ -520,6 +520,7 @@ ENTRY_NP(sigcode)
/* Branch back to retry SYS_sigreturn */
b . - 16
+END(sigcode)
.word SYS_sigreturn
.word SYS_exit
@@ -532,5 +533,5 @@ ENTRY_NP(sigcode)
.global szsigcode
szsigcode:
.long esigcode-sigcode
-END(sigcode)
+
/* End of locore.S */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
