summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2001-02-25 07:51:19 +0000
committerpeter <peter@FreeBSD.org>2001-02-25 07:51:19 +0000
commiteccd7b6a58cadd545a2ac78ede4226414e8d130b (patch)
treea3b52a23f3255948c70d53ddc304fcf50341cd22 /sys/conf
parentbded4d8c3026311cdf377ff814859b39b1f34b3f (diff)
downloadFreeBSD-src-eccd7b6a58cadd545a2ac78ede4226414e8d130b.zip
FreeBSD-src-eccd7b6a58cadd545a2ac78ede4226414e8d130b.tar.gz
genassym.sh does not work with a.out because the sizes are rounded up
by the compiler. ie: char foo[0] comes out as 4 bytes on a.out, and we depended on it coming out as 0 for the script version. :-( Make double sure that genassym.o is built and nm'ed in elf mode. (ia64 skipped since it is stuck on the linux toolchain and doesn't understand the -elf switches)
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/Makefile.alpha4
-rw-r--r--sys/conf/Makefile.i3864
-rw-r--r--sys/conf/Makefile.pc984
-rw-r--r--sys/conf/Makefile.powerpc4
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index fff6a24..c447400 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -183,10 +183,10 @@ setdef0.c setdef1.c setdefs.h: Makefile ${OBJS}
./assym.s: assym.s
assym.s: $S/kern/genassym.sh genassym.o
- sh $S/kern/genassym.sh genassym.o > ${.TARGET}
+ OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
genassym.o: $S/$M/$M/genassym.c
- ${CC} -c ${CFLAGS} $S/$M/$M/genassym.c
+ ${CC} -c ${CFLAGS} -elf $S/$M/$M/genassym.c
SYSTEM_OBJS+= __divqu.o __divq.o __divlu.o __divl.o
SYSTEM_OBJS+= __remqu.o __remq.o __remlu.o __reml.o
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index f92c654..d42199c 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -188,10 +188,10 @@ setdef0.c setdef1.c setdefs.h: Makefile ${OBJS}
./assym.s: assym.s
assym.s: $S/kern/genassym.sh genassym.o
- sh $S/kern/genassym.sh genassym.o > ${.TARGET}
+ OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
genassym.o: $S/$M/$M/genassym.c
- ${CC} -c ${CFLAGS} $S/$M/$M/genassym.c
+ ${CC} -c ${CFLAGS} -elf $S/$M/$M/genassym.c
${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 9332655..9bafc06 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -190,11 +190,11 @@ setdef0.c setdef1.c setdefs.h: Makefile ${OBJS}
./assym.s: assym.s
assym.s: $S/kern/genassym.sh genassym.o
- sh $S/kern/genassym.sh genassym.o > ${.TARGET}
+ OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
genassym.o: $S/$M/$M/genassym.c
rm -f ./machine ; ln -s $S/$M/include ./machine
- ${CC} -c ${CFLAGS} $S/$M/$M/genassym.c
+ ${CC} -c ${CFLAGS} -elf $S/$M/$M/genassym.c
${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index f92c654..d42199c 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -188,10 +188,10 @@ setdef0.c setdef1.c setdefs.h: Makefile ${OBJS}
./assym.s: assym.s
assym.s: $S/kern/genassym.sh genassym.o
- sh $S/kern/genassym.sh genassym.o > ${.TARGET}
+ OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
genassym.o: $S/$M/$M/genassym.c
- ${CC} -c ${CFLAGS} $S/$M/$M/genassym.c
+ ${CC} -c ${CFLAGS} -elf $S/$M/$M/genassym.c
${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
OpenPOWER on IntegriCloud