summaryrefslogtreecommitdiff
path: root/toolchain/gcc/3.4.6/901-nios2-ctor_dtor.patch
blob: 87145ad5ebf77f115594afcad6afe3e0fde04355 (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
Index: gcc/gcc/config/nios2/nios2.h
===================================================================
--- gcc/gcc/config/nios2/nios2.h	(revision 195)
+++ gcc/gcc/config/nios2/nios2.h	(revision 196)
@@ -88,8 +88,6 @@
       N_("All ld/st instructins do not use io variants (default)") },		\
     { "smallc", 0,			\
       N_("Link with a limited version of the C library") },		\
-    { "ctors-in-init", 0,			\
-      "" /* undocumented: N_("Link with static constructors and destructors in init") */ },		\
     { "", TARGET_DEFAULT, 0 }				\
 }
 
@@ -140,12 +138,12 @@
 #define STARTFILE_SPEC  \
 "%{msys-crt0=*: %*} %{!msys-crt0=*: crt1%O%s} \
  %{msys-crt0=: %eYou need a C startup file for -msys-crt0=} \
- %{mctors-in-init: crti%O%s crtbegin%O%s} \
+ crti%O%s crtbegin%O%s \
 "
 
 #undef ENDFILE_SPEC 
 #define ENDFILE_SPEC \
- "%{mctors-in-init: crtend%O%s crtn%O%s}"
+ " crtend%O%s crtn%O%s"
 
 
 /***********************
Index: gcc/gcc/config/nios2/t-nios2
===================================================================
--- gcc/gcc/config/nios2/t-nios2	(revision 195)
+++ gcc/gcc/config/nios2/t-nios2	(revision 196)
@@ -36,18 +36,8 @@
 	echo ''          >  ${DPBIT}
 	cat $(srcdir)/config/fp-bit.c >> ${DPBIT}
 
-EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o 
+EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o
 
-# Assemble startup files. 
-$(T)crti.o: $(srcdir)/config/nios2/crti.asm $(GCC_PASSES) 
-	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) $(INCLUDES) \
-	-c -o $(T)crti.o -x assembler-with-cpp $(srcdir)/config/nios2/crti.asm 
-
-$(T)crtn.o: $(srcdir)/config/nios2/crtn.asm $(GCC_PASSES) 
-	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(MULTILIB_CFLAGS) $(INCLUDES) \
-	-c -o $(T)crtn.o -x assembler-with-cpp $(srcdir)/config/nios2/crtn.asm 
-
-
 ## You may need to provide additional #defines at the beginning of
 ## fp-bit.c and dp-bit.c to control target endianness and other options
 ##