librumprun_unwind -> libunwind

There's nothing rumprun-specific in there.  The original idea with the
rumprun prefix was to avoid namespace conflicts, but if someone wants
to link in another libunwind we'll be in trouble regardless.  Also,
consistency with libcompiler_rt.

diff --git a/app-tools/cc.in b/app-tools/cc.in
index a4730ee1e843ae0756a9a4e0f805cc3e99758ef7..02b3a3feb7a53d6f571a19180f91f999cca2bb8d 100755 (executable)
--- a/app-tools/cc.in
+++ b/app-tools/cc.in
@@ -43,7 +43,7 @@ case $0 in
 *-g++|*-clang++)
        CC="!CXX!"
        CFLAGS="!CXXFLAGS!"
-       EXTRALIBS=-lrumprun_unwind
+       EXTRALIBS=-lunwind
        ;;
 *)
        echo "$0: internal error, unknown invocation"

diff --git a/build-rr.sh b/build-rr.sh
index 043070c830314f1cc639b8773ee21ddbcd39d1b3..84bd4566bd2e87cdeb7566edffa5881b549ed5da 100755 (executable)
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -261,7 +261,7 @@ builduserspace ()
 
        # build unwind bits if we support c++
        if ${HAVECXX}; then
-               ( cd lib/librumprun_unwind
+               ( cd lib/libunwind
                    ${RUMPMAKE} dependall && ${RUMPMAKE} install )
        fi
 }

diff --git a/lib/librumprun_unwind/Makefile b/lib/librumprun_unwind/Makefile
deleted file mode 100644 (file)
index 9e11b4b..0000000
--- a/lib/librumprun_unwind/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.include <bsd.own.mk>
-
-RUMPTOP= ${TOPRUMP}
-
-LIB=   rumprun_unwind
-
-CPPFLAGS+= -isystem ${DESTDIR}/usr/include/c++
-
-LIBC_MACHINE_CPU?= ${MACHINE_CPU}
-.include "${RUMPTOP}/../lib/libunwind/Makefile.inc"
-
-.include <bsd.lib.mk>

diff --git a/lib/libunwind/Makefile b/lib/libunwind/Makefile
new file mode 100644 (file)
index 0000000..9e11b4b
--- /dev/null
+++ b/lib/libunwind/Makefile
@@ -0,0 +1,12 @@
+.include <bsd.own.mk>
+
+RUMPTOP= ${TOPRUMP}
+
+LIB=   rumprun_unwind
+
+CPPFLAGS+= -isystem ${DESTDIR}/usr/include/c++
+
+LIBC_MACHINE_CPU?= ${MACHINE_CPU}
+.include "${RUMPTOP}/../lib/libunwind/Makefile.inc"
+
+.include <bsd.lib.mk>