From 3956ee9eeda988648c3f2092c7d31faa0a0e7294 Mon Sep 17 00:00:00 2001 From: David van Moolenbroek Date: Mon, 31 Aug 2015 16:46:42 +0200 Subject: [PATCH] LLVM passes: centralize Makefile structure Make the passes we have so far, hello and WeakAliasModuleOverride, use settings from a Makefile include file in the parent directory. This change is in preparation of adding other passes. Change-Id: Ib195ee7f5c7626f4975368b02c944382e87e3814 --- minix/llvm/passes/Makefile.inc | 33 +++++++++++++++++++ .../passes/WeakAliasModuleOverride/Makefile | 27 ++------------- minix/llvm/passes/hello/Makefile | 27 ++------------- 3 files changed, 39 insertions(+), 48 deletions(-) diff --git a/minix/llvm/passes/Makefile.inc b/minix/llvm/passes/Makefile.inc index 06ff2c535..7661894ff 100644 --- a/minix/llvm/passes/Makefile.inc +++ b/minix/llvm/passes/Makefile.inc @@ -4,3 +4,36 @@ # This files is used with gmake, so do NOT add .include "..." # LLVMPREFIX?=../../../../../obj_llvm.i386/Release+Asserts + +CFLAGS += -D__MINIX -D_MINIX_SYSTEM +INCLUDES += -I../../include + +QUIET=@ +ECHO=echo +CP=cp + +PASSLIBNAME = $(PASSNAME).so + +LLVM_VERSION=$(shell ($(LLVMPREFIX)/bin/llvm-config --version | sed "s/[^0-9]//g")) +CFLAGS += -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -DHAVE_EXCEPTIONS=0 +CFLAGS += $(shell $(LLVMPREFIX)/bin/llvm-config --cxxflags) -g -DLLVM_VERSION=$(LLVM_VERSION) +LDFLAGS += $(shell $(LLVMPREFIX)/bin/llvm-config --ldflags) + +INCLUDES += -I../include + +all: $(PASSLIBNAME) + +$(PASSLIBNAME): $(OBJS) + $(QUIET) $(ECHO) " [LINK] $@" + $(QUIET) $(CXX) $(CFLAGS) -shared -o $@ $(CPPS) $(OBJS) $(LDFLAGS) $(LIBS) + +%.o: %.cpp $(HEADERS) + $(QUIET) $(ECHO) " [C++] $<" + $(QUIET) $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< + +install: $(PASSLIBNAME) + $(QUIET) -mkdir -p ../../bin + $(QUIET) $(CP) $(PASSLIBNAME) ../../bin/$(PASSLIBNAME) + +clean: + -rm -f $(OBJS) $(PASSLIBNAME) diff --git a/minix/llvm/passes/WeakAliasModuleOverride/Makefile b/minix/llvm/passes/WeakAliasModuleOverride/Makefile index 7de1b8085..6f6e30d42 100644 --- a/minix/llvm/passes/WeakAliasModuleOverride/Makefile +++ b/minix/llvm/passes/WeakAliasModuleOverride/Makefile @@ -1,28 +1,7 @@ -include ../Makefile.inc -QUIET=@ -ECHO=echo -CP=cp +PASSNAME:= weak-alias-module-override -PASSLIBNAME:= weak-alias-module-override.so - -LLVM_VERSION = $($LLVMPREFIX/bin/llvm-config --version | sed "s/[^0-9]//g") -CFLAGS += -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -DHAVE_EXCEPTIONS=0 -CFLAGS += $(shell $(LLVMPREFIX)/bin/llvm-config --cxxflags) -g -DLLVM_VERSION=$(LLVM_VERSION) -LDFLAGS += $(shell $(LLVMPREFIX)/bin/llvm-config --ldflags) OBJS= WeakAliasModuleOverride.o +HEADERS= -$(PASSLIBNAME): $(OBJS) - $(QUIET) $(ECHO) " [LINK] $@" - $(QUIET) $(CXX) $(CFLAGS) -shared -o $@ $(CPPS) $(OBJS) $(LDFLAGS) $(LIBS) - -%.o: %.cpp $(HEADERS) - $(QUIET) $(ECHO) " [C++] $<" - $(QUIET) $(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $< - -install: $(PASSLIBNAME) - $(QUIET) -mkdir -p ../../bin - $(QUIET) $(CP) $(PASSLIBNAME) ../../bin/$(PASSLIBNAME) - -clean: - -rm -f *.o *.so +include ../Makefile.inc diff --git a/minix/llvm/passes/hello/Makefile b/minix/llvm/passes/hello/Makefile index ca848156d..4853bbf0f 100644 --- a/minix/llvm/passes/hello/Makefile +++ b/minix/llvm/passes/hello/Makefile @@ -1,28 +1,7 @@ -include ../Makefile.inc -QUIET=@ -ECHO=echo -CP=cp +PASSNAME:= hello -PASSLIBNAME:= hello.so - -LLVM_VERSION=$(shell ($(LLVMPREFIX)/bin/llvm-config --version | sed "s/[^0-9]//g")) -CFLAGS += -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -DHAVE_EXCEPTIONS=0 -CFLAGS += $(shell $(LLVMPREFIX)/bin/llvm-config --cxxflags) -g -DLLVM_VERSION=$(LLVM_VERSION) -LDFLAGS += $(shell $(LLVMPREFIX)/bin/llvm-config --ldflags) OBJS= hello.o +HEADERS= -$(PASSLIBNAME): $(OBJS) - $(QUIET) $(ECHO) " [LINK] $@" - $(QUIET) $(CXX) $(CFLAGS) -shared -o $@ $(CPPS) $(OBJS) $(LDFLAGS) $(LIBS) - -%.o: %.cpp $(HEADERS) - $(QUIET) $(ECHO) " [C++] $<" - $(QUIET) $(CXX) $(CFLAGS) -c -o $@ $< - -install: $(PASSLIBNAME) - $(QUIET) -mkdir -p ../../bin - $(QUIET) $(CP) $(PASSLIBNAME) ../../bin/$(PASSLIBNAME) - -clean: - -rm -f *.o *.so +include ../Makefile.inc