aboutsummaryrefslogtreecommitdiff
blob: 5001906978bb22da5f6699f556abb197ce640a1b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
2005-02-08  Jakub Jelinek  <jakub@redhat.com>

	* src/alpha/osf.S: Add .note.GNU-stack on Linux.
	* src/s390/sysv.S: Likewise.
	* src/powerpc/linux64.S: Likewise.
	* src/powerpc/linux64_closure.S: Likewise.
	* src/powerpc/ppc_closure.S: Likewise.
	* src/powerpc/sysv.S: Likewise.
	* src/x86/unix64.S: Likewise.
	* src/x86/sysv.S: Likewise.
	* src/sparc/v8.S: Likewise.
	* src/sparc/v9.S: Likewise.
	* src/m68k/sysv.S: Likewise.
	* src/ia64/unix.S: Likewise.
	* src/arm/sysv.S: Likewise.

	* ia64_save_regs_in_stack.s: Moved to...
	* ia64_save_regs_in_stack.S: ... this.  Add .note.GNU-stack
	on Linux.

--- libffi/src/alpha/osf.S.jj	2003-10-23 09:55:21.000000000 +0200
+++ libffi/src/alpha/osf.S	2005-02-08 16:12:40.215425842 +0100
@@ -352,4 +352,8 @@ $LASFDE3:
 	.byte	0x12	 # uleb128 0x12
 	.align 3
 $LEFDE3:
+
+#ifdef __linux__
+	.section	.note.GNU-stack,"",@progbits
+#endif
 #endif
--- libffi/src/s390/sysv.S.jj	2003-10-23 09:55:21.000000000 +0200
+++ libffi/src/s390/sysv.S	2005-02-08 16:22:30.810943388 +0100
@@ -427,3 +427,6 @@ ffi_closure_SYSV:
 
 #endif
 
+#if defined __ELF__ && defined __linux__
+	.section	.note.GNU-stack,"",@progbits
+#endif
--- libffi/src/powerpc/linux64.S.jj	2004-09-03 12:35:54.000000000 +0200
+++ libffi/src/powerpc/linux64.S	2005-02-08 16:18:41.998808639 +0100
@@ -174,3 +174,7 @@ ffi_call_LINUX64:
 	.align 3
 .LEFDE1:
 #endif
+
+#if defined __ELF__ && defined __linux__
+	.section	.note.GNU-stack,"",@progbits
+#endif
--- libffi/src/powerpc/linux64_closure.S.jj	2004-09-03 12:35:54.000000000 +0200
+++ libffi/src/powerpc/linux64_closure.S	2005-02-08 16:18:53.821697060 +0100
@@ -203,3 +203,7 @@ ffi_closure_LINUX64:
 	.align 3
 .LEFDE1:
 #endif
+
+#if defined __ELF__ && defined __linux__
+	.section	.note.GNU-stack,"",@progbits
+#endif
--- libffi/src/powerpc/ppc_closure.S.jj	2004-09-03 12:35:54.000000000 +0200
+++ libffi/src/powerpc/ppc_closure.S	2005-02-08 16:18:25.734713428 +0100
@@ -248,3 +248,7 @@ END(ffi_closure_SYSV)
 .LEFDE1:
 
 #endif
+
+#if defined __ELF__ && defined __linux__
+	.section	.note.GNU-stack,"",@progbits
+#endif
--- libffi/src/powerpc/sysv.S.jj	2004-09-03 12:35:54.000000000 +0200
+++ libffi/src/powerpc/sysv.S	2005-02-08 16:18:13.673867518 +0100
@@ -187,3 +187,7 @@ END(ffi_call_SYSV)
       .align 2
 .LEFDE1:
 #endif
+
+#if defined __ELF__ && defined __linux__
+	.section	.note.GNU-stack,"",@progbits
+#endif
--- libffi/src/x86/unix64.S.jj	2004-12-27 13:01:37.000000000 +0100
+++ libffi/src/x86/unix64.S	2005-02-08 16:25:38.656395947 +0100
@@ -373,3 +373,7 @@ ffi_closure_unix64:
 .LEFDE3:
 
 #endif /* __x86_64__ */
+
+#if defined __ELF__ && defined __linux__
+	.section	.note.GNU-stack,"",@progbits
+#endif
--- libffi/src/x86/sysv.S.jj	2003-10-23 09:55:21.000000000 +0200
+++ libffi/src/x86/sysv.S	2005-02-08 16:25:28.197263821 +0100
@@ -182,3 +182,7 @@ epilogue:
 .LEFDE1:
 
 #endif /* ifndef __x86_64__ */
+
+#if defined __ELF__ && defined __linux__
+	.section	.note.GNU-stack,"",@progbits
+#endif
--- libffi/src/sparc/v8.S.jj	2004-11-24 22:02:00.000000000 +0100
+++ libffi/src/sparc/v8.S	2005-02-08 16:22:55.220583988 +0100
@@ -265,3 +265,7 @@ done2:
 	.byte	0x1f	! uleb128 0x1f
 	.align	WS
 .LLEFDE2:
+
+#if defined __ELF__ && defined __linux__
+	.section	.note.GNU-stack,"",@progbits
+#endif
--- libffi/src/sparc/v9.S.jj	2004-01-26 11:34:57.000000000 +0100
+++ libffi/src/sparc/v9.S	2005-02-08 16:25:12.153129117 +0100
@@ -300,3 +300,7 @@ longdouble1:
 	.align 8
 .LLEFDE2:
 #endif
+
+#ifdef __linux__
+	.section	.note.GNU-stack,"",@progbits
+#endif
--- libffi/src/m68k/sysv.S.jj	2003-10-23 09:55:21.000000000 +0200
+++ libffi/src/m68k/sysv.S	2005-02-08 16:16:18.341466343 +0100
@@ -95,3 +95,7 @@ epilogue:
 	unlk	%a6
 	rts
 	.size	ffi_call_SYSV,.-ffi_call_SYSV
+
+#if defined __ELF__ && defined __linux__
+	.section	.note.GNU-stack,"",@progbits
+#endif
--- libffi/src/ia64/unix.S.jj	2005-01-04 15:42:01.000000000 +0100
+++ libffi/src/ia64/unix.S	2005-02-08 16:16:01.253518356 +0100
@@ -572,3 +572,7 @@ ffi_closure_unix:
 	data8	@pcrel(.Lld_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
 	data8	@pcrel(.Lld_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
 	data8	@pcrel(.Lld_hfa_ldouble)	// FFI_IA64_TYPE_HFA_LDOUBLE
+
+#if defined __ELF__ && defined __linux__
+	.section	.note.GNU-stack,"",@progbits
+#endif
--- libffi/src/arm/sysv.S.jj	2004-10-28 15:10:11.000000000 +0200
+++ libffi/src/arm/sysv.S	2005-02-08 16:14:02.282767581 +0100
@@ -207,3 +207,6 @@ LSYM(Lepilogue):
 .ffi_call_SYSV_end:
         .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
 
+#if defined __ELF__ && defined __linux__
+	.section	.note.GNU-stack,"",%progbits
+#endif
--- boehm-gc/ia64_save_regs_in_stack.S.jj	2005-02-08 16:32:57.368040486 +0100
+++ boehm-gc/ia64_save_regs_in_stack.S	2005-02-08 16:33:36.243096641 +0100
@@ -0,0 +1,15 @@
+        .text
+        .align 16
+        .global GC_save_regs_in_stack
+        .proc GC_save_regs_in_stack
+GC_save_regs_in_stack:
+        .body
+        flushrs
+        ;;
+        mov r8=ar.bsp
+        br.ret.sptk.few rp
+        .endp GC_save_regs_in_stack
+
+#ifdef __linux__
+	.section .note.GNU-stack,"",@progbits
+#endif
--- boehm-gc/ia64_save_regs_in_stack.s.jj	2004-06-30 09:32:52.000000000 +0200
+++ boehm-gc/ia64_save_regs_in_stack.s	2005-02-08 16:32:51.555078799 +0100
@@ -1,12 +0,0 @@
-        .text
-        .align 16
-        .global GC_save_regs_in_stack
-        .proc GC_save_regs_in_stack
-GC_save_regs_in_stack:
-        .body
-        flushrs
-        ;;
-        mov r8=ar.bsp
-        br.ret.sptk.few rp
-        .endp GC_save_regs_in_stack
-