From a355c1b8310ef6e29407a09bd5dedbd844e2f3f1 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Fri, 13 Jan 2017 10:14:00 +0000 Subject: [PATCH] Imported Upstream version 4.8.0.429 Former-commit-id: 6dd1d93b55f41d3bbf1332e64f5ad9d608b4b056 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mono/btls/Makefile.am | 6 +++--- mono/btls/Makefile.in | 6 +++--- mono/metadata/marshal.c.REMOVED.git-id | 2 +- mono/mini/Makefile.am | 2 +- mono/mini/Makefile.am.in | 2 +- mono/mini/Makefile.in.REMOVED.git-id | 2 +- mono/mini/aot-runtime.c.REMOVED.git-id | 2 +- .../mini-generic-sharing.c.REMOVED.git-id | 2 +- mono/mini/unwind.c | 2 +- mono/mini/version.h | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 2 +- po/mcs/pt_BR.gmo | Bin 73161 -> 73161 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index d78decc365..a88e149cde 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -9ac85c782a83860a87f003687da80e393c54c74c \ No newline at end of file +c1a14b2d46acd778f29ac790455f1f801e55f675 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 0d6721e345..ca426153a9 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -9959c554e0df45bd3fc3c220ac2486a819e91cd7 \ No newline at end of file +e39a33a545310609f476581bdc2ee0c419270987 \ No newline at end of file diff --git a/mono/btls/Makefile.am b/mono/btls/Makefile.am index 6a5b106132..9b61a23468 100644 --- a/mono/btls/Makefile.am +++ b/mono/btls/Makefile.am @@ -50,16 +50,16 @@ all-local: $(BTLS_STATIC_LIST) $(BTLS_SHARED_LIST) if DYNAMIC_BTLS build-shared/Makefile: -mkdir -p build-shared - (cd build-shared && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_DYNAMIC_BTLS=1 $(abs_top_srcdir)/mono/btls) + (cd build-shared && CC="$(CC)" CXX="$(CXX)" $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_DYNAMIC_BTLS=1 $(abs_top_srcdir)/mono/btls) else build-shared/Makefile: -mkdir -p build-shared - (cd build-shared && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_SHARED_LIBS=1 $(abs_top_srcdir)/mono/btls) + (cd build-shared && CC="$(CC)" CXX="$(CXX)" $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_SHARED_LIBS=1 $(abs_top_srcdir)/mono/btls) endif build-static/Makefile: -mkdir -p build-static - (cd build-static && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) $(abs_top_srcdir)/mono/btls) + (cd build-static && CC="$(CC)" CXX="$(CXX)" $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) $(abs_top_srcdir)/mono/btls) $(BTLS_STATIC_LIST): build-static/Makefile $(MAKE) -C build-static $(CMAKE_VERBOSE) diff --git a/mono/btls/Makefile.in b/mono/btls/Makefile.in index b070c75002..3202f59136 100644 --- a/mono/btls/Makefile.in +++ b/mono/btls/Makefile.in @@ -572,14 +572,14 @@ all-local: $(BTLS_STATIC_LIST) $(BTLS_SHARED_LIST) @DYNAMIC_BTLS_TRUE@build-shared/Makefile: @DYNAMIC_BTLS_TRUE@ -mkdir -p build-shared -@DYNAMIC_BTLS_TRUE@ (cd build-shared && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_DYNAMIC_BTLS=1 $(abs_top_srcdir)/mono/btls) +@DYNAMIC_BTLS_TRUE@ (cd build-shared && CC="$(CC)" CXX="$(CXX)" $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_DYNAMIC_BTLS=1 $(abs_top_srcdir)/mono/btls) @DYNAMIC_BTLS_FALSE@build-shared/Makefile: @DYNAMIC_BTLS_FALSE@ -mkdir -p build-shared -@DYNAMIC_BTLS_FALSE@ (cd build-shared && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_SHARED_LIBS=1 $(abs_top_srcdir)/mono/btls) +@DYNAMIC_BTLS_FALSE@ (cd build-shared && CC="$(CC)" CXX="$(CXX)" $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) -DBUILD_SHARED_LIBS=1 $(abs_top_srcdir)/mono/btls) build-static/Makefile: -mkdir -p build-static - (cd build-static && $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) $(abs_top_srcdir)/mono/btls) + (cd build-static && CC="$(CC)" CXX="$(CXX)" $(CMAKE) $(CMAKE_ARGS) $(BTLS_CMAKE_ARGS) $(abs_top_srcdir)/mono/btls) $(BTLS_STATIC_LIST): build-static/Makefile $(MAKE) -C build-static $(CMAKE_VERBOSE) diff --git a/mono/metadata/marshal.c.REMOVED.git-id b/mono/metadata/marshal.c.REMOVED.git-id index 56bb4012f1..9fd7bc85e8 100644 --- a/mono/metadata/marshal.c.REMOVED.git-id +++ b/mono/metadata/marshal.c.REMOVED.git-id @@ -1 +1 @@ -9957328e2c001b4e47ce410362f38f810f481a26 \ No newline at end of file +7b980453c593408f829e7098dc333ad5087a8865 \ No newline at end of file diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index 79a7bb45d9..b4abe0bbbb 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -859,7 +859,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.8.0.425/038ff4a\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.429/9e8f0ee\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index 79a7bb45d9..b4abe0bbbb 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -859,7 +859,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.8.0.425/038ff4a\"" > version.h + echo "#define FULL_VERSION \"Stable 4.8.0.429/9e8f0ee\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index ca1c9adada..9be24193dc 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -63cf5db27f8b0ab65c05c36143e0abcf52bcdcf6 \ No newline at end of file +5ff36176892c10b6cb3adc4f7c2e395fd1d81b3a \ No newline at end of file diff --git a/mono/mini/aot-runtime.c.REMOVED.git-id b/mono/mini/aot-runtime.c.REMOVED.git-id index 66a0c35eeb..7bed06f95d 100644 --- a/mono/mini/aot-runtime.c.REMOVED.git-id +++ b/mono/mini/aot-runtime.c.REMOVED.git-id @@ -1 +1 @@ -71edbb64e2301688815b71c81fdcc47dabad3ec1 \ No newline at end of file +941d5017d0fde6e040cd78412ee8cf2a08ca9376 \ No newline at end of file diff --git a/mono/mini/mini-generic-sharing.c.REMOVED.git-id b/mono/mini/mini-generic-sharing.c.REMOVED.git-id index 292220e98d..a0ce45f079 100644 --- a/mono/mini/mini-generic-sharing.c.REMOVED.git-id +++ b/mono/mini/mini-generic-sharing.c.REMOVED.git-id @@ -1 +1 @@ -7897b982a8180aac7e6fdccf0703ebcdb62cc1b7 \ No newline at end of file +9fb754ed8666b96cdfb14ab226044f88c07885f4 \ No newline at end of file diff --git a/mono/mini/unwind.c b/mono/mini/unwind.c index 6282ee9621..712295c6da 100644 --- a/mono/mini/unwind.c +++ b/mono/mini/unwind.c @@ -113,7 +113,7 @@ static int map_hw_reg_to_dwarf_reg [16]; #define NUM_HW_REGS (sizeof (map_hw_reg_to_dwarf_reg) / sizeof (int)) #ifndef IS_DOUBLE_REG -#define IS_DOUBLE_REG(dwarf_reg) 0 +#define IS_DOUBLE_REG(dwarf_reg) (dwarf_reg ? 0 : 0) #endif static gboolean dwarf_reg_to_hw_reg_inited; diff --git a/mono/mini/version.h b/mono/mini/version.h index c4f9f0ece7..eee60a2cb9 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 4.8.0.425/038ff4a" +#define FULL_VERSION "Stable 4.8.0.429/9e8f0ee" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 75cd6874f16dbb8a99ba4a1266771b6f9fbf907c..fae8412e99ac17b85e45ffbcb6bf64ffb66acc3b 100644 GIT binary patch delta 21 ccmbQIHBW296D|%zV+8|CD^tVGZ@7%O08l*!sQ>@~ delta 21 ccmbQIHBW296D|$|O9ev%D-(mwZ@7%O08k_bqyPW_ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 611b4d1c65..7b5de9ef6e 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -fc8f922fb66c17c061d7664663832151cbac0511 \ No newline at end of file +5b8a02e0ce38b25b6173f0bbe004685acbf4abd4 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 26e804d61622ddbb156b165452213b3c70d2ac93..1a4f34639ed2c8118399e2982137f6f39f705ef8 100644 GIT binary patch delta 21 ccmX?Ef3kjqt|Et_v4Vl6m8s!oQ^hHA09U;R-v9sr delta 21 ccmX?Ef3kjqt|EtlrGlY>m5IS-Q^hHA09T|2+5i9m diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 7b4ac8911e..5589965928 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -eb4ed277b3f3e346e58116739805dfdba99ffc17 \ No newline at end of file +73b785510af402070f9725e56f7bba9dad53b0e2 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index f4f09cc5ee7fadbf2f5d64098efaba0cac64b778..bc7864750b5301b0b581c659d313670fef5b46f6 100644 GIT binary patch delta 23 ecmeyri1Gg-#trQ19EQdU29{Q)hMW1-3$y@dqX#\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 7413e4dffd61bd351d700c38f85699dd09905ace..68130771ac4ddd5be2ddb25c19ae4f3d3f8bef69 100644 GIT binary patch delta 23 fcmX@Po8{zgmJO2AI1G&y3@oio4L2)JThR^xZ3+mU delta 23 fcmX@Po8{zgmJO2AI1DTm3=OPI3^prHThR^xZ1D)0 diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index c4e6faedc2..3b87dabd39 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -5a0a5e29de492210614aa5bda22332c929b1b074 \ No newline at end of file +3367596599f5d258702051ccd5c8fc6ffad354af \ No newline at end of file