Use MACHINE_GNU_ARCH, not MACHINE_ARCH

That matches the terms (and make variables!) with the NetBSD
Makefiles and avoids mismatch lossage.

diff --git a/app-tools/Makefile b/app-tools/Makefile
index c81deef74b8d8fdbb4830bc6ef17ecc989398664..c2b663f17e230b7c0de455e81c50b9ade955c339 100644 (file)
--- a/app-tools/Makefile
+++ b/app-tools/Makefile
@@ -36,14 +36,14 @@ GENS=               ${GENS.bin} ${GENS.files} ${GENS.archspecs} ${GENS.machspecs}
 app-tools: ${GENS}
 
 include ../global.mk
-LDFLAGS_BAKE:= ${LDFLAGS.${MACHINE_ARCH}.${PLATFORM}}
+LDFLAGS_BAKE:= ${LDFLAGS.${MACHINE_GNU_ARCH}.${PLATFORM}}
 
 BRSOURCEDIR:=$(dir ${AR})
-BRLIBEXECINST:= ${INSTALLDIR}/libexec/rumprun-${MACHINE_ARCH}-${PLATFORM}/
-BRLIBEXECDEST:= ${RRDEST}/libexec/rumprun-${MACHINE_ARCH}-${PLATFORM}/
+BRLIBEXECINST:= ${INSTALLDIR}/libexec/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}/
+BRLIBEXECDEST:= ${RRDEST}/libexec/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}/
 
-ARCHDIR:= rumprun-${MACHINE_ARCH}
-MACHDIR:= rumprun-${MACHINE_ARCH}-${PLATFORM}
+ARCHDIR:= rumprun-${MACHINE_GNU_ARCH}
+MACHDIR:= rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}
 
 LIBEXEC_CC:= $(subst ${BRSOURCEDIR},${BRLIBEXECDEST},${CC})
 LIBEXEC_CXX:= $(subst ${BRSOURCEDIR},${BRLIBEXECDEST},${CXX})
@@ -61,7 +61,7 @@ ${TOOLOBJ}/${2}: ${1} Makefile ${TOOLOBJ}
                -e 's#!LIBEXEC_CXX!#$(LIBEXEC_CXX)#g;'                  \
                -e 's#!TOOLS_CC!#$(TOOLS_CC)#g;'                        \
                -e 's#!TOOLS_CXX!#$(TOOLS_CXX)#g;'                      \
-               -e 's#!MACHINE_ARCH!#$(MACHINE_ARCH)#g;'                \
+               -e 's#!MACHINE_GNU_ARCH!#$(MACHINE_GNU_ARCH)#g;'        \
                -e 's#!TOOLTUPLE!#$(TOOLTUPLE)#g;'                      \
                -e 's#!DESTDIR!#$(RRDEST)#g;'                           \
                -e 's#!PLATFORM!#$(PLATFORM)#g;'                        \

diff --git a/app-tools/cc.in b/app-tools/cc.in
index 14f55c16fa1621b62e0845883955c47db16fdcf8..5b72a5e7682b3222f0b0dcb35effa98556abf663 100644 (file)
--- a/app-tools/cc.in
+++ b/app-tools/cc.in
@@ -70,7 +70,7 @@ done
 case ${MODE} in
 compile)
        exec ${CC} ${CFLAGS} -no-integrated-cpp \
-           -specs=!DESTDIR!/lib/rumprun-!MACHINE_ARCH!/specs-compile_or_ferment \
+           -specs=!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!/specs-compile_or_ferment \
            "$@" ${EXTRALIBS}
        ;;
 ferment)
@@ -80,7 +80,7 @@ ferment)
        # with no rump components. '-u main' is necessary to pull in main if the
        # user is linking it in from a library.
        ${CC} ${CFLAGS} -no-integrated-cpp \
-           -specs=!DESTDIR!/lib/rumprun-!MACHINE_ARCH!/specs-compile_or_ferment \
+           -specs=!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!/specs-compile_or_ferment \
            -Wl,-r -Wl,-u,main \
            "$@" !DESTDIR!/share/!TOOLTUPLE!-recipe.s ${EXTRALIBS} || die
 
@@ -102,7 +102,7 @@ ferment)
 
        # Try a stub link with minimal rump components. If that fails then stop.
        ${CC} ${CFLAGS} -no-integrated-cpp \
-           -specs=!DESTDIR!/lib/rumprun-!MACHINE_ARCH!/specs-stub \
+           -specs=!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!/specs-stub \
            ${OUTFILE} -o /dev/null
        if [ $? -ne 0 ]; then
                if [ "${RUMPRUN_STUBLINK}" = "succeed" ]; then

diff --git a/app-tools/rumprun-bake.in b/app-tools/rumprun-bake.in
index 22a0a6553c2369e3932b5935b4a99a64f26e9c65..3c4b8ca2c0e4c73270465127d7b3369541eaa0c4 100644 (file)
--- a/app-tools/rumprun-bake.in
+++ b/app-tools/rumprun-bake.in
@@ -361,11 +361,11 @@ for f in "$@"; do
        objnum=$((${objnum}+1))
 done
 
-MACHINE_ARCH=${RUMPBAKE_TUPLE%%-*}
+MACHINE_GNU_ARCH=${RUMPBAKE_TUPLE%%-*}
 
 # Final link using cc to produce the unikernel image.
 ${runcmd} ${RUMPBAKE_BACKINGCC} ${RUMPBAKE_CFLAGS}                     \
-    -specs=${RUMPBAKE_TOOLDIR}/lib/rumprun-${MACHINE_ARCH}-${PLATFORM}/specs-bake \
+    -specs=${RUMPBAKE_TOOLDIR}/lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}/specs-bake \
     -o ${OUTPUT} ${allobjs}                                            \
     -Wl,--whole-archive ${LIBS} || exit 1
 

diff --git a/app-tools/specs-bake.in b/app-tools/specs-bake.in
index d43dc69d6601c0603f9dc0c614584743b96408ef..de6440883ae8ecc49f27dcf6028b1fdb18487bb5 100644 (file)
--- a/app-tools/specs-bake.in
+++ b/app-tools/specs-bake.in
@@ -1,16 +1,16 @@
 *startfile:
-!DESTDIR!/lib/rumprun-!MACHINE_ARCH!-!PLATFORM!/rumprun.o
+!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!-!PLATFORM!/rumprun.o
 
 *endfile:
 
 
 *lib:
-!LDFLAGS_BAKE! -L!DESTDIR!/lib/rumprun-!MACHINE_ARCH!-!PLATFORM!       \
+!LDFLAGS_BAKE! -L!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!-!PLATFORM!   \
     --whole-archive -lrump --no-whole-archive                          \
     --start-group -lrumprun_base -lpthread -lc --end-group
 
 *link:
-%{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} -T !DESTDIR!/lib/rumprun-!MACHINE_ARCH!-!PLATFORM!.ldscript %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}
+%{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} -T !DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!-!PLATFORM!.ldscript %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}
 
 %rename link_libgcc old_link_libgcc
 

diff --git a/app-tools/specs-compile_or_ferment.in b/app-tools/specs-compile_or_ferment.in
index 306feafe347647aaa8ff0cb3b3d519c24a676a68..cadd464889d7f4e6e9215bb99c1de8fdee20739c 100644 (file)
--- a/app-tools/specs-compile_or_ferment.in
+++ b/app-tools/specs-compile_or_ferment.in
@@ -18,7 +18,7 @@
 
 
 *lib:
--L!DESTDIR!/lib/rumprun-!MACHINE_ARCH!
+-L!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!
 
 *link:
 %{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} %:remove-outfile(-lstdc++) %{rdynamic:}

diff --git a/app-tools/specs-stub.in b/app-tools/specs-stub.in
index 5659a6c38003dc8ba90bde129eff24da2668c203..05bd9688814067f0d84b6c5603189962b348d22d 100644 (file)
--- a/app-tools/specs-stub.in
+++ b/app-tools/specs-stub.in
@@ -5,9 +5,9 @@
 
 
 *lib:
--L!DESTDIR!/lib/rumprun-!MACHINE_ARCH!         \
+-L!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!             \
     --start-group -lpthread -lc --end-group    \
-    !DESTDIR!/lib/rumprun-!MACHINE_ARCH!/pseudolinkstubs.o
+    !DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!/pseudolinkstubs.o
 
 *link:
 %{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}

diff --git a/build-rr.sh b/build-rr.sh
index 4c246972b2b754574f843e42a948380a5471861c..b4d995e7d71e746d24ca8a27c45f8b52565c2856 100755 (executable)
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -237,7 +237,7 @@ setvars ()
 
        . ${RUMPTOOLS}/proberes.sh
        MACHINE="${BUILDRUMP_MACHINE}"
-       MACHINE_ARCH="${BUILDRUMP_MACHINE_GNU_ARCH}"
+       MACHINE_GNU_ARCH="${BUILDRUMP_MACHINE_GNU_ARCH}"
 
        if [ -z "${RROBJ}" ]; then
                RROBJ="./obj-${MACHINE}-${PLATFORM}${EXTSRC}"
@@ -266,7 +266,7 @@ buildrump ()
        checkprevbuilds
 
        extracflags=
-       [ "${MACHINE_ARCH}" = "x86_64" ] \
+       [ "${MACHINE_GNU_ARCH}" = "x86_64" ] \
            && extracflags='-F CFLAGS=-mno-red-zone'
 
        # build tools
@@ -283,9 +283,6 @@ buildrump ()
 
        RUMPMAKE=$(pwd)/${RUMPTOOLS}/rumpmake
 
-       # this is slightly ridiculous
-       echo ${MACHINE_ARCH} > ${RROBJ}/.machine_arch
-
        TOOLTUPLE=$(${RUMPMAKE} -f bsd.own.mk \
            -V '${MACHINE_GNU_PLATFORM:S/--netbsd/-rumprun-netbsd/}')
 
@@ -369,7 +366,7 @@ makeconfig ()
        echo "RUMPMAKE=${quote}${RUMPMAKE}${quote}" >> ${1}
        echo "BUILDRUMP_TOOLFLAGS=${quote}$(pwd)/${RUMPTOOLS}/toolchain-conf.mk${quote}" >> ${1}
        echo "MACHINE=${quote}${MACHINE}${quote}" >> ${1}
-       echo "MACHINE_ARCH=${quote}${MACHINE_ARCH}${quote}" >> ${1}
+       echo "MACHINE_GNU_ARCH=${quote}${MACHINE_GNU_ARCH}${quote}" >> ${1}
        echo "TOOLTUPLE=${quote}${TOOLTUPLE}${quote}" >> ${1}
        echo "KERNONLY=${quote}${KERNONLY}${quote}" >> ${1}
        echo "PLATFORM=${quote}${PLATFORM}${quote}" >> ${1}
@@ -403,9 +400,9 @@ dobuild ()
        . ${PLATFORMDIR}/platform.conf
 
        buildrump "$@"
-       mkdir -p ${STAGING}/lib/rumprun-${MACHINE_ARCH} \
+       mkdir -p ${STAGING}/lib/rumprun-${MACHINE_GNU_ARCH} \
            || die cannot create libdir
-       mkdir -p ${STAGING}/lib/rumprun-${MACHINE_ARCH}-${PLATFORM} \
+       mkdir -p ${STAGING}/lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM} \
            || die cannot create libdir
 
        ${MAKE} -C ${PLATFORMDIR} links
@@ -442,15 +439,15 @@ doinstall ()
                cd ${STAGING}
                rm -rf lib/pkgconfig
                find lib -maxdepth 1 -name librump\*.a \
-                   -exec mv -f '{}' lib/rumprun-${MACHINE_ARCH}-${PLATFORM}/ \;
+                   -exec mv -f '{}' lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}/ \;
                find lib -maxdepth 1 -name \*.a \
-                   -exec mv -f '{}' lib/rumprun-${MACHINE_ARCH}/ \;
+                   -exec mv -f '{}' lib/rumprun-${MACHINE_GNU_ARCH}/ \;
 
                # make sure special cases are visible everywhere
                for x in c pthread ; do
-                       rm -f lib/rumprun-${MACHINE_ARCH}-${PLATFORM}/lib${x}.a
-                       ln -s ../rumprun-${MACHINE_ARCH}/lib${x}.a \
-                           lib/rumprun-${MACHINE_ARCH}-${PLATFORM}/lib${x}.a
+                       rm -f lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}/lib${x}.a
+                       ln -s ../rumprun-${MACHINE_GNU_ARCH}/lib${x}.a \
+                           lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}/lib${x}.a
                done
                find . -maxdepth 1 \! -path . \! -path ./include\* \
                    | xargs tar -cf -

diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 718a06ff1f7b7d6792bccf43dbfe97a2e67828dc..85b6308dcf5612a68201615a17fa131b3b012b81 100644 (file)
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -27,8 +27,8 @@ LIBDIR:=      $(abspath ../../lib)
 
 COMMONDIR:=    $(abspath ../)
 
-INSTALLDIR_LIBARCH:=   ${INSTALLDIR}/lib/rumprun-${MACHINE_ARCH}
-INSTALLDIR_LIBPLAT:=   ${INSTALLDIR}/lib/rumprun-${MACHINE_ARCH}-${PLATFORM}
+INSTALLDIR_LIBARCH:=   ${INSTALLDIR}/lib/rumprun-${MACHINE_GNU_ARCH}
+INSTALLDIR_LIBPLAT:=   ${INSTALLDIR}/lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}
 
 define BUILDLIB_target
 .PHONY: $${RROBJLIB}/${1}/${1}.a
@@ -101,7 +101,7 @@ tests: ${MAINOBJ} commonlibs
 .PHONY: installkern
 installkern:
        install -m 0444 ${MAINOBJ} ${INSTALLDIR_LIBPLAT}
-       install -m 0444 ${LDSCRIPT} ${INSTALLDIR}/lib/rumprun-${MACHINE_ARCH}-${PLATFORM}.ldscript
+       install -m 0444 ${LDSCRIPT} ${INSTALLDIR}/lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}.ldscript
 
 .PHONY: installuser
 installuser:

diff --git a/platform/hw/Makefile b/platform/hw/Makefile
index 2cc018af1dbb1b38d631016750d1c593f48ccaf0..222bc408f620940d8df6a7dc92d034d3447b3d33 100644 (file)
--- a/platform/hw/Makefile
+++ b/platform/hw/Makefile
@@ -30,7 +30,7 @@ $(error only supported target is x86, you have ${MACHINE})
 endif
 
 ARCHDIR?= ${MACHINE}
-HW_MACHINE_ARCH?= ${MACHINE_ARCH}
+HW_MACHINE_ARCH?= ${MACHINE_GNU_ARCH}
 
 LDSCRIPT:=     $(abspath arch/${ARCHDIR}/kern.ldscript)
 OBJS_BMK+=     intr.o clock_subr.o kernel.o multiboot.o undefs.o

diff --git a/tests/nolibc/Makefile b/tests/nolibc/Makefile
index 6f5814873ae548db96f96a2caebb42465cbdfeec..1a20197ccaa546f20106979babb1c0d18972ed97 100644 (file)
--- a/tests/nolibc/Makefile
+++ b/tests/nolibc/Makefile
@@ -3,7 +3,7 @@ include ${BUILDRUMP_TOOLFLAGS}
 
 CFLAGS+=       ${BUILDRUMP_TOOL_CFLAGS}
 
-LDFLAGS:= -L$(abspath ../../rumprun/lib/rumprun-${MACHINE_ARCH}-${PLATFORM})
+LDFLAGS:= -L$(abspath ../../rumprun/lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM})
 LDFLAGS+= -L${RROBJ}/lib/libcompiler_rt
 
 CPPFLAGS+= -I../../include -I../../rumprun/include/rumprun
@@ -11,7 +11,7 @@ CPPFLAGS+= -I../../platform/${PLATFORM}/include
 
 LDSCRIPT= ${RROBJ}/bmk.ldscript
 
-LDFLAGS+= ${LDFLAGS.${MACHINE_ARCH}.${PLATFORM}}
+LDFLAGS+= ${LDFLAGS.${MACHINE_GNU_ARCH}.${PLATFORM}}
 
 OBJS= main.o ${RROBJ}/rumprun.o