summaryrefslogtreecommitdiffstats
path: root/lib/csu/amd64
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2010-12-09 21:31:21 +0000
committerdim <dim@FreeBSD.org>2010-12-09 21:31:21 +0000
commit12dd9eb8e940c48f9fc30dbc137071b4fe5caead (patch)
tree96ac8370f6f90ce1b871c6c0926f956cf19ad8a4 /lib/csu/amd64
parent3d43bf49cce8a92469a10d65a75094c9292d513d (diff)
downloadFreeBSD-src-12dd9eb8e940c48f9fc30dbc137071b4fe5caead.zip
FreeBSD-src-12dd9eb8e940c48f9fc30dbc137071b4fe5caead.tar.gz
Let all .c and .S files under lib/csu consistently use the __FBSDID()
macro for identification, instead of several different hand-rolled variants (plain .ident, .ascii, etc).
Diffstat (limited to 'lib/csu/amd64')
-rw-r--r--lib/csu/amd64/crt1.c5
-rw-r--r--lib/csu/amd64/crti.S6
-rw-r--r--lib/csu/amd64/crtn.S6
3 files changed, 9 insertions, 8 deletions
diff --git a/lib/csu/amd64/crt1.c b/lib/csu/amd64/crt1.c
index 3bc4809..998477a 100644
--- a/lib/csu/amd64/crt1.c
+++ b/lib/csu/amd64/crt1.c
@@ -24,6 +24,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#ifndef lint
#ifndef __GNUC__
#error "GCC is needed to compile this file"
@@ -92,5 +95,3 @@ __asm__("eprol:");
_init();
exit( main(argc, argv, env) );
}
-
-__asm__(".ident\t\"$FreeBSD$\"");
diff --git a/lib/csu/amd64/crti.S b/lib/csu/amd64/crti.S
index c46f001..37698ba 100644
--- a/lib/csu/amd64/crti.S
+++ b/lib/csu/amd64/crti.S
@@ -23,6 +23,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
.section .init,"ax",@progbits
.align 4
.globl _init
@@ -36,6 +39,3 @@ _init:
.type _fini,@function
_fini:
subq $8,%rsp
-
- .section .rodata
-.ascii "$FreeBSD$\0"
diff --git a/lib/csu/amd64/crtn.S b/lib/csu/amd64/crtn.S
index d6d09da..eb6d4df 100644
--- a/lib/csu/amd64/crtn.S
+++ b/lib/csu/amd64/crtn.S
@@ -23,6 +23,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
.section .init,"ax",@progbits
addq $8,%rsp
ret
@@ -30,6 +33,3 @@
.section .fini,"ax",@progbits
addq $8,%rsp
ret
-
- .section .rodata
-.ascii "$FreeBSD$\0"
OpenPOWER on IntegriCloud