trunk/gcc/gcc-3.4.3-specs_x86-1.patch

Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
Date: 2004-11-14
Initial Package Version: 3.4.3
Upstream Status: Not submitted - LFS specific
Origin: None
Description: This patch is a replacement for the LFS gcc-specs patch.
This patch adds --with-dynamic-linker and --with-nostdinc to gcc/configure.
The point is so the gcc source can be reused in every stage, aswell uclibc's
dynamic linker (or others) can be specified.

Also see:
http://www.linuxfromscratch.org/hlfs/

diff -Naur gcc-3.4.3.orig/gcc/Makefile.in gcc-3.4.3.specs/gcc/Makefile.in
--- gcc-3.4.3.orig/gcc/Makefile.in	2004-10-18 16:00:39.000000000 +0000
+++ gcc-3.4.3.specs/gcc/Makefile.in	2004-11-14 17:41:43.329209760 +0000
@@ -702,7 +702,7 @@
 
 # This is the variable actually used when we compile. If you change this,
 # you probably want to update BUILD_CFLAGS in configure.ac
-ALL_CFLAGS = $(X_CFLAGS) $(T_CFLAGS) \
+ALL_CFLAGS = $(X_CFLAGS) $(T_CFLAGS) @NOSTDINC@ \
   $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) $(XCFLAGS) @DEFS@
 
 # Likewise.
@@ -1424,7 +1424,8 @@
 	(SHLIB_LINK='$(SHLIB_LINK)' \
 	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-  $(DRIVER_DEFINES) \
+  $(DRIVER_DEFINES) `if test -n "@DYNAMICLINKER@" ; then \
+	echo -D__DYNAMIC_LINKER__=\"@DYNAMICLINKER@\" ; fi` \
   -c $(srcdir)/gcc.c $(OUTPUT_OPTION))
 
 gccspec.o: gccspec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H)
diff -Naur gcc-3.4.3.orig/gcc/config/i386/linux.h gcc-3.4.3.specs/gcc/config/i386/linux.h
--- gcc-3.4.3.orig/gcc/config/i386/linux.h	2003-11-29 03:08:10.000000000 +0000
+++ gcc-3.4.3.specs/gcc/config/i386/linux.h	2004-11-14 17:40:58.112083808 +0000
@@ -109,6 +109,15 @@
 /* If ELF is the default format, we should not use /lib/elf.  */
 
 #undef	LINK_SPEC
+#ifdef __DYNAMIC_LINKER__
+#define LINK_SPEC "-m elf_i386 %{shared:-shared} \
+  %{!shared: \
+    %{!ibcs: \
+      %{!static: \
+        %{rdynamic:-export-dynamic} \
+        %{!dynamic-linker:-dynamic-linker "__DYNAMIC_LINKER__"}} \
+        %{static:-static}}}"
+#else
 #ifdef USE_GNULIBC_1
 #define LINK_SPEC "-m elf_i386 %{shared:-shared} \
   %{!shared: \
@@ -126,6 +135,7 @@
 	%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
 	%{static:-static}}}"
 #endif
+#endif
 
 /* A C statement (sans semicolon) to output to the stdio stream
    FILE the assembler definition of uninitialized global DECL named
diff -Naur gcc-3.4.3.orig/gcc/config/linux.h gcc-3.4.3.specs/gcc/config/linux.h
--- gcc-3.4.3.orig/gcc/config/linux.h	2003-11-29 03:08:10.000000000 +0000
+++ gcc-3.4.3.specs/gcc/config/linux.h	2004-11-14 17:40:58.114083504 +0000
@@ -124,3 +124,7 @@
 #endif
 
 #define TARGET_HAS_F_SETLKW
+#ifdef NOSTDINC
+#undef STANDARD_INCLUDE_DIR
+#define STANDARD_INCLUDE_DIR 0
+#endif
diff -Naur gcc-3.4.3.orig/gcc/configure gcc-3.4.3.specs/gcc/configure
--- gcc-3.4.3.orig/gcc/configure	2004-11-05 04:14:05.000000000 +0000
+++ gcc-3.4.3.specs/gcc/configure	2004-11-14 17:42:16.961096936 +0000
@@ -914,6 +914,10 @@
                           with the compiler
   --with-system-zlib      use installed libz
   --with-slibdir=DIR      shared libraries in DIR LIBDIR
+  --with-dynamic-linker=PATH
+                          specifies path to dynamic linker.
+                          example: "/lib/ld-linux.so.2"
+  --with-nostdinc         build gcc to ignore standard include directories
 
 Some influential environment variables:
   CC          C compiler command
@@ -4808,6 +4812,34 @@
   onestep=""
 fi;
 
+# Check whether --with-dynamic-linker= was given.
+
+if test "${with_dynamic_linker+set}" = set; then
+  withval="$with_dynamic_linker"
+  case "${withval}" in
+yes)    { { echo "$as_me:$LINENO: error: bad value ${withval} given for dynamic linker" >&5
+echo "$as_me: error: bad value ${withval} given for dynamic linker" >&2;}
+   { (exit 1); exit 1; }; } ;;
+no)     ;;
+*)	if test -e $withval ; then
+	DYNAMICLINKER=$withval
+	else
+	echo "$as_me: error: bad value $withval given for dynamic linker. No such file." >&2
+	exit 1
+	fi ;;
+esac
+fi;
+
+# Check whether --with-nostdinc was given.
+
+if test "${with_nostdinc+set}" = set; then
+  withval="$with_nostdinc"
+  case "${withval}" in
+yes)	NOSTDINC="-DNOSTDINC" ;;
+no)	;;
+*)	NOSTDINC="-DNOSTDINC" ;;
+esac
+fi;
 
 # -------------------------
 # Checks for other programs
@@ -13036,6 +13068,8 @@
 s,@TARGET_SYSTEM_ROOT_DEFINE@,$TARGET_SYSTEM_ROOT_DEFINE,;t t
 s,@CROSS_SYSTEM_HEADER_DIR@,$CROSS_SYSTEM_HEADER_DIR,;t t
 s,@onestep@,$onestep,;t t
+s,@DYNAMICLINKER@,$DYNAMICLINKER,;t t
+s,@NOSTDINC@,$NOSTDINC,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@AWK@,$AWK,;t t
 s,@LN@,$LN,;t t
1	niro	41	Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
2			Date: 2004-11-14
3			Initial Package Version: 3.4.3
4			Upstream Status: Not submitted - LFS specific
5			Origin: None
6			Description: This patch is a replacement for the LFS gcc-specs patch.
7			This patch adds --with-dynamic-linker and --with-nostdinc to gcc/configure.
8			The point is so the gcc source can be reused in every stage, aswell uclibc's
9			dynamic linker (or others) can be specified.
10
11			Also see:
12			http://www.linuxfromscratch.org/hlfs/
13
14			diff -Naur gcc-3.4.3.orig/gcc/Makefile.in gcc-3.4.3.specs/gcc/Makefile.in
15			--- gcc-3.4.3.orig/gcc/Makefile.in 2004-10-18 16:00:39.000000000 +0000
16			+++ gcc-3.4.3.specs/gcc/Makefile.in 2004-11-14 17:41:43.329209760 +0000
17			@@ -702,7 +702,7 @@
18
19			# This is the variable actually used when we compile. If you change this,
20			# you probably want to update BUILD_CFLAGS in configure.ac
21			-ALL_CFLAGS = $(X_CFLAGS) $(T_CFLAGS) \
22			+ALL_CFLAGS = $(X_CFLAGS) $(T_CFLAGS) @NOSTDINC@ \
23			$(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) $(XCFLAGS) @DEFS@
24
25			# Likewise.
26			@@ -1424,7 +1424,8 @@
27			(SHLIB_LINK='$(SHLIB_LINK)' \
28			SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
29			$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
30			- $(DRIVER_DEFINES) \
31			+ $(DRIVER_DEFINES) `if test -n "@DYNAMICLINKER@" ; then \
32			+ echo -D__DYNAMIC_LINKER__=\"@DYNAMICLINKER@\" ; fi` \
33			-c $(srcdir)/gcc.c $(OUTPUT_OPTION))
34
35			gccspec.o: gccspec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H)
36			diff -Naur gcc-3.4.3.orig/gcc/config/i386/linux.h gcc-3.4.3.specs/gcc/config/i386/linux.h
37			--- gcc-3.4.3.orig/gcc/config/i386/linux.h 2003-11-29 03:08:10.000000000 +0000
38			+++ gcc-3.4.3.specs/gcc/config/i386/linux.h 2004-11-14 17:40:58.112083808 +0000
39			@@ -109,6 +109,15 @@
40			/* If ELF is the default format, we should not use /lib/elf. */
41
42			#undef LINK_SPEC
43			+#ifdef __DYNAMIC_LINKER__
44			+#define LINK_SPEC "-m elf_i386 %{shared:-shared} \
45			+ %{!shared: \
46			+ %{!ibcs: \
47			+ %{!static: \
48			+ %{rdynamic:-export-dynamic} \
49			+ %{!dynamic-linker:-dynamic-linker "__DYNAMIC_LINKER__"}} \
50			+ %{static:-static}}}"
51			+#else
52			#ifdef USE_GNULIBC_1
53			#define LINK_SPEC "-m elf_i386 %{shared:-shared} \
54			%{!shared: \
55			@@ -126,6 +135,7 @@
56			%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
57			%{static:-static}}}"
58			#endif
59			+#endif
60
61			/* A C statement (sans semicolon) to output to the stdio stream
62			FILE the assembler definition of uninitialized global DECL named
63			diff -Naur gcc-3.4.3.orig/gcc/config/linux.h gcc-3.4.3.specs/gcc/config/linux.h
64			--- gcc-3.4.3.orig/gcc/config/linux.h 2003-11-29 03:08:10.000000000 +0000
65			+++ gcc-3.4.3.specs/gcc/config/linux.h 2004-11-14 17:40:58.114083504 +0000
66			@@ -124,3 +124,7 @@
67			#endif
68
69			#define TARGET_HAS_F_SETLKW
70			+#ifdef NOSTDINC
71			+#undef STANDARD_INCLUDE_DIR
72			+#define STANDARD_INCLUDE_DIR 0
73			+#endif
74			diff -Naur gcc-3.4.3.orig/gcc/configure gcc-3.4.3.specs/gcc/configure
75			--- gcc-3.4.3.orig/gcc/configure 2004-11-05 04:14:05.000000000 +0000
76			+++ gcc-3.4.3.specs/gcc/configure 2004-11-14 17:42:16.961096936 +0000
77			@@ -914,6 +914,10 @@
78			with the compiler
79			--with-system-zlib use installed libz
80			--with-slibdir=DIR shared libraries in DIR LIBDIR
81			+ --with-dynamic-linker=PATH
82			+ specifies path to dynamic linker.
83			+ example: "/lib/ld-linux.so.2"
84			+ --with-nostdinc build gcc to ignore standard include directories
85
86			Some influential environment variables:
87			CC C compiler command
88			@@ -4808,6 +4812,34 @@
89			onestep=""
90			fi;
91
92			+# Check whether --with-dynamic-linker= was given.
93			+
94			+if test "${with_dynamic_linker+set}" = set; then
95			+ withval="$with_dynamic_linker"
96			+ case "${withval}" in
97			+yes) { { echo "$as_me:$LINENO: error: bad value ${withval} given for dynamic linker" >&5
98			+echo "$as_me: error: bad value ${withval} given for dynamic linker" >&2;}
99			+ { (exit 1); exit 1; }; } ;;
100			+no) ;;
101			+*) if test -e $withval ; then
102			+ DYNAMICLINKER=$withval
103			+ else
104			+ echo "$as_me: error: bad value $withval given for dynamic linker. No such file." >&2
105			+ exit 1
106			+ fi ;;
107			+esac
108			+fi;
109			+
110			+# Check whether --with-nostdinc was given.
111			+
112			+if test "${with_nostdinc+set}" = set; then
113			+ withval="$with_nostdinc"
114			+ case "${withval}" in
115			+yes) NOSTDINC="-DNOSTDINC" ;;
116			+no) ;;
117			+*) NOSTDINC="-DNOSTDINC" ;;
118			+esac
119			+fi;
120
121			# -------------------------
122			# Checks for other programs
123			@@ -13036,6 +13068,8 @@
124			s,@TARGET_SYSTEM_ROOT_DEFINE@,$TARGET_SYSTEM_ROOT_DEFINE,;t t
125			s,@CROSS_SYSTEM_HEADER_DIR@,$CROSS_SYSTEM_HEADER_DIR,;t t
126			s,@onestep@,$onestep,;t t
127			+s,@DYNAMICLINKER@,$DYNAMICLINKER,;t t
128			+s,@NOSTDINC@,$NOSTDINC,;t t
129			s,@SET_MAKE@,$SET_MAKE,;t t
130			s,@AWK@,$AWK,;t t
131			s,@LN@,$LN,;t t