Permalink
Browse files

Relocate libgmp and libmpfr world makefiles

This action prepares for the import of GCC 4.7 into base.
GCC 4.4, unlike GCC 4.1, requires gmp and mpfr, and these libraries
were part of the GCC 4.4 world makefile set.  GCC 4.7 also needs
these libraries, so rather than build them twice, they are moved out
to a common area where both compilers can use them.
  • Loading branch information...
1 parent ca555a3 commit 2290a76e7a4bdc5290ff0b489ac84b494f3580f3 @jrmarino jrmarino committed Sep 29, 2012
View
2 Makefile.inc1
@@ -809,7 +809,7 @@ _share= share/syscons/scrnmaps
_gcc41_cross= gnu/usr.bin/cc41
_gcc41_tools= gnu/usr.bin/cc41/cc_prep gnu/usr.bin/cc41/cc_tools
.endif
-_gcc44_cross= gnu/usr.bin/cc44
+_gcc44_cross= gnu/usr.bin/gmp gnu/usr.bin/mpfr gnu/usr.bin/cc44
_gcc44_tools= gnu/usr.bin/cc44/cc_prep gnu/usr.bin/cc44/cc_tools
_custom_cross= libexec/customcc
_binutils= gnu/usr.bin/${WORLD_BINUTILSVER}
View
4 gnu/usr.bin/Makefile
@@ -18,8 +18,8 @@ SUBDIR+= ${BU_BACKUP}
.endif
.if !defined(NO_GCC41)
-SUBDIR+= cc41
-.ORDER: ${BU_PRIMARY} cc41
+SUBDIR+= gmp mpfr cc41
+.ORDER: ${BU_PRIMARY} gmp mpfr cc41
.endif
SUBDIR+= cc44
View
9 gnu/usr.bin/cc44/Makefile.inc
@@ -31,8 +31,9 @@ CFLAGS+= -I${GCCDIR}/gcc -I${GCCDIR}/gcc/config -I${GCCDIR}/include
CFLAGS+= -I${GCCDIR}/libcpp/include
CFLAGS+= -I${GCCDIR}/libdecnumber -I${GCCDIR}/libdecnumber/dpd
CFLAGS+= -I${OTOPDIR}/libdecnumber
-CFLAGS+= -I${STOPDIR}/gmp
-CFLAGS+= -I${.CURDIR}/${TOP_PREFIX}/../../../../contrib/mpfr/src -I${STOPDIR}/mpfr
+CFLAGS+= -I${STOPDIR}/../gmp
+CFLAGS+= -I${.CURDIR}/${TOP_PREFIX}/../../../../contrib/mpfr/src
+CFLAGS+= -I${STOPDIR}/../mpfr
CFLAGS+= -I${GCCDIR}/gcc/config/${GCC_CPU} -I${TOOLDIR}
CFLAGS+= -DIN_GCC -DHAVE_CONFIG_H
@@ -59,8 +60,8 @@ LIBBACKEND= ${OTOPDIR}/libbackend/libbackend.a
LIBCPP= ${OTOPDIR}/libcpp/libcpp.a
LIBDECNUMBER= ${OTOPDIR}/libdecnumber/libdecnumber.a
-LIBGMP= ${OTOPDIR}/gmp/libgmp.a
-LIBMPFR= ${OTOPDIR}/mpfr/libmpfr.a
+LIBGMP= ${OTOPDIR}/../gmp/libgmp.a
+LIBMPFR= ${OTOPDIR}/../mpfr/libmpfr.a
GMPLIBS= ${LIBMPFR} ${LIBGMP}
STDLIBS= ${LIBCPP} ${LIBIBERTY} ${LIBDECNUMBER}
View
2 gnu/usr.bin/cc44/gmp/Makefile → gnu/usr.bin/gmp/Makefile
@@ -1,7 +1,7 @@
LIB= gmp
INTERNALLIB= # yes
-CONTRIBDIR= ${.CURDIR}/../../../../contrib/gmp
+CONTRIBDIR= ${.CURDIR}/../../../contrib/gmp
.PATH: ${CONTRIBDIR}
.include "${.CURDIR}/Makefile.${MACHINE_ARCH}"
View
0 gnu/usr.bin/cc44/gmp/Makefile.i386 → gnu/usr.bin/gmp/Makefile.i386
File renamed without changes.
View
0 gnu/usr.bin/cc44/gmp/Makefile.x86_64 → gnu/usr.bin/gmp/Makefile.x86_64
File renamed without changes.
View
0 gnu/usr.bin/cc44/gmp/config.h → gnu/usr.bin/gmp/config.h
File renamed without changes.
View
0 gnu/usr.bin/cc44/gmp/gmp.h → gnu/usr.bin/gmp/gmp.h
File renamed without changes.
View
3 gnu/usr.bin/cc44/mpfr/Makefile → gnu/usr.bin/mpfr/Makefile
@@ -1,11 +1,12 @@
-CONTRIBDIR= ${.CURDIR}/../../../../contrib/mpfr/src
+CONTRIBDIR= ${.CURDIR}/../../../contrib/mpfr/src
.PATH: ${CONTRIBDIR}
LIB= mpfr
INTERNALLIB= # yes
CFLAGS+= -I${CONTRIBDIR}
CFLAGS+= -I${.OBJDIR}
+CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/../gmp
CFLAGS+=-DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DTIME_WITH_SYS_TIME=1 \
-DHAVE_LOCALE_H=1 -DHAVE_WCHAR_H=1 -DHAVE_STDARG=1 \
View
0 gnu/usr.bin/cc44/mpfr/mparam.h → gnu/usr.bin/mpfr/mparam.h
File renamed without changes.

0 comments on commit 2290a76

Please sign in to comment.