Attachment #112295 for bug #153687

View | Details | Raw Unified | Return to bug 153687
Collapse All | Expand All

Lines 7-13 Link Here

(-)gpc/Makefile (-3 / +5 lines)
7		7
8	PORTNAME= gpc	8	PORTNAME= gpc
9	PORTVERSION= 20060325	9	PORTVERSION= 20060325
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= lang	11	CATEGORIES= lang
12	MASTER_SITES= http://www.gnu-pascal.de/alpha/:gpc \	12	MASTER_SITES= http://www.gnu-pascal.de/alpha/:gpc \
13	${MASTER_SITE_GCC}	13	${MASTER_SITE_GCC}
Lines 25-30 Link Here
25	DEPRECATED= development has ceased; use lang/fpc instead	25	DEPRECATED= development has ceased; use lang/fpc instead
26	EXPIRATION_DATE= 2011-04-11	26	EXPIRATION_DATE= 2011-04-11
27		27
		28	LICENSE= GPLv2
		29
28	USE_BISON= build	30	USE_BISON= build
29	USE_BZIP2= yes	31	USE_BZIP2= yes
30	USE_GMAKE= yes	32	USE_GMAKE= yes
Lines 45-52 Link Here
45		47
46	PLIST_SUB= GCC_VER="${GCC_VER}" GNU_HOST="${CONFIGURE_TARGET}"	48	PLIST_SUB= GCC_VER="${GCC_VER}" GNU_HOST="${CONFIGURE_TARGET}"
47		49
48	# This port can be compiled with GCC versions 2.8.1 to 2.95 and 3.2 to 3.4.3.	50	# This port can be compiled with GCC versions 2.8.1 to 2.95 and 3.2 to 3.4.4.
49	GCC_VER?= 3.4.3	51	GCC_VER?= 3.4.4
50		52
51	.include <bsd.port.pre.mk>	53	.include <bsd.port.pre.mk>
52		54

Lines 1-6 Link Here

(-)gpc/distinfo (-4 / +2 lines)
1	MD5 (gpc-20060325.tar.bz2) = 8a564824c66e804caf27e14befc0a007
2	SHA256 (gpc-20060325.tar.bz2) = 18fddcb63e1f718905f191a0ca7734c4ec59cf7488742a969d070150f99d4ded	1	SHA256 (gpc-20060325.tar.bz2) = 18fddcb63e1f718905f191a0ca7734c4ec59cf7488742a969d070150f99d4ded
3	SIZE (gpc-20060325.tar.bz2) = 2767216	2	SIZE (gpc-20060325.tar.bz2) = 2767216
4	MD5 (gcc-core-3.4.3.tar.bz2) = d2cbfe8fc3205c1d7969b26377405778	3	SHA256 (gcc-core-3.4.4.tar.bz2) = a390ca6123fe71c665f4422e124ced31efbbe98dd08e8f8d171caeba892ab472
5	SHA256 (gcc-core-3.4.3.tar.bz2) = 42e1259c15a59096e3115eec4d0b87afd04d39567a07665ca5d9b358fd02bce0	4	SIZE (gcc-core-3.4.4.tar.bz2) = 13153342
6	SIZE (gcc-core-3.4.3.tar.bz2) = 13040222




--- ./gcc/config.gcc.orig	2005-04-25 04:47:59.000000000 +0000
+++ ./gcc/config.gcc	2011-01-04 11:06:36.000000000 +0000
@@ -406,6 +406,12 @@
 # machines.
 tm_p_file=
 cpu_type=`echo ${target} | sed 's/-.*$//'`
+cpu_is_64bit=
 case ${target} in
 alpha*-*-*)
 	cpu_type=alpha
@@ -300,6 +301,11 @@
 	cpu_type=rs6000
 	extra_headers="ppc-asm.h altivec.h spe.h"
 	need_64bit_hwint=yes
+	case x$with_cpu in
+	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345]|xrs64a)
+		cpu_is_64bit=yes
+		;;
+	esac
 	;;
 rs6000*-*-*)
 	need_64bit_hwint=yes
@@ -400,6 +406,12 @@
       tm_defines="${tm_defines} FBSD_MAJOR=5" ;;
     *-*-freebsd6 | *-*-freebsd[6].*)
       tm_defines="${tm_defines} FBSD_MAJOR=6" ;;

     *)
       echo 'Please update *-*-freebsd* in gcc/config.gcc'
       exit 1
@@ -680,7 +692,7 @@
 	;;
 arm*-*-rtems*)
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h"
-	tmake_file="arm/t-arm-elf t-rtems"
+	tmake_file="arm/t-arm-elf t-rtems arm/t-rtems"
 	;;
 arm*-*-elf | ep9312-*-elf)
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
@@ -700,12 +712,16 @@
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h kaos.h arm/kaos-arm.h"
 	tmake_file=arm/t-arm-elf
 	;;
+avr-*-rtems*)
+	tm_file="avr/avr.h dbxelf.h avr/rtems.h rtems.h"
+	tmake_file="avr/t-avr t-rtems avr/t-rtems"
+	;;
 avr-*-*)
 	tm_file="avr/avr.h dbxelf.h"
 	use_fixproto=yes
 	;;
 c4x-*-rtems* | tic4x-*-rtems*)
-	tmake_file="c4x/t-c4x t-rtems"
+	tmake_file="c4x/t-c4x t-rtems c4x/t-rtems"
 	tm_file="c4x/c4x.h c4x/rtems.h rtems.h"
 	c_target_objs="c4x-c.o"
 	cxx_target_objs="c4x-c.o"
@@ -1678,20 +1694,16 @@
 pdp11-*-*)
 	use_fixproto=yes
 	;;
-avr-*-*)
-	use_fixproto=yes
-	;;
 # port not yet contributed
 #powerpc-*-openbsd*)
 #	tmake_file="${tmake_file} rs6000/t-fprules "
 #	extra_headers=
 #	;;
 powerpc64-*-linux*)
-	tm_file="rs6000/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
-	case x$with_cpu in
-	x|xpowerpc64|xdefault64) tm_file="${tm_file} rs6000/default64.h";;
-	esac
-	tm_file="${tm_file} rs6000/linux64.h"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+	test x$with_cpu != x || cpu_is_64bit=yes
+	test x$cpu_is_64bit != xyes || tm_file="${tm_file} rs6000/default64.h"
+	tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h"
 	tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-linux rs6000/t-ppccomm rs6000/t-linux64"
 	;;
 powerpc64-*-gnu*)
@@ -1765,8 +1777,20 @@
 	tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
 	;;
 powerpc-*-linux*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
 	tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
+	case ${enable_targets}:${cpu_is_64bit} in
+	    *powerpc64* | all:* | *:yes)
+		if test x$cpu_is_64bit = xyes; then
+		    tm_file="${tm_file} rs6000/default64.h"
+		fi
+		tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h"
+		tmake_file="$tmake_file rs6000/t-linux64"
+		;;
+	    *)
+		tm_file="${tm_file} rs6000/linux.h"
+		;;
+	esac
 	;;
 powerpc-*-gnu-gnualtivec*)
 	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h rs6000/gnu.h"
@@ -2007,7 +2031,7 @@
 	with_cpu=ultrasparc
 	;;
 sparc-*-elf*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-gld.h sparc/elf.h"
 	tmake_file="sparc/t-elf sparc/t-crtfm"
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
 	use_fixproto=yes
@@ -2017,7 +2041,7 @@
 	tmake_file="t-slibgcc-elf-ver t-linux sparc/t-crtfm"
 	;;
 sparc-*-rtems*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/rtemself.h rtems.h"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-gld.h sparc/elf.h sparc/rtemself.h rtems.h"
 	tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
 	;;
@@ -2106,13 +2130,13 @@
 	tmake_file=sparc/t-sparclite
 	;;
 sparclite-*-elf*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/liteelf.h"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-gld.h sparc/elf.h sparc/liteelf.h"
 	tmake_file="sparc/t-sparclite sparc/t-crtfm"
         extra_parts="crtbegin.o crtend.o"
 	use_fixproto=yes
 	;;
 sparc86x-*-elf*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/sp86x-elf.h"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-gld.h sparc/elf.h sparc/sp86x-elf.h"
 	tmake_file="sparc/t-sp86x sparc/t-crtfm"
         extra_parts="crtbegin.o crtend.o"
 	use_fixproto=yes
@@ -2122,7 +2146,7 @@
 	use_fixproto=yes
 	;;
 sparc64-*-elf*)
-	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sp64-elf.h"
+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-gld.h sparc/sp64-elf.h"
 	tmake_file="${tmake_file} sparc/t-crtfm"
 	extra_parts="crtbegin.o crtend.o"
 	use_fixproto=yes
@@ -2398,24 +2422,24 @@
   esac
 fi
 
-	# Similarly for --with-schedule.
-	if test x$with_schedule = x; then
-		case ${target} in
-		hppa1* | parisc1*)
-			# Override default PA8000 scheduling model.
-			with_schedule=7100LC
-			;;
-		esac
-	fi
+# Similarly for --with-schedule.
+if test x$with_schedule = x; then
+	case ${target} in
+	hppa1* | parisc1*)
+		# Override default PA8000 scheduling model.
+		with_schedule=7100LC
+		;;
+	esac
+fi
 
-	# Validate and mark as valid any --with options supported
-	# by this target.  In order to use a particular --with option
-	# you must list it in supported_defaults; validating the value
-	# is optional.  This case statement should set nothing besides
-	# supported_defaults.
+# Validate and mark as valid any --with options supported
+# by this target.  In order to use a particular --with option
+# you must list it in supported_defaults; validating the value
+# is optional.  This case statement should set nothing besides
+# supported_defaults.
 
-	supported_defaults=
-	case "${target}" in
+supported_defaults=
+case "${target}" in
 	alpha*-*-*)
 		supported_defaults="cpu tune"
 		for which in cpu tune; do
@@ -2569,8 +2593,7 @@
 				eval $with_which=
 				;;
 			"" | common \
-			| power | power2 | power3 | power4 \
-			| powerpc | powerpc64 \
+			| power | power[2345] | powerpc | powerpc64 \
 			| rios | rios1 | rios2 | rsc | rsc1 | rs64a \
 			| 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
 			| 601 | 602 | 603 | 603e | ec603e | 604 \
@@ -2655,11 +2678,11 @@
 			;;
 		esac
 		;;
-	esac
+esac
 
-	# Set some miscellaneous flags for particular targets.
-	target_cpu_default2=
-	case ${target} in
+# Set some miscellaneous flags for particular targets.
+target_cpu_default2=
+case ${target} in
 	alpha*-*-*)
 		if test x$gas = xyes
 		then
@@ -2771,44 +2794,45 @@
 			;;
 		esac
 		;;
-	esac
+esac
 
-	t=
-	all_defaults="abi cpu arch tune schedule float mode"
-	for option in $all_defaults
-	do
-		eval "val=\$with_$option"
-		if test -n "$val"; then
-			case " $supported_defaults " in
-			*" $option "*)
-				;;
-			*)
-				echo "This target does not support --with-$option." 2>&1
-				exit 1
-				;;
-			esac
+t=
+all_defaults="abi cpu arch tune schedule float mode"
+for option in $all_defaults
+do
+	eval "val=\$with_$option"
+	if test -n "$val"; then
+		case " $supported_defaults " in
+		*" $option "*)
+			;;
+		*)
+			echo "This target does not support --with-$option." 2>&1
+			exit 1
+			;;
+		esac
 
-			if test "x$t" = x
-			then
-				t="{ \"$option\", \"$val\" }"
-			else
-				t="${t}, { \"$option\", \"$val\" }"
-			fi
+		if test "x$t" = x
+		then
+			t="{ \"$option\", \"$val\" }"
+		else
+			t="${t}, { \"$option\", \"$val\" }"
 		fi
-	done
-	if test "x$t" = x
-	then
-		configure_default_options="{ { NULL, NULL} }"
-	else
-		configure_default_options="{ ${t} }"
 	fi
+done
 
-	if test "$target_cpu_default2" != ""
+if test "x$t" = x
+then
+	configure_default_options="{ { NULL, NULL} }"
+else
+	configure_default_options="{ ${t} }"
+fi
+
+if test "$target_cpu_default2" != ""
+then
+	if test "$target_cpu_default" != ""
 	then
-		if test "$target_cpu_default" != ""
-		then
-			target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
-		else
-			target_cpu_default=$target_cpu_default2
-		fi
+		target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
+	else
+		target_cpu_default=$target_cpu_default2
 	fi
+fi




--- ./gcc/config/freebsd-spec.h.orig	2005-05-01 21:52:41.000000000 +0000
+++ ./gcc/config/freebsd-spec.h	2011-01-04 11:36:10.000000000 +0000
@@ -51,7 +51,13 @@
 #define FBSD_TARGET_OS_CPP_BUILTINS()					\
   do									\

 	  builtin_define ("__FreeBSD__=6");			       	\
 	else if (FBSD_MAJOR == 5)	       				\
 	  builtin_define ("__FreeBSD__=5");			       	\
@@ -107,12 +113,12 @@
    500016, select the appropriate libc, depending on whether we're
    doing profiling or need threads support.  At __FreeBSD_version
    500016 and later, when threads support is requested include both
-   -lc and -lc_r instead of only -lc_r.  To make matters interesting,
-   we can't actually use __FreeBSD_version provided by <osreldate.h>
-   directly since it breaks cross-compiling.  As a final twist, make
-   it a hard error if -pthread is provided on the command line and gcc
-   was configured with --disable-threads (this will help avoid bug
-   reports from users complaining about threading when they
+   -lc and the threading lib instead of only -lc_r.  To make matters
+   interesting, we can't actually use __FreeBSD_version provided by
+   <osreldate.h> directly since it breaks cross-compiling.  As a final
+   twist, make it a hard error if -pthread is provided on the command
+   line and gcc was configured with --disable-threads (this will help
+   avoid bug reports from users complaining about threading when they
    misconfigured the gcc bootstrap but are later consulting FreeBSD
    manual pages that refer to the mythical -pthread option).  */
 
@@ -129,13 +135,7 @@
     %{pg:  -lc_p}							\
   }"
 #else
-#if FBSD_MAJOR >= 5
-#define FBSD_LIB_SPEC "							\
-  %{!shared:								\
-    %{!pg: %{pthread:-lc_r} -lc}					\
-    %{pg:  %{pthread:-lc_r_p} -lc_p}					\
-  }"
-#else
+#if FBSD_MAJOR < 5
 #define FBSD_LIB_SPEC "							\
   %{!shared:								\
     %{!pg:								\
@@ -144,6 +144,12 @@
     %{pg:								\
       %{!pthread:-lc_p}							\
       %{pthread:-lc_r_p}}						\
+  }"
+#else
+#define FBSD_LIB_SPEC "							\
+  %{!shared:								\
+    %{!pg: %{pthread:-lpthread} -lc}					\
+    %{pg:  %{pthread:-lpthread_p} -lc_p}				\
   }"
 #endif
 #endif

Return to bug 153687

Lines 1-26 Link Here

(-)gpc/files/patch-gcc__config.gcc (-287 / +3 lines)
1	--- ./gcc/config.gcc.orig Fri Oct 20 15:51:53 2006	1	--- ./gcc/config.gcc.orig 2005-04-25 04:47:59.000000000 +0000
2	+++ ./gcc/config.gcc Fri Oct 20 15:52:15 2006	2	+++ ./gcc/config.gcc 2011-01-04 11:06:36.000000000 +0000
3	@@ -244,6 +244,7 @@	3	@@ -406,6 +406,12 @@
4	# machines.
5	tm_p_file=
6	cpu_type=`echo ${target} \| sed 's/-.*$//'`
7	+cpu_is_64bit=
8	case ${target} in
9	alpha--*)
10	cpu_type=alpha
11	@@ -300,6 +301,11 @@
12	cpu_type=rs6000
13	extra_headers="ppc-asm.h altivec.h spe.h"
14	need_64bit_hwint=yes
15	+ case x$with_cpu in
16	+ xpowerpc64\|xdefault64\|x6[23]0\|x970\|xG5\|xpower[345]\|xrs64a)
17	+ cpu_is_64bit=yes
18	+ ;;
19	+ esac
20	;;
21	rs6000--*)
22	need_64bit_hwint=yes
23	@@ -400,6 +406,12 @@
24	tm_defines="${tm_defines} FBSD_MAJOR=5" ;;	4	tm_defines="${tm_defines} FBSD_MAJOR=5" ;;
25	--freebsd6 \| --freebsd[6].*)	5	--freebsd6 \| --freebsd[6].*)
26	tm_defines="${tm_defines} FBSD_MAJOR=6" ;;	6	tm_defines="${tm_defines} FBSD_MAJOR=6" ;;
Lines 33-299 Link Here
33	*)	13	*)
34	echo 'Please update --freebsd* in gcc/config.gcc'	14	echo 'Please update --freebsd* in gcc/config.gcc'
35	exit 1	15	exit 1
36	@@ -680,7 +692,7 @@
37	;;
38	arm--rtems*)
39	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h"
40	- tmake_file="arm/t-arm-elf t-rtems"
41	+ tmake_file="arm/t-arm-elf t-rtems arm/t-rtems"
42	;;
43	arm--elf \| ep9312-*-elf)
44	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
45	@@ -700,12 +712,16 @@
46	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h kaos.h arm/kaos-arm.h"
47	tmake_file=arm/t-arm-elf
48	;;
49	+avr--rtems)
50	+ tm_file="avr/avr.h dbxelf.h avr/rtems.h rtems.h"
51	+ tmake_file="avr/t-avr t-rtems avr/t-rtems"
52	+ ;;
53	avr--)
54	tm_file="avr/avr.h dbxelf.h"
55	use_fixproto=yes
56	;;
57	c4x--rtems \| tic4x--rtems)
58	- tmake_file="c4x/t-c4x t-rtems"
59	+ tmake_file="c4x/t-c4x t-rtems c4x/t-rtems"
60	tm_file="c4x/c4x.h c4x/rtems.h rtems.h"
61	c_target_objs="c4x-c.o"
62	cxx_target_objs="c4x-c.o"
63	@@ -1678,20 +1694,16 @@
64	pdp11--)
65	use_fixproto=yes
66	;;
67	-avr--)
68	- use_fixproto=yes
69	- ;;
70	# port not yet contributed
71	#powerpc--openbsd)
72	# tmake_file="${tmake_file} rs6000/t-fprules "
73	# extra_headers=
74	# ;;
75	powerpc64--linux)
76	- tm_file="rs6000/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
77	- case x$with_cpu in
78	- x\|xpowerpc64\|xdefault64) tm_file="${tm_file} rs6000/default64.h";;
79	- esac
80	- tm_file="${tm_file} rs6000/linux64.h"
81	+ tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
82	+ test x$with_cpu != x \|\| cpu_is_64bit=yes
83	+ test x$cpu_is_64bit != xyes \|\| tm_file="${tm_file} rs6000/default64.h"
84	+ tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h"
85	tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-linux rs6000/t-ppccomm rs6000/t-linux64"
86	;;
87	powerpc64--gnu)
88	@@ -1765,8 +1777,20 @@
89	tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
90	;;
91	powerpc--linux)
92	- tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h"
93	+ tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
94	tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
95	+ case ${enable_targets}:${cpu_is_64bit} in
96	+ powerpc64 \| all:* \| *:yes)
97	+ if test x$cpu_is_64bit = xyes; then
98	+ tm_file="${tm_file} rs6000/default64.h"
99	+ fi
100	+ tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h"
101	+ tmake_file="$tmake_file rs6000/t-linux64"
102	+ ;;
103	+ *)
104	+ tm_file="${tm_file} rs6000/linux.h"
105	+ ;;
106	+ esac
107	;;
108	powerpc--gnu-gnualtivec)
109	tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h rs6000/gnu.h"
110	@@ -2007,7 +2031,7 @@
111	with_cpu=ultrasparc
112	;;
113	sparc--elf)
114	- tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h"
115	+ tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-gld.h sparc/elf.h"
116	tmake_file="sparc/t-elf sparc/t-crtfm"
117	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
118	use_fixproto=yes
119	@@ -2017,7 +2041,7 @@
120	tmake_file="t-slibgcc-elf-ver t-linux sparc/t-crtfm"
121	;;
122	sparc--rtems)
123	- tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/rtemself.h rtems.h"
124	+ tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-gld.h sparc/elf.h sparc/rtemself.h rtems.h"
125	tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
126	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
127	;;
128	@@ -2106,13 +2130,13 @@
129	tmake_file=sparc/t-sparclite
130	;;
131	sparclite--elf)
132	- tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/liteelf.h"
133	+ tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-gld.h sparc/elf.h sparc/liteelf.h"
134	tmake_file="sparc/t-sparclite sparc/t-crtfm"
135	extra_parts="crtbegin.o crtend.o"
136	use_fixproto=yes
137	;;
138	sparc86x--elf)
139	- tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/sp86x-elf.h"
140	+ tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-gld.h sparc/elf.h sparc/sp86x-elf.h"
141	tmake_file="sparc/t-sp86x sparc/t-crtfm"
142	extra_parts="crtbegin.o crtend.o"
143	use_fixproto=yes
144	@@ -2122,7 +2146,7 @@
145	use_fixproto=yes
146	;;
147	sparc64--elf)
148	- tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sp64-elf.h"
149	+ tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-gld.h sparc/sp64-elf.h"
150	tmake_file="${tmake_file} sparc/t-crtfm"
151	extra_parts="crtbegin.o crtend.o"
152	use_fixproto=yes
153	@@ -2398,24 +2422,24 @@
154	esac
155	fi
156
157	- # Similarly for --with-schedule.
158	- if test x$with_schedule = x; then
159	- case ${target} in
160	- hppa1* \| parisc1*)
161	- # Override default PA8000 scheduling model.
162	- with_schedule=7100LC
163	- ;;
164	- esac
165	- fi
166	+# Similarly for --with-schedule.
167	+if test x$with_schedule = x; then
168	+ case ${target} in
169	+ hppa1* \| parisc1*)
170	+ # Override default PA8000 scheduling model.
171	+ with_schedule=7100LC
172	+ ;;
173	+ esac
174	+fi
175
176	- # Validate and mark as valid any --with options supported
177	- # by this target. In order to use a particular --with option
178	- # you must list it in supported_defaults; validating the value
179	- # is optional. This case statement should set nothing besides
180	- # supported_defaults.
181	+# Validate and mark as valid any --with options supported
182	+# by this target. In order to use a particular --with option
183	+# you must list it in supported_defaults; validating the value
184	+# is optional. This case statement should set nothing besides
185	+# supported_defaults.
186
187	- supported_defaults=
188	- case "${target}" in
189	+supported_defaults=
190	+case "${target}" in
191	alpha--*)
192	supported_defaults="cpu tune"
193	for which in cpu tune; do
194	@@ -2569,8 +2593,7 @@
195	eval $with_which=
196	;;
197	"" \| common \
198	- \| power \| power2 \| power3 \| power4 \
199	- \| powerpc \| powerpc64 \
200	+ \| power \| power[2345] \| powerpc \| powerpc64 \
201	\| rios \| rios1 \| rios2 \| rsc \| rsc1 \| rs64a \
202	\| 401 \| 403 \| 405 \| 405fp \| 440 \| 440fp \| 505 \
203	\| 601 \| 602 \| 603 \| 603e \| ec603e \| 604 \
204	@@ -2655,11 +2678,11 @@
205	;;
206	esac
207	;;
208	- esac
209	+esac
210
211	- # Set some miscellaneous flags for particular targets.
212	- target_cpu_default2=
213	- case ${target} in
214	+# Set some miscellaneous flags for particular targets.
215	+target_cpu_default2=
216	+case ${target} in
217	alpha--*)
218	if test x$gas = xyes
219	then
220	@@ -2771,44 +2794,45 @@
221	;;
222	esac
223	;;
224	- esac
225	+esac
226
227	- t=
228	- all_defaults="abi cpu arch tune schedule float mode"
229	- for option in $all_defaults
230	- do
231	- eval "val=\$with_$option"
232	- if test -n "$val"; then
233	- case " $supported_defaults " in
234	- " $option ")
235	- ;;
236	- *)
237	- echo "This target does not support --with-$option." 2>&1
238	- exit 1
239	- ;;
240	- esac
241	+t=
242	+all_defaults="abi cpu arch tune schedule float mode"
243	+for option in $all_defaults
244	+do
245	+ eval "val=\$with_$option"
246	+ if test -n "$val"; then
247	+ case " $supported_defaults " in
248	+ " $option ")
249	+ ;;
250	+ *)
251	+ echo "This target does not support --with-$option." 2>&1
252	+ exit 1
253	+ ;;
254	+ esac
255
256	- if test "x$t" = x
257	- then
258	- t="{ \"$option\", \"$val\" }"
259	- else
260	- t="${t}, { \"$option\", \"$val\" }"
261	- fi
262	+ if test "x$t" = x
263	+ then
264	+ t="{ \"$option\", \"$val\" }"
265	+ else
266	+ t="${t}, { \"$option\", \"$val\" }"
267	fi
268	- done
269	- if test "x$t" = x
270	- then
271	- configure_default_options="{ { NULL, NULL} }"
272	- else
273	- configure_default_options="{ ${t} }"
274	fi
275	+done
276
277	- if test "$target_cpu_default2" != ""
278	+if test "x$t" = x
279	+then
280	+ configure_default_options="{ { NULL, NULL} }"
281	+else
282	+ configure_default_options="{ ${t} }"
283	+fi
284	+
285	+if test "$target_cpu_default2" != ""
286	+then
287	+ if test "$target_cpu_default" != ""
288	then
289	- if test "$target_cpu_default" != ""
290	- then
291	- target_cpu_default="(${target_cpu_default}\|${target_cpu_default2})"
292	- else
293	- target_cpu_default=$target_cpu_default2
294	- fi
295	+ target_cpu_default="(${target_cpu_default}\|${target_cpu_default2})"
296	+ else
297	+ target_cpu_default=$target_cpu_default2
298	fi
299	+fi

Lines 1-5 Link Here

(-)gpc/files/patch-gcc__config__freebsd-spec.h (-49 / +2 lines)
1	--- ./gcc/config/freebsd-spec.h.orig Fri Oct 20 15:51:07 2006	1	--- ./gcc/config/freebsd-spec.h.orig 2005-05-01 21:52:41.000000000 +0000
2	+++ ./gcc/config/freebsd-spec.h Fri Oct 20 15:51:23 2006	2	+++ ./gcc/config/freebsd-spec.h 2011-01-04 11:36:10.000000000 +0000
3	@@ -51,7 +51,13 @@	3	@@ -51,7 +51,13 @@
4	#define FBSD_TARGET_OS_CPP_BUILTINS() \	4	#define FBSD_TARGET_OS_CPP_BUILTINS() \
5	do \	5	do \
Lines 15-64 Link Here
15	builtin_define ("__FreeBSD__=6"); \	15	builtin_define ("__FreeBSD__=6"); \
16	else if (FBSD_MAJOR == 5) \	16	else if (FBSD_MAJOR == 5) \
17	builtin_define ("__FreeBSD__=5"); \	17	builtin_define ("__FreeBSD__=5"); \
18	@@ -107,12 +113,12 @@
19	500016, select the appropriate libc, depending on whether we're
20	doing profiling or need threads support. At __FreeBSD_version
21	500016 and later, when threads support is requested include both
22	- -lc and -lc_r instead of only -lc_r. To make matters interesting,
23	- we can't actually use __FreeBSD_version provided by <osreldate.h>
24	- directly since it breaks cross-compiling. As a final twist, make
25	- it a hard error if -pthread is provided on the command line and gcc
26	- was configured with --disable-threads (this will help avoid bug
27	- reports from users complaining about threading when they
28	+ -lc and the threading lib instead of only -lc_r. To make matters
29	+ interesting, we can't actually use __FreeBSD_version provided by
30	+ <osreldate.h> directly since it breaks cross-compiling. As a final
31	+ twist, make it a hard error if -pthread is provided on the command
32	+ line and gcc was configured with --disable-threads (this will help
33	+ avoid bug reports from users complaining about threading when they
34	misconfigured the gcc bootstrap but are later consulting FreeBSD
35	manual pages that refer to the mythical -pthread option). */
36
37	@@ -129,13 +135,7 @@
38	%{pg: -lc_p} \
39	}"
40	#else
41	-#if FBSD_MAJOR >= 5
42	-#define FBSD_LIB_SPEC " \
43	- %{!shared: \
44	- %{!pg: %{pthread:-lc_r} -lc} \
45	- %{pg: %{pthread:-lc_r_p} -lc_p} \
46	- }"
47	-#else
48	+#if FBSD_MAJOR < 5
49	#define FBSD_LIB_SPEC " \
50	%{!shared: \
51	%{!pg: \
52	@@ -144,6 +144,12 @@
53	%{pg: \
54	%{!pthread:-lc_p} \
55	%{pthread:-lc_r_p}} \
56	+ }"
57	+#else
58	+#define FBSD_LIB_SPEC " \
59	+ %{!shared: \
60	+ %{!pg: %{pthread:-lpthread} -lc} \
61	+ %{pg: %{pthread:-lpthread_p} -lc_p} \
62	}"
63	#endif
64	#endif