Merge pull request #274 from iainlane/master

Merge two smallish fixes

diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index ed75e91b9ccfbd321c2dab49ad8f31d43a7de3d7..b96a8ca24cce70188ff9f8bac4b03225b4d63a2c 100644 (file)
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -30,7 +30,7 @@ endif
 
 USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
 USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
-USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS)
+USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS) $(CPPFLAGS)
 CSCOMPILE = $(Q_MCS) $(MCS) $(USE_MCS_FLAGS)
 BASCOMPILE = $(MBAS) $(USE_MBAS_FLAGS)
 CCOMPILE = $(CC) $(USE_CFLAGS)

diff --git a/mcs/jay/Makefile b/mcs/jay/Makefile
index 730ef09dd696d544d91c1bdd4f0dd9b7c0725048..74609852fe32e3009e4eb7271ed9506894839499 100644 (file)
--- a/mcs/jay/Makefile
+++ b/mcs/jay/Makefile
@@ -46,7 +46,7 @@ dist-local: dist-default
 test-local run-test-local run-test-ondotnet-local doc-update-local:
 
 jay: $(sources:.c=.o)
-       $(CCOMPILE) -o $@ $^
+       $(CCOMPILE) $(LDFLAGS) -o $@ $^
 
 %.o: %.c
        $(CCOMPILE) -c -o $@ $^

diff --git a/mono/arch/arm/arm-dis.c b/mono/arch/arm/arm-dis.c
index 0a478bc9f6bb1941876a44e5ff91050540e64b47..5074f260d89a39f10839f877f6b2b54212440922 100644 (file)
--- a/mono/arch/arm/arm-dis.c
+++ b/mono/arch/arm/arm-dis.c
@@ -95,7 +95,7 @@ void dump_reg(ARMDis* dis, int reg) {
        if (!use_reg_alias || (reg > 3 && reg < 11)) {
                fprintf(dis->dis_out, "r%d", reg);
        } else {
-               fprintf(dis->dis_out, reg_alias[reg]);
+               fprintf(dis->dis_out, "%s", reg_alias[reg]);
        }
 }
 
@@ -137,7 +137,7 @@ void dump_reglist(ARMDis* dis, int reg_list) {
 
 
 void dump_br(ARMDis* dis, ARMInstr i) {
-       fprintf(dis->dis_out, "b%s%s\t%x\t; %p -> %p",
+       fprintf(dis->dis_out, "b%s%s\t%x\t; %p -> %#x",
            (i.br.link == 1) ? "l" : "",
            cond[i.br.cond], i.br.offset, dis->pi, (int)dis->pi + 4*2 + ((int)(i.br.offset << 8) >> 6));
 }
@@ -376,7 +376,7 @@ void dump_swi(ARMDis* dis, ARMInstr i) {
 
 
 void dump_clz(ARMDis* dis, ARMInstr i) {
-       fprintf(dis->dis_out, "clz%s\t");
+       fprintf(dis->dis_out, "clz\t");
        dump_reg(dis, i.clz.rd);
        fprintf(dis->dis_out, ", ");
        dump_reg(dis, i.clz.rm);