Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 573872 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-57 / +60 lines)
Line  Link Here
0
-- common.eblit
0
++ common.eblit
Lines 113-180 Link Here
113
			# Note: Should we factor in -Wa,-AvXXX flags too ?  Or -mvis/etc... ?
113
			# Note: Should we factor in -Wa,-AvXXX flags too ?  Or -mvis/etc... ?
114
114
115
			local cpu
115
			local cpu
116
			case ${CTARGET} in
116
			case $(get-flag mcpu) in
117
			sparc64-*)
117
			niagara[234])
118
				case $(get-flag mcpu) in
118
				if version_is_at_least 2.8 ; then
119
				niagara[234])
119
					if [[ ${ABI} == "sparc32" ]] ; then
120
					if version_is_at_least 2.8 ; then
120
						cpu=sparcv9v2
121
						cpu="sparc64v2"
121
					else
122
					elif version_is_at_least 2.4 ; then
122
						cpu=sparc64v2
123
						cpu="sparc64v"
124
					elif version_is_at_least 2.2.3 ; then
125
						cpu="sparc64b"
126
					fi
123
					fi
127
					;;
124
				elif version_is_at_least 2.4 ; then
128
				niagara)
125
					if [[ ${ABI} == "sparc32" ]] ; then
129
					if version_is_at_least 2.4 ; then
126
						cpu=sparcv9v
130
						cpu="sparc64v"
127
					else
131
					elif version_is_at_least 2.2.3 ; then
128
						cpu=sparc64v
132
						cpu="sparc64b"
133
					fi
129
					fi
134
					;;
130
				elif version_is_at_least 2.2.3 ; then
135
				ultrasparc3)
131
					if [[ ${ABI} == "sparc32" ]] ; then
136
					cpu="sparc64b"
132
						cpu=sparcv9b
137
					;;
133
					else
138
				*)
134
						cpu=sparc64b
139
					# We need to force at least v9a because the base build doesn't
135
					fi
140
					# work with just v9.
136
				fi
141
					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
137
			;;
142
					[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
138
			niagara)
143
					;;
139
				if version_is_at_least 2.4 ; then
144
				esac
140
					if [[ ${ABI} == "sparc32" ]] ; then
145
				;;
141
						cpu=sparcv9v
146
			sparc-*)
147
				case $(get-flag mcpu) in
148
				niagara[234])
149
					if version_is_at_least 2.8 ; then
150
						cpu="sparcv9v2"
151
					elif version_is_at_least 2.4 ; then
152
						cpu="sparcv9v"
153
					elif version_is_at_least 2.2.3 ; then
154
						cpu="sparcv9b"
155
					else
142
					else
156
						cpu="sparcv9"
143
						cpu=sparc64v
157
					fi
144
					fi
158
					;;
145
				elif version_is_at_least 2.2.3 ; then
159
				niagara)
146
					if [[ ${ABI} == "sparc32" ]] ; then
160
					if version_is_at_least 2.4 ; then
147
	                                        cpu=sparcv9b
161
						cpu="sparcv9v"
162
					elif version_is_at_least 2.2.3 ; then
163
						cpu="sparcv9b"
164
					else
148
					else
165
						cpu="sparcv9"
149
						cpu=sparc64b
166
					fi
150
					fi
167
					;;
151
				fi
168
				ultrasparc3)
152
			;;
169
					cpu="sparcv9b"
153
			ultrasparc3)
170
					;;
154
				if [[ ${ABI} == "sparc32" ]] ; then
171
				v9|ultrasparc)
155
					cpu=sparcv9b
172
					cpu="sparcv9"
156
				else
173
					;;
157
					cpu=sparc64b
174
				v8|supersparc|hypersparc|leon|leon3)
158
				fi
175
					cpu="sparcv8"
159
			;;
176
					;;
160
			ultrasparc)
177
				esac
161
				if [[ ${ABI} == "sparc32" ]] ; then
162
					cpu=sparcv9
163
				else
164
					cpu=sparc64
165
				fi
166
			;;
167
			v9)
168
				if [[ ${ABI} == "sparc32" ]] ; then
169
					cpu=sparcv9
170
				else
171
					cpu=sparc64
172
					
173
					# We need to force at least v9a because the base build doesn't
174
					# work with just v9.
175
					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
176
					[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
177
				fi
178
			;;
179
			v8|supersparc|hypersparc|leon|leon3)
180
				cpu="sparcv8"
178
			;;
181
			;;
179
			esac
182
			esac
180
			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
183
			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"

Return to bug 573872