From 672a4e8d8891258bd298888c3634939eb63d4ffb Mon Sep 17 00:00:00 2001
From: daniel-k <github@daniel-krebs.net>
Date: Wed, 18 May 2016 00:36:22 +0200
Subject: [PATCH] xray: integrate into build system

---
 hermit/usr/Makefile          |  2 ++
 hermit/usr/xray/Makefile     | 26 ++++++++++++++++++++++++++
 hermit/usr/xray/libxray.spec |  3 +++
 3 files changed, 31 insertions(+)
 create mode 100644 hermit/usr/xray/Makefile
 create mode 100644 hermit/usr/xray/libxray.spec

diff --git a/hermit/usr/Makefile b/hermit/usr/Makefile
index 5b2528c73..308d9c6ad 100644
--- a/hermit/usr/Makefile
+++ b/hermit/usr/Makefile
@@ -63,6 +63,7 @@ pte:
 
 libs:
 	@echo Build OpenMP Runtime and iRCCE
+	$Q$(MAKE) TARGET=$(TARGET) CC_FOR_TARGET=$(CC_FOR_TARGET) CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" LDFLAGS_FOR_TARGET="$(LDFLAGS_FOR_TARGET)" -C xray
 	$Q$(MAKE) TARGET=$(TARGET) CXX_FOR_TARGET=$(CXX_FOR_TARGET) CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" CC_FOR_TARGET=$(CC_FOR_TARGET) AR_FOR_TARGET=$(AR_FOR_TARGET) CFLAGS_FOR_TARGET+="-I. -Wall -pthread" -C $(OMPRT) depend
 	$Q$(MAKE) TARGET=$(TARGET) CXX_FOR_TARGET=$(CXX_FOR_TARGET) CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" CC_FOR_TARGET=$(CC_FOR_TARGET) AR_FOR_TARGET=$(AR_FOR_TARGET) CFLAGS_FOR_TARGET+="-I. -Wall -pthread" -C $(OMPRT)
 	$Q$(MAKE) TARGET=$(TARGET) CC_FOR_TARGET=$(CC_FOR_TARGET) AR_FOR_TARGET=$(AR_FOR_TARGET) CFLAGS_FOR_TARGET+="-I. -Wall" -C ircce depend
@@ -93,6 +94,7 @@ clean:
 	$Q$(MAKE) -C tests clean
 	$Q$(MAKE) -C benchmarks clean
 	$Q$(MAKE) -C openmpbench clean
+	$Q$(MAKE) -C xray clean
 
 veryclean:
 	@echo Propper cleaning of the toolchain
diff --git a/hermit/usr/xray/Makefile b/hermit/usr/xray/Makefile
new file mode 100644
index 000000000..369ead594
--- /dev/null
+++ b/hermit/usr/xray/Makefile
@@ -0,0 +1,26 @@
+NEWLIB = ../x86/x86_64-hermit
+CP = cp
+NAME = libxray.a
+
+CC_FOR_TARGET ?= gcc
+AR_FOR_TARGET ?= ar
+
+CFLAGS = -DXRAY -DXRAY_DISABLE_BROWSER_INTEGRATION -DXRAY_NO_DEMANGLE -DXRAY_ANNOTATE
+
+CFLAGS += ${CFLAGS_FOR_TARGET}
+
+OBJS = xray.o stringpool.o hashtable.o symtable.o demangle.o parsesymbols.o report.o
+
+
+$(NAME): $(OBJS)
+	$(AR_FOR_TARGET) rsv $@ $(OBJS)
+	$(CP) $@ $(NEWLIB)/lib
+	$(CP) libxray.spec $(NEWLIB)/lib
+	$(CP) xray.h $(NEWLIB)/include
+
+%.o: %.c
+	@echo [CC] $@
+	@$(CC_FOR_TARGET) $(CFLAGS) -c $< -o $@
+
+clean:
+	rm -f *.o $(NAME)
diff --git a/hermit/usr/xray/libxray.spec b/hermit/usr/xray/libxray.spec
new file mode 100644
index 000000000..ee2e0d06d
--- /dev/null
+++ b/hermit/usr/xray/libxray.spec
@@ -0,0 +1,3 @@
+# Do we really need this? Does this even what we want?
+*link_xray: -lxray
+