diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-09-10 14:09:48 -0400 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-09-10 14:09:48 -0400 |
| commit | 12d8c50580f06ba48fd1563508e49fcaabd936d0 (patch) | |
| tree | c4b4cc09e0e23b71f5c6450ef62d840ef256daf2 | |
| parent | 00b76322d905ce517b334898ca9fed5ad6569c5b (diff) | |
| parent | df4e8c759f7ba0851dbe30858b62efe3b76ff373 (diff) | |
Merge remote-tracking branch 'github/prop/robust-tie-break' into wip-gpu-rtas12
Conflicts:
Makefile
| -rw-r--r-- | Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
| @@ -153,8 +153,12 @@ arch/${include-${ARCH}}/include/asm/%.h: \ | |||
| 153 | @mkdir -p ${dir $@} | 153 | @mkdir -p ${dir $@} |
| 154 | cp $< $@ | 154 | cp $< $@ |
| 155 | 155 | ||
| 156 | litmus-headers = include/litmus/rt_param.h include/litmus/binheap.h include/litmus/unistd_32.h \ | 156 | litmus-headers = \ |
| 157 | include/litmus/unistd_64.h include/litmus/fpmath.h | 157 | include/litmus/rt_param.h \ |
| 158 | include/litmus/fpmath.h \ | ||
| 159 | include/litmus/binheap.h \ | ||
| 160 | include/litmus/unistd_32.h \ | ||
| 161 | include/litmus/unistd_64.h | ||
| 158 | 162 | ||
| 159 | unistd-headers = \ | 163 | unistd-headers = \ |
| 160 | $(foreach file,${unistd-${ARCH}},arch/${include-${ARCH}}/include/asm/$(file)) | 164 | $(foreach file,${unistd-${ARCH}},arch/${include-${ARCH}}/include/asm/$(file)) |