[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - solenv/gbuild solenv/inc

[Caolán McNamara]

 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 ++--
 solenv/inc/unxlngm68k.mk                      |    5 +----
 7 files changed, 10 insertions(+), 16 deletions(-)

New commits:
commit 043626bf4331043a6db6b318f90db1289c644f3c
Author: Caolán McNamara <caolanm at 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
    (cherry picked from commit 567147acbc8dcbb6c43652ac6b326759b48df9da)

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
 
commit fb75552a492ab9ff1f2c6c7820a07862d6b88ba6
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jun 6 15:50:48 2012 +0200

    signed char is default on m68k...
    
    Change-Id: I5b57e8e9a9dce3eacc665979844f8cb29f968368
    (cherry picked from commit c6b5b20d0a9506ae35421836940bbd1b0e86a3d4)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
index b6a018a..7ce4156 100644
--- a/solenv/inc/unxlngm68k.mk
+++ b/solenv/inc/unxlngm68k.mk
@@ -27,10 +27,7 @@
 
 # mk file for Unix Linux m68k using GCC, please make generic modifications to unxlng.mk
 
-CDEFAULTOPT=-Os
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CDEFS+=-DM68K
-CFLAGS+=-fsigned-char -fno-omit-frame-pointer
-CFLAGSCC+=-fsigned-char
-CFLAGSCXX+=-fsigned-char
+CFLAGS+=-fno-omit-frame-pointer