| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: bsd.own.mk,v 1.909 2016/03/24 04:28:49 christos Exp $ | | 1 | # $NetBSD: bsd.own.mk,v 1.910 2016/03/24 09:15:38 martin Exp $ |
2 | | | 2 | |
3 | # This needs to be before bsd.init.mk | | 3 | # This needs to be before bsd.init.mk |
4 | .if defined(BSD_MK_COMPAT_FILE) | | 4 | .if defined(BSD_MK_COMPAT_FILE) |
5 | .include <${BSD_MK_COMPAT_FILE}> | | 5 | .include <${BSD_MK_COMPAT_FILE}> |
6 | .endif | | 6 | .endif |
7 | | | 7 | |
8 | .if !defined(_BSD_OWN_MK_) | | 8 | .if !defined(_BSD_OWN_MK_) |
9 | _BSD_OWN_MK_=1 | | 9 | _BSD_OWN_MK_=1 |
10 | | | 10 | |
11 | MAKECONF?= /etc/mk.conf | | 11 | MAKECONF?= /etc/mk.conf |
12 | .-include "${MAKECONF}" | | 12 | .-include "${MAKECONF}" |
13 | | | 13 | |
14 | # | | 14 | # |
| @@ -122,27 +122,28 @@ HAVE_LIBGCC_EH?= yes | | | @@ -122,27 +122,28 @@ HAVE_LIBGCC_EH?= yes |
122 | (${MACHINE_ARCH} == "ia64") || \ | | 122 | (${MACHINE_ARCH} == "ia64") || \ |
123 | (${MACHINE_CPU} == "mips") | | 123 | (${MACHINE_CPU} == "mips") |
124 | HAVE_SSP?= no | | 124 | HAVE_SSP?= no |
125 | .else | | 125 | .else |
126 | HAVE_SSP?= yes | | 126 | HAVE_SSP?= yes |
127 | .if !defined(NOFORT) && ${USE_FORT:Uno} != "no" | | 127 | .if !defined(NOFORT) && ${USE_FORT:Uno} != "no" |
128 | USE_SSP?= yes | | 128 | USE_SSP?= yes |
129 | .endif | | 129 | .endif |
130 | .endif | | 130 | .endif |
131 | | | 131 | |
132 | .if ${MACHINE} == "amd64" || \ | | 132 | .if ${MACHINE} == "amd64" || \ |
133 | ${MACHINE} == "i386" || \ | | 133 | ${MACHINE} == "i386" || \ |
134 | ${MACHINE_CPU} == "sh3" || \ | | 134 | ${MACHINE_CPU} == "sh3" || \ |
135 | ${MACHINE_ARCH} == "vax" | | 135 | ${MACHINE_ARCH} == "vax" || \ |
| | | 136 | ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" |
136 | HAVE_GDB?= 710 | | 137 | HAVE_GDB?= 710 |
137 | .else | | 138 | .else |
138 | HAVE_GDB?= 79 | | 139 | HAVE_GDB?= 79 |
139 | .endif | | 140 | .endif |
140 | | | 141 | |
141 | .if ${HAVE_GDB} == 79 | | 142 | .if ${HAVE_GDB} == 79 |
142 | EXTERNAL_GDB_SUBDIR= gdb.old | | 143 | EXTERNAL_GDB_SUBDIR= gdb.old |
143 | .else | | 144 | .else |
144 | EXTERNAL_GDB_SUBDIR= gdb | | 145 | EXTERNAL_GDB_SUBDIR= gdb |
145 | .endif | | 146 | .endif |
146 | | | 147 | |
147 | .if ${MACHINE} == "amd64" || \ | | 148 | .if ${MACHINE} == "amd64" || \ |
148 | ${MACHINE} == "evbarm" || \ | | 149 | ${MACHINE} == "evbarm" || \ |