Module Name: src Committed By: uwe Date: Thu Apr 20 19:09:29 UTC 2017
Modified Files: src/sys/arch/macppc/stand: Makefile.inc src/sys/arch/macppc/stand/bootxx: Makefile src/sys/arch/macppc/stand/ofwboot: Makefile Log Message: Quash .eh_frame unwind tables in boot code. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/stand/Makefile.inc cvs rdiff -u -r1.15 -r1.16 src/sys/arch/macppc/stand/bootxx/Makefile cvs rdiff -u -r1.57 -r1.58 src/sys/arch/macppc/stand/ofwboot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/macppc/stand/Makefile.inc diff -u src/sys/arch/macppc/stand/Makefile.inc:1.3 src/sys/arch/macppc/stand/Makefile.inc:1.4 --- src/sys/arch/macppc/stand/Makefile.inc:1.3 Mon Feb 7 16:26:59 2000 +++ src/sys/arch/macppc/stand/Makefile.inc Thu Apr 20 19:09:29 2017 @@ -1,3 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.3 2000/02/07 16:26:59 tsubai Exp $ +# $NetBSD: Makefile.inc,v 1.4 2017/04/20 19:09:29 uwe Exp $ BINDIR= /usr/mdec + +CFLAGS_UNWIND.gcc= -fno-unwind-tables -fno-asynchronous-unwind-tables +CFLAGS_UNWIND.clang= -fno-unwind-tables + +LINKFLAGS_UNWIND= --no-ld-generated-unwind-info Index: src/sys/arch/macppc/stand/bootxx/Makefile diff -u src/sys/arch/macppc/stand/bootxx/Makefile:1.15 src/sys/arch/macppc/stand/bootxx/Makefile:1.16 --- src/sys/arch/macppc/stand/bootxx/Makefile:1.15 Sun Aug 10 17:44:26 2014 +++ src/sys/arch/macppc/stand/bootxx/Makefile Thu Apr 20 19:09:29 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2014/08/10 17:44:26 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2017/04/20 19:09:29 uwe Exp $ S!= cd ${.CURDIR}/../../../..; pwd @@ -14,9 +14,11 @@ LIBC= # nothing CFLAGS= -Os -Wall -ffreestanding CFLAGS+= ${${ACTIVE_CC} == "gcc":? -msoft-float :} +CFLAGS+= ${CFLAGS_UNWIND.${ACTIVE_CC}} CPPFLAGS+= -D_STANDALONE -DPPC_OEA -I${.OBJDIR} -I${S} STRIPFLAG= LINKFLAGS= -x -N -Ttext 4000 -e _start +LINKFLAGS+= ${LINKFLAGS_UNWIND} CLEANFILES+= ${PROG}.sym ${PROG}: ${OBJS} Index: src/sys/arch/macppc/stand/ofwboot/Makefile diff -u src/sys/arch/macppc/stand/ofwboot/Makefile:1.57 src/sys/arch/macppc/stand/ofwboot/Makefile:1.58 --- src/sys/arch/macppc/stand/ofwboot/Makefile:1.57 Thu Apr 20 18:39:28 2017 +++ src/sys/arch/macppc/stand/ofwboot/Makefile Thu Apr 20 19:09:29 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2017/04/20 18:39:28 uwe Exp $ +# $NetBSD: Makefile,v 1.58 2017/04/20 19:09:29 uwe Exp $ S= ${.CURDIR}/../../../.. @@ -9,6 +9,7 @@ XCOFFXTRA= Xcoffxtra.c XCOFFXTRAOBJ= Xcoffxtra.o CFLAGS+= -ffreestanding CFLAGS+= ${${ACTIVE_CC} == "gcc":? -msoft-float :} +CFLAGS+= ${CFLAGS_UNWIND.${ACTIVE_CC}} CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith #CPPFLAGS+= -DDEBUG -DNETIF_DEBUG CPPFLAGS+= -D_STANDALONE -DSUPPORT_DHCP @@ -55,6 +56,9 @@ CPPFLAGS+= -I. -I${.CURDIR} -I${.CURDIR} CPPFLAGS+= -DRELOC=0x${RELOC} -DRELOC_FLATFILE=0x${RELOC_FLATFILE} #CPPFLAGS+= -DXCOFF_GLUE # for booting PCI Powermacs +LINKFLAGS= -N -Ttext ${RELOC} -Bstatic +LINKFLAGS+= ${LINKFLAGS_UNWIND} + ### find out what to use for libkern KERN_AS= library .include "${S}/lib/libkern/Makefile.inc" @@ -82,7 +86,7 @@ all realall: ${PROG} ${PROG}.xcf ${PROG} ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${_MKTARGET_LINK} - ${LD} -s -N -Ttext ${RELOC} -Bstatic -o ${PROG}.el1 \ + ${LD} -s -o ${PROG}.el1 ${LINKFLAGS} \ ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${OBJCOPY} -O binary ${PROG}.el1 ${PROG} @@ -91,13 +95,14 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBK ${PROG}.elf: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${_MKTARGET_LINK} - ${LD} -s -N -Ttext ${RELOC} -Bstatic -o ${PROG}.elf \ + ${LD} -s -o ${PROG}.elf ${LINKFLAGS} \ ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${PROG}.xcf: ${OBJS} ${XCOFFXTRAOBJ} ${LIBSA} ${LIBZ} ${LIBKERN} ${_MKTARGET_LINK} - ${LD} -N -T ${.CURDIR}/../fixcoff/elf32_powerpc_merge.x -e _entry \ - -Ttext ${RELOC} -Bstatic -o ${PROG}.mrg ${XCOFFXTRAOBJ} \ + ${LD} -o ${PROG}.mrg ${LINKFLAGS} \ + -T ${.CURDIR}/../fixcoff/elf32_powerpc_merge.x \ + -e _entry ${XCOFFXTRAOBJ} \ ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${OBJCOPY} -O aixcoff-rs6000 -R .comment -R .note \ ${PROG}.mrg ${PROG}.xcf