diff options
author | root <root@rshg054.dnsready.net> | 2012-10-03 01:32:13 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-10-03 01:32:13 -0700 |
commit | 1350233b6dc1924ba29a42462447995f26dae0dc (patch) | |
tree | 5dfb3384023621f023e449f02df1f035a9b45170 /staging/mesa/mesa-radeon-parallel-make.diff | |
parent | 941550cbc215d608bd18439f99500b74fbb80f0d (diff) |
Wed Oct 3 01:31:01 PDT 2012
Diffstat (limited to 'staging/mesa/mesa-radeon-parallel-make.diff')
-rw-r--r-- | staging/mesa/mesa-radeon-parallel-make.diff | 129 |
1 files changed, 129 insertions, 0 deletions
diff --git a/staging/mesa/mesa-radeon-parallel-make.diff b/staging/mesa/mesa-radeon-parallel-make.diff new file mode 100644 index 000000000..2fc5a4793 --- /dev/null +++ b/staging/mesa/mesa-radeon-parallel-make.diff @@ -0,0 +1,129 @@ +From cebbdd4ac23725963207bf6f8fc7101150e6065f Mon Sep 17 00:00:00 2001 +From: Tom Stellard <thomas.stellard@amd.com> +Date: Wed, 29 Aug 2012 13:01:15 +0000 +Subject: radeon/llvm: Cleanup makefile + +Hopefully, this will fix all the parallel make problems people have +been having. +--- +diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile +index 43f668a..7f1c613 100644 +--- a/src/gallium/drivers/radeon/Makefile ++++ b/src/gallium/drivers/radeon/Makefile +@@ -20,8 +20,6 @@ tablegen = $(TBLGEN) -I $(LLVM_INCLUDEDIR) $1 $2 -o $3 + + HAVE_LLVM_INTRINSICS = $(shell grep IntrinsicsR600.td $(LLVM_INCLUDEDIR)/llvm/Intrinsics.td) + +-gen: $(GENERATED_SOURCES) +- + SIRegisterInfo.td: SIGenRegisterInfo.pl + $(PERL) $^ > $@ + +@@ -38,37 +36,37 @@ endif + R600RegisterInfo.td: R600GenRegisterInfo.pl + $(PERL) $^ > $@ + +-AMDGPUGenRegisterInfo.inc: *.td ++AMDGPUGenRegisterInfo.inc: $(TD_FILES) + $(call tablegen, -gen-register-info, AMDGPU.td, $@) + +-AMDGPUGenInstrInfo.inc: *.td ++AMDGPUGenInstrInfo.inc: $(TD_FILES) + $(call tablegen, -gen-instr-info, AMDGPU.td, $@) + +-AMDGPUGenAsmWriter.inc: *.td ++AMDGPUGenAsmWriter.inc: $(TD_FILES) + $(call tablegen, -gen-asm-writer, AMDGPU.td, $@) + +-AMDGPUGenDAGISel.inc: *.td ++AMDGPUGenDAGISel.inc: $(TD_FILES) + $(call tablegen, -gen-dag-isel, AMDGPU.td, $@) + +-AMDGPUGenCallingConv.inc: *.td ++AMDGPUGenCallingConv.inc: $(TD_FILES) + $(call tablegen, -gen-callingconv, AMDGPU.td, $@) + +-AMDGPUGenSubtargetInfo.inc: *.td ++AMDGPUGenSubtargetInfo.inc: $(TD_FILES) + $(call tablegen, -gen-subtarget, AMDGPU.td, $@) + +-AMDGPUGenEDInfo.inc: *.td ++AMDGPUGenEDInfo.inc: $(TD_FILES) + $(call tablegen, -gen-enhanced-disassembly-info, AMDGPU.td, $@) + +-AMDGPUGenIntrinsics.inc: *.td ++AMDGPUGenIntrinsics.inc: $(TD_FILES) + $(call tablegen, -gen-tgt-intrinsic, AMDGPU.td, $@) + +-AMDGPUGenCodeEmitter.inc: *.td ++AMDGPUGenCodeEmitter.inc: $(TD_FILES) + $(call tablegen, -gen-emitter, AMDGPU.td, $@) + +-AMDGPUGenMCCodeEmitter.inc: *.td ++AMDGPUGenMCCodeEmitter.inc: $(TD_FILES) + $(call tablegen, -mc-emitter -gen-emitter, AMDGPU.td, $@) + +-AMDGPUGenDFAPacketizer.inc: *.td ++AMDGPUGenDFAPacketizer.inc: $(TD_FILES) + $(call tablegen, -gen-dfa-packetizer, AMDGPU.td, $@) + + LOADER_LIBS=$(shell llvm-config --libs bitreader asmparser) +diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources +index 2eb1120..333dd03 100644 +--- a/src/gallium/drivers/radeon/Makefile.sources ++++ b/src/gallium/drivers/radeon/Makefile.sources +@@ -1,4 +1,30 @@ + ++TD_FILES := \ ++ AMDGPU.td \ ++ AMDGPUInstrInfo.td \ ++ AMDGPUInstructions.td \ ++ AMDGPUIntrinsics.td \ ++ AMDGPURegisterInfo.td \ ++ AMDILBase.td \ ++ AMDILInstrInfo.td \ ++ AMDILIntrinsics.td \ ++ AMDILRegisterInfo.td \ ++ Processors.td \ ++ R600InstrInfo.td \ ++ R600Instructions.td \ ++ R600Intrinsics.td \ ++ R600IntrinsicsNoOpenCL.td \ ++ R600IntrinsicsOpenCL.td \ ++ R600RegisterInfo.td \ ++ R600Schedule.td \ ++ SIInstrFormats.td \ ++ SIInstrInfo.td \ ++ SIInstructions.td \ ++ SIIntrinsics.td \ ++ SIRegisterInfo.td \ ++ SISchedule.td ++ ++ + GENERATED_SOURCES := \ + R600Intrinsics.td \ + R600RegisterInfo.td \ +-- +cgit v0.9.0.2-2-gbebe +From 2baaa5c7eb21517f0197bfd91154e9b4886fbb1b Mon Sep 17 00:00:00 2001 +From: Tom Stellard <thomas.stellard@amd.com> +Date: Thu, 06 Sep 2012 14:05:22 +0000 +Subject: radeon/llvm: Remove R600InstrInfo.td from TD_FILES + +Fixes build bug introduced by +cebbdd4ac23725963207bf6f8fc7101150e6065f +--- +diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources +index 333dd03..f387636 100644 +--- a/src/gallium/drivers/radeon/Makefile.sources ++++ b/src/gallium/drivers/radeon/Makefile.sources +@@ -10,7 +10,6 @@ TD_FILES := \ + AMDILIntrinsics.td \ + AMDILRegisterInfo.td \ + Processors.td \ +- R600InstrInfo.td \ + R600Instructions.td \ + R600Intrinsics.td \ + R600IntrinsicsNoOpenCL.td \ +-- +cgit v0.9.0.2-2-gbebe |