svn commit: r261614 - in head/sys/boot: . powerpc/ofw powerpc/ps3 powerpc/uboot

[Ed Maste]

Author: emaste
Date: Fri Feb  7 22:49:42 2014
New Revision: 261614
URL: http://svnweb.freebsd.org/changeset/base/261614

Log:
  Build a 32-bit libstand under sys/boot/ for ppc64
  
  This change is equivalent to r261567 for i386/amd64.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/sys/boot/Makefile.powerpc
  head/sys/boot/powerpc/ofw/Makefile
  head/sys/boot/powerpc/ps3/Makefile
  head/sys/boot/powerpc/uboot/Makefile

Modified: head/sys/boot/Makefile.powerpc
==============================================================================
--- head/sys/boot/Makefile.powerpc      Fri Feb  7 22:30:42 2014        
(r261613)
+++ head/sys/boot/Makefile.powerpc      Fri Feb  7 22:49:42 2014        
(r261614)
@@ -4,5 +4,6 @@
 SUBDIR+=               fdt
 .endif
 
+SUBDIR+=               libstand32
 SUBDIR+=               ofw
 SUBDIR+=               uboot

Modified: head/sys/boot/powerpc/ofw/Makefile
==============================================================================
--- head/sys/boot/powerpc/ofw/Makefile  Fri Feb  7 22:30:42 2014        
(r261613)
+++ head/sys/boot/powerpc/ofw/Makefile  Fri Feb  7 22:49:42 2014        
(r261614)
@@ -89,10 +89,11 @@ LIBOFW=             ${.OBJDIR}/../../ofw/libofw/lib
 CFLAGS+=       -I${.CURDIR}/../../ofw/libofw
 
 # where to get libstand from
+LIBSTAND=      ${.OBJDIR}/../../libstand32/libstand.a
 CFLAGS+=       -I${.CURDIR}/../../../../lib/libstand/
 
 DPADD=         ${LIBFICL} ${LIBOFW} ${LIBSTAND}
-LDADD=         ${LIBFICL} ${LIBOFW} -lstand
+LDADD=         ${LIBFICL} ${LIBOFW} ${LIBSTAND}
 
 vers.c:        ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
        sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}

Modified: head/sys/boot/powerpc/ps3/Makefile
==============================================================================
--- head/sys/boot/powerpc/ps3/Makefile  Fri Feb  7 22:30:42 2014        
(r261613)
+++ head/sys/boot/powerpc/ps3/Makefile  Fri Feb  7 22:49:42 2014        
(r261614)
@@ -95,10 +95,11 @@ CFLAGS+= -Wa,-mppc64bridge
 #.include      "${.CURDIR}/../../ofw/common/Makefile.inc"
 
 # where to get libstand from
+LIBSTAND=      ${.OBJDIR}/../../libstand32/libstand.a
 CFLAGS+=       -I${.CURDIR}/../../../../lib/libstand/
 
 DPADD=         ${LIBFICL} ${LIBOFW} ${LIBSTAND}
-LDADD=         ${LIBFICL} ${LIBOFW} -lstand
+LDADD=         ${LIBFICL} ${LIBOFW} ${LIBSTAND}
 
 SC_DFLT_FONT=cp437
 

Modified: head/sys/boot/powerpc/uboot/Makefile
==============================================================================
--- head/sys/boot/powerpc/uboot/Makefile        Fri Feb  7 22:30:42 2014        
(r261613)
+++ head/sys/boot/powerpc/uboot/Makefile        Fri Feb  7 22:49:42 2014        
(r261614)
@@ -95,10 +95,11 @@ CFLAGS+=    -I${.CURDIR}/../../uboot/lib
 CFLAGS+=       -I${.OBJDIR}/../../uboot/lib
 
 # where to get libstand from
+LIBSTAND=      ${.OBJDIR}/../../libstand32/libstand.a
 CFLAGS+=       -I${.CURDIR}/../../../../lib/libstand/
 
 DPADD=         ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
-LDADD=         ${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand
+LDADD=         ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
 
 vers.c:        ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
        sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"