diff options
| author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
|---|---|---|
| committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:17:50 +0200 |
| commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
| tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /runtime/Makefile | |
| parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
| parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
| download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip | |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'runtime/Makefile')
| -rw-r--r-- | runtime/Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/runtime/Makefile b/runtime/Makefile index 2fdaa4ec..99eeaa54 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -9,6 +9,16 @@ LIB=libcompcert.a INCLUDES=include/float.h include/stdarg.h include/stdbool.h \ include/stddef.h include/varargs.h +VPATH=$(ARCH) + +ifeq ($(ARCH),powerpc) +ifeq ($(MODEL),ppc64) +VPATH=powerpc/ppc64 $(ARCH) +else ifeq ($(MODEL),e5500) +VPATH=powerpc/ppc64 $(ARCH) +endif +endif + ifeq ($(strip $(HAS_RUNTIME_LIB)),true) all: $(LIB) else @@ -19,10 +29,10 @@ $(LIB): $(OBJS) rm -f $(LIB) ar rcs $(LIB) $(OBJS) -%.o: $(ARCH)/%.s +%.o: %.s $(CASMRUNTIME) -o $@ $^ -%.o: $(ARCH)/%.S +%.o: %.S $(CASMRUNTIME) -DMODEL_$(MODEL) -DABI_$(ABI) -DSYS_$(SYSTEM) -o $@ $^ clean:: |