solenv/gbuild/platform/LINUX_AXP_GCC.mk | 4 ++-- solenv/gbuild/platform/LINUX_M68K_GCC.mk | 4 ++-- solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk | 3 +-- solenv/gbuild/platform/LINUX_POWERPC_GCC.mk | 2 -- solenv/gbuild/platform/LINUX_S390X_GCC.mk | 4 ++-- solenv/gbuild/platform/LINUX_S390_GCC.mk | 4 ++-- xmlreader/source/xmlreader.cxx | 1 + 7 files changed, 10 insertions(+), 12 deletions(-)
New commits: commit 32e59f91d0c716a28e428ae382d6fed983b5a19d Author: Caolán McNamara <caol...@redhat.com> Date: Thu Jun 7 23:23:03 2012 +0100 calling nextAttribute before first tag uses uninited variables (cherry picked from commit c5818e929c7b608ccc3277f1204b491e426925de) Signed-off-by: Caolán McNamara <caol...@redhat.com> diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx index 9d197c7..2acece2 100644 --- a/xmlreader/source/xmlreader.cxx +++ b/xmlreader/source/xmlreader.cxx @@ -115,6 +115,7 @@ XmlReader::XmlReader(rtl::OUString const & fileUrl) pos_ = static_cast< char * >(fileAddress_); end_ = pos_ + fileSize_; state_ = STATE_CONTENT; + firstAttribute_ = true; } XmlReader::~XmlReader() { commit 567147acbc8dcbb6c43652ac6b326759b48df9da Author: Caolán McNamara <caol...@redhat.com> Date: Fri Jun 8 08:50:50 2012 +0100 Resolves: rhbz#826609, rhbz#820554 fix smoketest on ppc[64] and s390[x] i.e. restore #i81127# to remove -fsigned-char from old-school dmake ppc[64] flags, but also remove them from the new-school gbuild ones. correspondingly remove -fsigned-char from the very similar s390[x] arch equivalents and drop them from the very obscure linux ports where I just cut and paste them in the first place. with 6b3bf27cb56d661725ac3fcfb756562e0ad75564 in place this now passes smoketestdoc for me on build from scratch on ppc[64] and s390[x] Change-Id: I3dae70fd7a3d3adc57cf04a02350689ad097e4d3 diff --git a/solenv/gbuild/platform/LINUX_AXP_GCC.mk b/solenv/gbuild/platform/LINUX_AXP_GCC.mk index 2c5082e..25edcd7 100644 --- a/solenv/gbuild/platform/LINUX_AXP_GCC.mk +++ b/solenv/gbuild/platform/LINUX_AXP_GCC.mk @@ -27,8 +27,8 @@ #please make generic modifications to unxgcc.mk or linux.mk gb_COMPILERDEFAULTOPTFLAGS := -Os -gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer -gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer +gb_CXXFLAGS += -fno-omit-frame-pointer +gb_CFLAGS += -fno-omit-frame-pointer gb_LinkTarget_LDFLAGS += -Wl,--no-relax include $(GBUILDDIR)/platform/linux.mk diff --git a/solenv/gbuild/platform/LINUX_M68K_GCC.mk b/solenv/gbuild/platform/LINUX_M68K_GCC.mk index 99d01fd..55f69a4 100644 --- a/solenv/gbuild/platform/LINUX_M68K_GCC.mk +++ b/solenv/gbuild/platform/LINUX_M68K_GCC.mk @@ -27,8 +27,8 @@ #please make generic modifications to unxgcc.mk or linux.mk gb_COMPILERDEFAULTOPTFLAGS := -Os -gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer -gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer +gb_CXXFLAGS += -fno-omit-frame-pointer +gb_CFLAGS += -fno-omit-frame-pointer include $(GBUILDDIR)/platform/linux.mk diff --git a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk index 33f6bd1..08e7b23 100644 --- a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk +++ b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk @@ -28,8 +28,7 @@ #please make generic modifications to unxgcc.mk or linux.mk gb_CPUDEFS += -DPPC gb_COMPILERDEFAULTOPTFLAGS := -O2 -gb_CXXFLAGS += -mminimal-toc -fsigned-char -gb_CFLAGS += -fsigned-char +gb_CXXFLAGS += -mminimal-toc include $(GBUILDDIR)/platform/linux.mk diff --git a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk index 1c78df0..6fe92ec 100644 --- a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk +++ b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk @@ -28,8 +28,6 @@ #please make generic modifications to unxgcc.mk or linux.mk gb_CPUDEFS += -DPPC gb_COMPILERDEFAULTOPTFLAGS := -O2 -gb_CXXFLAGS += -fsigned-char -gb_CFLAGS += -fsigned-char include $(GBUILDDIR)/platform/linux.mk diff --git a/solenv/gbuild/platform/LINUX_S390X_GCC.mk b/solenv/gbuild/platform/LINUX_S390X_GCC.mk index b352572..1d6889e 100644 --- a/solenv/gbuild/platform/LINUX_S390X_GCC.mk +++ b/solenv/gbuild/platform/LINUX_S390X_GCC.mk @@ -27,8 +27,8 @@ #please make generic modifications to unxgcc.mk or linux.mk gb_COMPILERDEFAULTOPTFLAGS := -O2 -gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer -gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer +gb_CXXFLAGS += -fno-omit-frame-pointer +gb_CFLAGS += -fno-omit-frame-pointer include $(GBUILDDIR)/platform/linux.mk diff --git a/solenv/gbuild/platform/LINUX_S390_GCC.mk b/solenv/gbuild/platform/LINUX_S390_GCC.mk index b352572..1d6889e 100644 --- a/solenv/gbuild/platform/LINUX_S390_GCC.mk +++ b/solenv/gbuild/platform/LINUX_S390_GCC.mk @@ -27,8 +27,8 @@ #please make generic modifications to unxgcc.mk or linux.mk gb_COMPILERDEFAULTOPTFLAGS := -O2 -gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer -gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer +gb_CXXFLAGS += -fno-omit-frame-pointer +gb_CFLAGS += -fno-omit-frame-pointer include $(GBUILDDIR)/platform/linux.mk
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits