Make it rumprun[-MACHINE_ARCH[-PLATFORM]]

That way MACHINE_ARCH (if it exists in the particular name),
is always in the same spot, and the same holds for PLATFORM.

diff --git a/app-tools/Makefile b/app-tools/Makefile
index 2e47c3602efd7c0ef105898ba8812b6b49d8abbf..aaa992aa78b30e402e90893f3883bdf2633942b2 100644 (file)
--- a/app-tools/Makefile
+++ b/app-tools/Makefile
@@ -34,11 +34,11 @@ GENS=               ${GENS.bin} ${GENS.files} ${GENS.specs}
 app-tools: ${GENS}
 
 include ../global.mk
-LDFLAGS_BAKE:= ${LDFLAGS.${PLATFORM}.${MACHINE_ARCH}}
+LDFLAGS_BAKE:= ${LDFLAGS.${MACHINE_ARCH}.${PLATFORM}}
 
 BRSOURCEDIR:=$(dir ${AR})
-BRLIBEXECINST:= ${INSTALLDIR}/libexec/rumprun-${PLATFORM}-${MACHINE_ARCH}/
-BRLIBEXECDEST:= ${RRDEST}/libexec/rumprun-${PLATFORM}-${MACHINE_ARCH}/
+BRLIBEXECINST:= ${INSTALLDIR}/libexec/rumprun-${MACHINE_ARCH}-${PLATFORM}/
+BRLIBEXECDEST:= ${RRDEST}/libexec/rumprun-${MACHINE_ARCH}-${PLATFORM}/
 
 LIBEXEC_CC:= $(subst ${BRSOURCEDIR},${BRLIBEXECDEST},${CC})
 LIBEXEC_CXX:= $(subst ${BRSOURCEDIR},${BRLIBEXECDEST},${CXX})

diff --git a/app-tools/specs-bake.in b/app-tools/specs-bake.in
index 52c877f509c5586b779a0739af878b7bd6a39036..d43dc69d6601c0603f9dc0c614584743b96408ef 100644 (file)
--- a/app-tools/specs-bake.in
+++ b/app-tools/specs-bake.in
@@ -1,16 +1,16 @@
 *startfile:
-!DESTDIR!/lib/rumprun-!PLATFORM!-!MACHINE_ARCH!/rumprun.o
+!DESTDIR!/lib/rumprun-!MACHINE_ARCH!-!PLATFORM!/rumprun.o
 
 *endfile:
 
 
 *lib:
-!LDFLAGS_BAKE! -L!DESTDIR!/lib/rumprun-!PLATFORM!-!MACHINE_ARCH!       \
+!LDFLAGS_BAKE! -L!DESTDIR!/lib/rumprun-!MACHINE_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-!PLATFORM!-!MACHINE_ARCH!.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_ARCH!-!PLATFORM!.ldscript %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}
 
 %rename link_libgcc old_link_libgcc
 

diff --git a/build-rr.sh b/build-rr.sh
index a566fa6567dcd4e9f26691d0a29ce2c87611e52a..631378251203423d453cfc2631236dc4600102ba 100755 (executable)
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -239,7 +239,7 @@ setvars ()
        MACHINE="${BUILDRUMP_MACHINE}"
 
        if [ -z "${RROBJ}" ]; then
-               RROBJ="./obj-${PLATFORM}-${MACHINE}${EXTSRC}"
+               RROBJ="./obj-${MACHINE}-${PLATFORM}${EXTSRC}"
                ${KERNONLY} && RROBJ="${RROBJ}-kernonly"
        fi
        STAGING="${RROBJ}/dest.stage"
@@ -406,7 +406,7 @@ dobuild ()
        buildrump "$@"
        mkdir -p ${STAGING}/lib/rumprun-${MACHINE_ARCH} \
            || die cannot create libdir
-       mkdir -p ${STAGING}/lib/rumprun-${PLATFORM}-${MACHINE_ARCH} \
+       mkdir -p ${STAGING}/lib/rumprun-${MACHINE_ARCH}-${PLATFORM} \
            || die cannot create libdir
 
        ${MAKE} -C ${PLATFORMDIR} links
@@ -444,15 +444,15 @@ doinstall ()
                cd ${STAGING}
                rm -rf lib/pkgconfig
                find lib -maxdepth 1 -name librump\*.a \
-                   -exec mv -f '{}' lib/rumprun-${PLATFORM}-${MACHINE_ARCH}/ \;
+                   -exec mv -f '{}' lib/rumprun-${MACHINE_ARCH}-${PLATFORM}/ \;
                find lib -maxdepth 1 -name \*.a \
                    -exec mv -f '{}' lib/rumprun-${MACHINE_ARCH}/ \;
 
                # make sure special cases are visible everywhere
                for x in c pthread ; do
-                       rm -f lib/rumprun-${PLATFORM}-${MACHINE_ARCH}/lib${x}.a
+                       rm -f lib/rumprun-${MACHINE_ARCH}-${PLATFORM}/lib${x}.a
                        ln -s ../rumprun-${MACHINE_ARCH}/lib${x}.a \
-                           lib/rumprun-${PLATFORM}-${MACHINE_ARCH}/lib${x}.a
+                           lib/rumprun-${MACHINE_ARCH}-${PLATFORM}/lib${x}.a
                done
                find . -maxdepth 1 \! -path . \! -path ./include\* \
                    | xargs tar -cf -

diff --git a/global.mk b/global.mk
index 274f9349b99e1e73a50e29500b017c86a3a4f108..5995507053c417c30c49795a5355b812af95605f 100644 (file)
--- a/global.mk
+++ b/global.mk
@@ -16,7 +16,7 @@ ifndef NOGCCERROR
 CFLAGS+= -Werror
 endif
 
-LDFLAGS.hw.x86_64= -z max-page-size=0x1000
+LDFLAGS.x86_64.hw= -z max-page-size=0x1000
 
 ifeq (${BUILDRR},true)
 INSTALLDIR=     ${RROBJ}/dest.stage

diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index dc386f00adf5f8cef67f652d53caf237ea5c192b..718a06ff1f7b7d6792bccf43dbfe97a2e67828dc 100644 (file)
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -28,7 +28,7 @@ LIBDIR:=      $(abspath ../../lib)
 COMMONDIR:=    $(abspath ../)
 
 INSTALLDIR_LIBARCH:=   ${INSTALLDIR}/lib/rumprun-${MACHINE_ARCH}
-INSTALLDIR_LIBPLAT:=   ${INSTALLDIR}/lib/rumprun-${PLATFORM}-${MACHINE_ARCH}
+INSTALLDIR_LIBPLAT:=   ${INSTALLDIR}/lib/rumprun-${MACHINE_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-${PLATFORM}-${MACHINE_ARCH}.ldscript
+       install -m 0444 ${LDSCRIPT} ${INSTALLDIR}/lib/rumprun-${MACHINE_ARCH}-${PLATFORM}.ldscript
 
 .PHONY: installuser
 installuser:

diff --git a/tests/nolibc/Makefile b/tests/nolibc/Makefile
index 8e95934119998acc55ea7913d8cfd8ab1a84ca9c..6f5814873ae548db96f96a2caebb42465cbdfeec 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-${PLATFORM}-${MACHINE_ARCH})
+LDFLAGS:= -L$(abspath ../../rumprun/lib/rumprun-${MACHINE_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.${PLATFORM}.${MACHINE_ARCH}}
+LDFLAGS+= ${LDFLAGS.${MACHINE_ARCH}.${PLATFORM}}
 
 OBJS= main.o ${RROBJ}/rumprun.o