]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
Fix unary minus on vector
authorDale Weiler <killfieldengine@gmail.com>
Wed, 13 Nov 2013 13:57:14 +0000 (08:57 -0500)
committerDale Weiler <killfieldengine@gmail.com>
Wed, 13 Nov 2013 13:57:14 +0000 (08:57 -0500)
distro/Makefile
ir.c

index 49555b895f43ebf8b4f4b1f5367b5224bea420bb..384b1fac61516a40f94b15a6b1239e565532016e 100644 (file)
@@ -1,7 +1,7 @@
 DROPBOX := dropbox_uploader.sh
 UNAME   := $(shell uname -m)
 DOWNLOAD:= ../doc/html/download.c
 DROPBOX := dropbox_uploader.sh
 UNAME   := $(shell uname -m)
 DOWNLOAD:= ../doc/html/download.c
-BRANCH  := $(shell git branch | sed -n -e 's/^\* \(.*\)/\1/p')
+BRANCH  := $(shell git rev-parse --abbrev-ref HEAD)
 ifneq ($(shell uname -m), x86_64)
     $(error Cannot build packages without an x86_64 capable CPU)
 endif
 ifneq ($(shell uname -m), x86_64)
     $(error Cannot build packages without an x86_64 capable CPU)
 endif
diff --git a/ir.c b/ir.c
index 7d83720c4d4afb3cd56ec90a08b9cc1ad7dde9d3..c935214cb14cd05fd17d66396b107a059d384732 100644 (file)
--- a/ir.c
+++ b/ir.c
@@ -1892,7 +1892,7 @@ ir_value* ir_block_create_unary(ir_block *self, lex_ctx_t ctx,
         case VINSTR_NEG_F:
             return ir_block_create_general_instr(self, ctx, label, INSTR_SUB_F, NULL, operand, ot);
         case VINSTR_NEG_V:
         case VINSTR_NEG_F:
             return ir_block_create_general_instr(self, ctx, label, INSTR_SUB_F, NULL, operand, ot);
         case VINSTR_NEG_V:
-            return ir_block_create_general_instr(self, ctx, label, INSTR_SUB_V, NULL, operand, ot);
+            return ir_block_create_general_instr(self, ctx, label, INSTR_SUB_V, NULL, operand, TYPE_VECTOR);
 
         default:
             ot = operand->vtype;
 
         default:
             ot = operand->vtype;