From a5e01acec5aad9ddbe58e73c087304a450c8e84e Mon Sep 17 00:00:00 2001
From: kib <kib@FreeBSD.org>
Date: Fri, 7 Jan 2011 16:08:40 +0000
Subject: Add section .note.GNU-stack for assembly files used by 386 and amd64.

---
 lib/libc/amd64/gen/_setjmp.S      | 2 ++
 lib/libc/amd64/gen/fabs.S         | 2 ++
 lib/libc/amd64/gen/modf.S         | 2 ++
 lib/libc/amd64/gen/rfork_thread.S | 2 ++
 lib/libc/amd64/gen/setjmp.S       | 2 ++
 lib/libc/amd64/gen/sigsetjmp.S    | 2 ++
 lib/libc/amd64/stdlib/div.S       | 2 ++
 lib/libc/amd64/stdlib/ldiv.S      | 2 ++
 lib/libc/amd64/stdlib/lldiv.S     | 2 ++
 lib/libc/amd64/string/bcmp.S      | 2 ++
 lib/libc/amd64/string/bcopy.S     | 2 ++
 lib/libc/amd64/string/bzero.S     | 2 ++
 lib/libc/amd64/string/memcmp.S    | 2 ++
 lib/libc/amd64/string/memmove.S   | 2 ++
 lib/libc/amd64/string/memset.S    | 2 ++
 lib/libc/amd64/string/strcat.S    | 2 ++
 lib/libc/amd64/string/strcmp.S    | 2 ++
 lib/libc/amd64/string/strcpy.S    | 2 ++
 lib/libc/amd64/sys/brk.S          | 2 ++
 lib/libc/amd64/sys/cerror.S       | 1 +
 lib/libc/amd64/sys/exect.S        | 2 ++
 lib/libc/amd64/sys/getcontext.S   | 2 ++
 lib/libc/amd64/sys/pipe.S         | 2 ++
 lib/libc/amd64/sys/ptrace.S       | 2 ++
 lib/libc/amd64/sys/reboot.S       | 2 ++
 lib/libc/amd64/sys/sbrk.S         | 2 ++
 lib/libc/amd64/sys/setlogin.S     | 2 ++
 lib/libc/amd64/sys/sigreturn.S    | 2 ++
 lib/libc/amd64/sys/vfork.S        | 2 ++
 29 files changed, 57 insertions(+)

(limited to 'lib/libc/amd64')

diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S
index 38c3c6f..9035632 100644
--- a/lib/libc/amd64/gen/_setjmp.S
+++ b/lib/libc/amd64/gen/_setjmp.S
@@ -92,3 +92,5 @@ ENTRY(___longjmp)
 1:	movq	%rcx,0(%rsp)
 	ret
 END(___longjmp)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/gen/fabs.S b/lib/libc/amd64/gen/fabs.S
index 8c0c8bf..2ace0f9 100644
--- a/lib/libc/amd64/gen/fabs.S
+++ b/lib/libc/amd64/gen/fabs.S
@@ -42,3 +42,5 @@ END(fabs)
 	.data
 signbit:
 	.quad	0x8000000000000000
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/gen/modf.S b/lib/libc/amd64/gen/modf.S
index 4fee38b..691aad8 100644
--- a/lib/libc/amd64/gen/modf.S
+++ b/lib/libc/amd64/gen/modf.S
@@ -87,3 +87,5 @@ ENTRY(modf)
 
 	ret
 END(modf)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/gen/rfork_thread.S b/lib/libc/amd64/gen/rfork_thread.S
index c34a940..9720e08 100644
--- a/lib/libc/amd64/gen/rfork_thread.S
+++ b/lib/libc/amd64/gen/rfork_thread.S
@@ -100,3 +100,5 @@ ENTRY(rfork_thread)
 	jmp	HIDENAME(cerror)
 #endif
 END(rfork_thread)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/gen/setjmp.S b/lib/libc/amd64/gen/setjmp.S
index 41de587..1409f4c 100644
--- a/lib/libc/amd64/gen/setjmp.S
+++ b/lib/libc/amd64/gen/setjmp.S
@@ -110,3 +110,5 @@ ENTRY(__longjmp)
 1:	movq	%rcx,0(%rsp)
 	ret
 END(__longjmp)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/amd64/gen/sigsetjmp.S
index 8da4867..438d440 100644
--- a/lib/libc/amd64/gen/sigsetjmp.S
+++ b/lib/libc/amd64/gen/sigsetjmp.S
@@ -111,3 +111,5 @@ ENTRY(__siglongjmp)
 1:	movq	%rcx,0(%rsp)
 	ret
 END(__siglongjmp)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/stdlib/div.S b/lib/libc/amd64/stdlib/div.S
index f3c2a59..366010c 100644
--- a/lib/libc/amd64/stdlib/div.S
+++ b/lib/libc/amd64/stdlib/div.S
@@ -16,3 +16,5 @@ ENTRY(div)
 	orq	%rdx,%rax
 	ret
 END(div)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/stdlib/ldiv.S b/lib/libc/amd64/stdlib/ldiv.S
index 2a0a8cf..f11472c 100644
--- a/lib/libc/amd64/stdlib/ldiv.S
+++ b/lib/libc/amd64/stdlib/ldiv.S
@@ -14,3 +14,5 @@ ENTRY(ldiv)
 	idivq	%rsi
 	ret
 END(ldiv)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/stdlib/lldiv.S b/lib/libc/amd64/stdlib/lldiv.S
index e5ae5ca..4dab0fd 100644
--- a/lib/libc/amd64/stdlib/lldiv.S
+++ b/lib/libc/amd64/stdlib/lldiv.S
@@ -14,3 +14,5 @@ ENTRY(lldiv)
 	idivq	%rsi
 	ret
 END(lldiv)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/string/bcmp.S b/lib/libc/amd64/string/bcmp.S
index 375c3bc..d01b76b 100644
--- a/lib/libc/amd64/string/bcmp.S
+++ b/lib/libc/amd64/string/bcmp.S
@@ -23,3 +23,5 @@ L1:
 	movsbl	%al,%eax
 	ret
 END(bcmp)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/string/bcopy.S b/lib/libc/amd64/string/bcopy.S
index f7aa6d1..cc38f47 100644
--- a/lib/libc/amd64/string/bcopy.S
+++ b/lib/libc/amd64/string/bcopy.S
@@ -95,3 +95,5 @@ END(memmove)
 END(bcopy)
 #endif
 #endif
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/string/bzero.S b/lib/libc/amd64/string/bzero.S
index 0de67d3..cf46a2a 100644
--- a/lib/libc/amd64/string/bzero.S
+++ b/lib/libc/amd64/string/bzero.S
@@ -42,3 +42,5 @@ L1:	movq	%rsi,%rcx		/* zero remainder by bytes */
 
 	ret
 END(bzero)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/string/memcmp.S b/lib/libc/amd64/string/memcmp.S
index a039b5b..66d64a0 100644
--- a/lib/libc/amd64/string/memcmp.S
+++ b/lib/libc/amd64/string/memcmp.S
@@ -40,3 +40,5 @@ L6:	xorl	%eax,%eax		/* Perform unsigned comparison	*/
 	subl    %edx,%eax
 	ret
 END(memcmp)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/string/memmove.S b/lib/libc/amd64/string/memmove.S
index 85beb26..a303c60 100644
--- a/lib/libc/amd64/string/memmove.S
+++ b/lib/libc/amd64/string/memmove.S
@@ -3,3 +3,5 @@
 
 #define MEMMOVE
 #include "bcopy.S"
+
+	.section .note.GNU-stack,"",%progbist
diff --git a/lib/libc/amd64/string/memset.S b/lib/libc/amd64/string/memset.S
index ed8ba24..84d1562 100644
--- a/lib/libc/amd64/string/memset.S
+++ b/lib/libc/amd64/string/memset.S
@@ -59,3 +59,5 @@ L1:	rep
 
 	ret
 END(memset)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/string/strcat.S b/lib/libc/amd64/string/strcat.S
index b241ffc..7b5a1dd 100644
--- a/lib/libc/amd64/string/strcat.S
+++ b/lib/libc/amd64/string/strcat.S
@@ -164,3 +164,5 @@ ENTRY(strcat)
 .Ldone:
 	ret
 END(strcat)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/string/strcmp.S b/lib/libc/amd64/string/strcmp.S
index 81f54cb..07009c1 100644
--- a/lib/libc/amd64/string/strcmp.S
+++ b/lib/libc/amd64/string/strcmp.S
@@ -72,3 +72,5 @@ ENTRY(strcmp)
 	subq	%rdx,%rax
 	ret
 END(strcmp)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/string/strcpy.S b/lib/libc/amd64/string/strcpy.S
index 8cafa12..5feb925 100644
--- a/lib/libc/amd64/string/strcpy.S
+++ b/lib/libc/amd64/string/strcpy.S
@@ -110,3 +110,5 @@ ENTRY(strcpy)
 .Ldone:
 	ret
 END(strcpy)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/sys/brk.S b/lib/libc/amd64/sys/brk.S
index c25daff..2319417 100644
--- a/lib/libc/amd64/sys/brk.S
+++ b/lib/libc/amd64/sys/brk.S
@@ -83,3 +83,5 @@ err:
 	jmp	HIDENAME(cerror)
 #endif
 END(brk)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/sys/cerror.S b/lib/libc/amd64/sys/cerror.S
index 547a18c..d01cf4a 100644
--- a/lib/libc/amd64/sys/cerror.S
+++ b/lib/libc/amd64/sys/cerror.S
@@ -56,3 +56,4 @@ HIDENAME(cerror):
 	movq	$-1,%rdx
 	ret
 
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/sys/exect.S b/lib/libc/amd64/sys/exect.S
index 93125fa..81dc8e5 100644
--- a/lib/libc/amd64/sys/exect.S
+++ b/lib/libc/amd64/sys/exect.S
@@ -54,3 +54,5 @@ ENTRY(exect)
 	jmp	HIDENAME(cerror)
 #endif
 END(exect)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/sys/getcontext.S b/lib/libc/amd64/sys/getcontext.S
index 08a6493..ea29adb 100644
--- a/lib/libc/amd64/sys/getcontext.S
+++ b/lib/libc/amd64/sys/getcontext.S
@@ -53,3 +53,5 @@ ENTRY(__sys_getcontext)
 	jmp	HIDENAME(cerror)
 #endif
 END(__sys_getcontext)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/sys/pipe.S b/lib/libc/amd64/sys/pipe.S
index a286064..59c1ac1c 100644
--- a/lib/libc/amd64/sys/pipe.S
+++ b/lib/libc/amd64/sys/pipe.S
@@ -58,3 +58,5 @@ ENTRY(__sys_pipe)
 	jmp	HIDENAME(cerror)
 #endif
 END(__sys_pipe)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/sys/ptrace.S b/lib/libc/amd64/sys/ptrace.S
index 29ebade..6235390 100644
--- a/lib/libc/amd64/sys/ptrace.S
+++ b/lib/libc/amd64/sys/ptrace.S
@@ -58,3 +58,5 @@ err:
 	jmp	HIDENAME(cerror)
 #endif
 END(ptrace)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/sys/reboot.S b/lib/libc/amd64/sys/reboot.S
index 59df944..e79ca79 100644
--- a/lib/libc/amd64/sys/reboot.S
+++ b/lib/libc/amd64/sys/reboot.S
@@ -55,3 +55,5 @@ ENTRY(__sys_reboot)
 	jmp	HIDENAME(cerror)
 #endif
 END(__sys_reboot)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/sys/sbrk.S b/lib/libc/amd64/sys/sbrk.S
index fed3882..3e4d8aa 100644
--- a/lib/libc/amd64/sys/sbrk.S
+++ b/lib/libc/amd64/sys/sbrk.S
@@ -86,3 +86,5 @@ err:
 	jmp	HIDENAME(cerror)
 #endif
 END(sbrk)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/sys/setlogin.S b/lib/libc/amd64/sys/setlogin.S
index 649289a..23692b9 100644
--- a/lib/libc/amd64/sys/setlogin.S
+++ b/lib/libc/amd64/sys/setlogin.S
@@ -63,3 +63,5 @@ ENTRY(__sys_setlogin)
 	jmp	HIDENAME(cerror)
 #endif
 END(__sys_setlogin)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/sys/sigreturn.S b/lib/libc/amd64/sys/sigreturn.S
index 28dc227..f91816e 100644
--- a/lib/libc/amd64/sys/sigreturn.S
+++ b/lib/libc/amd64/sys/sigreturn.S
@@ -44,3 +44,5 @@ __FBSDID("$FreeBSD$");
  */
 
 RSYSCALL(sigreturn)
+
+	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libc/amd64/sys/vfork.S
index d955e5f..555c3ca 100644
--- a/lib/libc/amd64/sys/vfork.S
+++ b/lib/libc/amd64/sys/vfork.S
@@ -57,3 +57,5 @@ ENTRY(__sys_vfork)
 	jmp	HIDENAME(cerror)
 #endif
 END(__sys_vfork)
+
+	.section .note.GNU-stack,"",%progbits
-- 
cgit v1.1