Fri Oct 14 14:41:59 2016 UTC ()
Fix the host build of aarch64 with clang


(christos)
diff -r1.28 -r1.29 src/tools/gdb/Makefile
cvs diff -r1.28 -r1.29 src/tools/gdb/Makefile (switch to unified diff)

--- src/tools/gdb/Makefile 2016/10/12 18:43:40 1.28
+++ src/tools/gdb/Makefile 2016/10/14 14:41:59 1.29
@@ -1,93 +1,95 @@ @@ -1,93 +1,95 @@
1# $NetBSD: Makefile,v 1.28 2016/10/12 18:43:40 christos Exp $ 1# $NetBSD: Makefile,v 1.29 2016/10/14 14:41:59 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5MODULE= gdb 5MODULE= gdb
6GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GDB_SUBDIR}/dist 6GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GDB_SUBDIR}/dist
7 7
8FIND_ARGS= \! \( -type d -name sim -prune \) 8FIND_ARGS= \! \( -type d -name sim -prune \)
9 9
10CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \ 10CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \
11 --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," 11 --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-,"
12 12
13MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} 13MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q}
14 14
15ALL_TARGET= all-gdb 15ALL_TARGET= all-gdb
16INSTALL_TARGET= install-gdb 16INSTALL_TARGET= install-gdb
17 17
18.include "${.CURDIR}/../Makefile.gmakehost" 18.include "${.CURDIR}/../Makefile.gmakehost"
19 19
20CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include 20CCADDFLAGS+= --sysroot=${DESTDIR} -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
 21LDADDFLAGS+= -L${DESTDIR}/lib -L${DESTDIR}/usr/lib
21CXXADDFLAGS+= -D__STDC_FORMAT_MACROS 22CXXADDFLAGS+= -D__STDC_FORMAT_MACROS
22CXXADDFLAGS+= -D__STDC_LIMIT_MACROS 23CXXADDFLAGS+= -D__STDC_LIMIT_MACROS
23CXXADDFLAGS+= -D__STDC_CONSTANT_MACROS 24CXXADDFLAGS+= -D__STDC_CONSTANT_MACROS
 25HOST_CXXFLAGS+= ${CXXADDFLAGS}
24 26
25NEWCONFIGDIR?= ${.CURDIR}/../.. 27NEWCONFIGDIR?= ${.CURDIR}/../..
26MKNATIVE?= ${.CURDIR}/mknative-gdb 28MKNATIVE?= ${.CURDIR}/mknative-gdb
27 29
28# Some configure tests require running a test program, which is not 30# Some configure tests require running a test program, which is not
29# possible when cross-building. Provide configure with "cached" 31# possible when cross-building. Provide configure with "cached"
30# values in the environment. 32# values in the environment.
31MKNATIVE_CONFIGURE_PRESET= \ 33MKNATIVE_CONFIGURE_PRESET= \
32 ac_cv_prog_cc_cross=yes \ 34 ac_cv_prog_cc_cross=yes \
33 ac_cv_func_fork_works=yes \ 35 ac_cv_func_fork_works=yes \
34 ac_cv_func_strcoll_works=yes \ 36 ac_cv_func_strcoll_works=yes \
35 bash_cv_func_ctype_nonascii=yes \ 37 bash_cv_func_ctype_nonascii=yes \
36 bash_cv_func_sigsetjmp=present \ 38 bash_cv_func_sigsetjmp=present \
37 bash_cv_func_strcoll_broken=no \ 39 bash_cv_func_strcoll_broken=no \
38 bash_cv_must_reinstall_sighandlers=no 40 bash_cv_must_reinstall_sighandlers=no
39 41
40# Recent versions of Solaris have ncurses, but they hide the lib in an 42# Recent versions of Solaris have ncurses, but they hide the lib in an
41# odd directory. Prevent configure from finding the ncurses headers, 43# odd directory. Prevent configure from finding the ncurses headers,
42# Solaris curses is sufficient. 44# Solaris curses is sufficient.
43.if ${BUILD_OSTYPE} == "SunOS" 45.if ${BUILD_OSTYPE} == "SunOS"
44CONFIGURE_ENV+= ac_cv_header_ncurses_h=no \ 46CONFIGURE_ENV+= ac_cv_header_ncurses_h=no \
45 ac_cv_header_ncurses_ncurses_h=no \ 47 ac_cv_header_ncurses_ncurses_h=no \
46 ac_cv_header_ncurses_term_h=no 48 ac_cv_header_ncurses_term_h=no
47.endif 49.endif
48 50
49# Disable sim unless it's known to work (configure's default is to 51# Disable sim unless it's known to work (configure's default is to
50# enable sim if supported). 52# enable sim if supported).
51CONFIGURE_ARGS_SIM= 53CONFIGURE_ARGS_SIM=
52.if \ 54.if \
53 ${MACHINE_CPU} != "powerpc" && \ 55 ${MACHINE_CPU} != "powerpc" && \
54 ${MACHINE_CPU} != "powerpc64" 56 ${MACHINE_CPU} != "powerpc64"
55CONFIGURE_ARGS_SIM+= --disable-sim 57CONFIGURE_ARGS_SIM+= --disable-sim
56.endif 58.endif
57 59
58native-gdb: .native/.configure_done 60native-gdb: .native/.configure_done
59 @echo 'Extracting GDB configury for a native toolchain.' 61 @echo 'Extracting GDB configury for a native toolchain.'
60 MAKE=${MAKE:Q} ${HOST_SH} ${MKNATIVE} gdb \ 62 MAKE=${MAKE:Q} ${HOST_SH} ${MKNATIVE} gdb \
61 ${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} 63 ${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM}
62 64
63.native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile 65.native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile
64 mkdir ${.OBJDIR}/.native 2>/dev/null || true 66 mkdir ${.OBJDIR}/.native 2>/dev/null || true
65 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \ 67 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
66 (cd ${.OBJDIR}/.native && ${CONFIGURE_ENV:NC*:NLD*} \ 68 (cd ${.OBJDIR}/.native && ${CONFIGURE_ENV:NC*:NLD*} \
67 CC_FOR_BUILD=${HOST_CC:Q} \ 69 CC_FOR_BUILD=${HOST_CC:Q} \
68 CC=${CC:Q}' '${CCADDFLAGS:Q} \ 70 CC=${CC:Q}' '${CCADDFLAGS:Q} \
69 CXX=${CXX:Q}' '${CCADDFLAGS:Q} \ 71 CXX=${CXX:Q}' '${CCADDFLAGS:Q} \
70 CPP=${CPP:Q}' '-isystem' '${DESTDIR}/usr/include \ 72 CPP=${CPP:Q}' '-isystem' '${DESTDIR}/usr/include \
71 CFLAGS= CPPFLAGS= CXXFLAGS=${CXXADDFLAGS:Q} \ 73 CFLAGS= CPPFLAGS= CXXFLAGS=${CXXADDFLAGS:Q} \
72 LDFLAGS=${LDADDFLAGS:Q} \ 74 LDFLAGS=${LDADDFLAGS:Q} \
73 MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \ 75 MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
74 XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \ 76 XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \
75 LIBS=-lintl \ 77 LIBS=-lintl \
76 ${MKNATIVE_CONFIGURE_PRESET} \ 78 ${MKNATIVE_CONFIGURE_PRESET} \
77 ${HOST_SH} ${GNUHOSTDIST}/configure \ 79 ${HOST_SH} ${GNUHOSTDIST}/configure \
78 --prefix=/usr \ 80 --prefix=/usr \
79 --with-separate-debug-dir=/usr/libdata/debug \ 81 --with-separate-debug-dir=/usr/libdata/debug \
80 ${CONFIGURE_ARGS_SIM} \ 82 ${CONFIGURE_ARGS_SIM} \
81 --build=`${GNUHOSTDIST}/config.guess` \ 83 --build=`${GNUHOSTDIST}/config.guess` \
82 --host=${MACHINE_GNU_PLATFORM} \ 84 --host=${MACHINE_GNU_PLATFORM} \
83 --target=${MACHINE_GNU_PLATFORM}) && \ 85 --target=${MACHINE_GNU_PLATFORM}) && \
84 (cd ${.OBJDIR}/.native && \ 86 (cd ${.OBJDIR}/.native && \
85 /usr/bin/env ${MKNATIVE_CONFIGURE_PRESET} \ 87 /usr/bin/env ${MKNATIVE_CONFIGURE_PRESET} \
86 ${MAKE} configure-host) && \ 88 ${MAKE} configure-host) && \
87 (cd ${.OBJDIR}/.native/bfd && ${MAKE} bfd.h bfdver.h) && \ 89 (cd ${.OBJDIR}/.native/bfd && ${MAKE} bfd.h bfdver.h) && \
88 (cd ${.OBJDIR}/.native/gdb && ${MAKE} init.c version.c) 90 (cd ${.OBJDIR}/.native/gdb && ${MAKE} init.c version.c)
89 @touch $@ 91 @touch $@
90 92
91clean: clean.native 93clean: clean.native
92clean.native: 94clean.native:
93 -rm -r -f .native 95 -rm -r -f .native