14275 crt object .comment sections should be string mergeable
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>
diff --git a/usr/src/lib/crt/amd64/crti.s b/usr/src/lib/crt/amd64/crti.s
index 14e71e0..3be609e 100644
--- a/usr/src/lib/crt/amd64/crti.s
+++ b/usr/src/lib/crt/amd64/crti.s
@@ -24,6 +24,7 @@
*/
.file "crti.s"
+ .ident ""
/*
* These crt*.o modules are provided as the bare minimum required
diff --git a/usr/src/lib/crt/amd64/crtn.s b/usr/src/lib/crt/amd64/crtn.s
index 70b73b8..22379f0 100644
--- a/usr/src/lib/crt/amd64/crtn.s
+++ b/usr/src/lib/crt/amd64/crtn.s
@@ -24,6 +24,7 @@
*/
.file "crtn.s"
+ .ident ""
/*
* These crt*.o modules are provided as the bare minimum required
diff --git a/usr/src/lib/crt/amd64/mach-crt1.s b/usr/src/lib/crt/amd64/mach-crt1.s
index 9a334f8..6e3c466 100644
--- a/usr/src/lib/crt/amd64/mach-crt1.s
+++ b/usr/src/lib/crt/amd64/mach-crt1.s
@@ -27,6 +27,7 @@
#include <sys/asm_linkage.h>
.file "mach-crt1.s"
+ .ident ""
.global _start_crt
diff --git a/usr/src/lib/crt/i386/crti.s b/usr/src/lib/crt/i386/crti.s
index 8e63051..40dff93 100644
--- a/usr/src/lib/crt/i386/crti.s
+++ b/usr/src/lib/crt/i386/crti.s
@@ -38,6 +38,7 @@
*/
.file "crti.s"
+ .ident ""
/*
* Note that when _init and _fini are called the stack needs to be 16-byte
diff --git a/usr/src/lib/crt/i386/crtn.s b/usr/src/lib/crt/i386/crtn.s
index 413c102..c5fb7d7 100644
--- a/usr/src/lib/crt/i386/crtn.s
+++ b/usr/src/lib/crt/i386/crtn.s
@@ -34,6 +34,7 @@
* For further details - see bug#4433015
*/
.file "crtn.s"
+ .ident ""
/*
* _init function epilogue
diff --git a/usr/src/lib/crt/i386/fsr.s b/usr/src/lib/crt/i386/fsr.s
index bafc280..a244fd8 100644
--- a/usr/src/lib/crt/i386/fsr.s
+++ b/usr/src/lib/crt/i386/fsr.s
@@ -27,6 +27,7 @@
#include <sys/asm_linkage.h>
.file "fsr.s"
+ .ident ""
.section .data
.align 4
diff --git a/usr/src/lib/crt/i386/mach-crt1.s b/usr/src/lib/crt/i386/mach-crt1.s
index 1824d41..ba7dcf5 100644
--- a/usr/src/lib/crt/i386/mach-crt1.s
+++ b/usr/src/lib/crt/i386/mach-crt1.s
@@ -26,6 +26,7 @@
#include <sys/asm_linkage.h>
.file "mach-crt1.s"
+ .ident ""
/* global entities defined elsewhere but used here */
.globl _start_crt
diff --git a/usr/src/lib/crt/sparc/crti.s b/usr/src/lib/crt/sparc/crti.s
index c457355..8186bd4 100644
--- a/usr/src/lib/crt/sparc/crti.s
+++ b/usr/src/lib/crt/sparc/crti.s
@@ -1,4 +1,4 @@
-/*
+y/*
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
@@ -34,7 +34,8 @@
* For further details - see bug#4433015
*/
- .file "crti.s"
+ .file "crti.s"
+ .ident ""
#include <sys/asm_linkage.h>
diff --git a/usr/src/lib/crt/sparc/crtn.s b/usr/src/lib/crt/sparc/crtn.s
index 002bd6f..bb8c829 100644
--- a/usr/src/lib/crt/sparc/crtn.s
+++ b/usr/src/lib/crt/sparc/crtn.s
@@ -33,7 +33,8 @@
* For further details - see bug#4433015
*/
- .file "crtn.s"
+ .file "crtn.s"
+ .ident ""
/*
* _init function epilogue
diff --git a/usr/src/lib/crt/sparc/mach-crt1.s b/usr/src/lib/crt/sparc/mach-crt1.s
index 989a697..2e84006 100644
--- a/usr/src/lib/crt/sparc/mach-crt1.s
+++ b/usr/src/lib/crt/sparc/mach-crt1.s
@@ -13,13 +13,14 @@
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-
+
/* Copyright 2016, Richard Lowe. */
#include <sys/asm_linkage.h>
#include <sys/stack.h>
.file "mach-crt1.s"
+ .ident ""
.global _start_crt
@@ -61,7 +62,7 @@
*
* and an exit handler from the linker is in %g1
*/
- clr %fp ! don't trace the stack past this point
+ clr %fp ! don't trace the stack past this point
add %sp, WINDOWSIZE + STACK_BIAS, %l0 ! address of argc