Regenerate all Makefile's to fix problem on x86_64 linux

Makefile

@@ -1091,11 +1091,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

compiler/Makefile

@@ -2883,11 +2883,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

compiler/utils/Makefile

@@ -1897,11 +1897,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

installer/Makefile

@@ -1051,11 +1051,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/Makefile

@@ -630,11 +630,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/a52/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/ami-extra/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/amunits/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/arosunits/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/aspell/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/bfd/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/bzip2/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/cairo/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/cdrom/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/cdrom/examples/Makefile

@@ -920,11 +920,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/chm/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/cocoaint/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/dblib/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/dbus/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/dbus/examples/Makefile

@@ -920,11 +920,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/dts/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fastcgi/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-async/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-base/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-base/examples/Makefile

@@ -920,11 +920,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/base/Makefile

@@ -1895,11 +1895,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/codegen/Makefile

@@ -1570,11 +1570,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/datadict/Makefile

@@ -1570,11 +1570,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/dbase/Makefile

@@ -2226,11 +2226,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/export/Makefile

@@ -1570,11 +1570,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/json/Makefile

@@ -922,11 +922,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/memds/Makefile

@@ -1570,11 +1570,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/paradox/Makefile

@@ -1246,11 +1246,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/sdf/Makefile

@@ -1246,11 +1246,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/sql/Makefile

@@ -1894,11 +1894,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/sqldb/Makefile

@@ -1699,11 +1699,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/sqldb/interbase/Makefile

@@ -1246,11 +1246,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/sqldb/mssql/Makefile

@@ -1246,11 +1246,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/sqldb/mysql/Makefile

@@ -1570,11 +1570,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/sqldb/odbc/Makefile

@@ -1246,11 +1246,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/sqldb/oracle/Makefile

@@ -1570,11 +1570,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/sqldb/postgres/Makefile

@@ -1570,11 +1570,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/sqldb/sqlite/Makefile

@@ -1246,11 +1246,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/src/sqlite/Makefile

@@ -922,11 +922,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-db/tests/Makefile

@@ -1246,11 +1246,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-extra/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-extra/examples/Makefile

@@ -719,11 +719,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-fpcunit/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-fpcunit/src/exampletests/Makefile

@@ -1246,11 +1246,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-fpcunit/src/tests/Makefile

@@ -1246,11 +1246,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-hash/Makefile

@@ -630,11 +630,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-image/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-image/examples/Makefile

@@ -920,11 +920,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-js/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-json/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-mustache/Makefile

@@ -630,11 +630,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-net/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-net/examples/Makefile

@@ -1568,11 +1568,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-passrc/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-pdf/Makefile

@@ -630,11 +630,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-process/Makefile

@@ -630,11 +630,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-registry/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-registry/tests/Makefile

@@ -922,11 +922,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-report/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-res/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-sdo/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-sound/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-stl/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-web/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-web/src/base/Makefile

@@ -1571,11 +1571,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-web/src/jsonrpc/Makefile

@@ -1247,11 +1247,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-web/src/webdata/Makefile

@@ -1247,11 +1247,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fcl-xml/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fftw/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fpgtk/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fpgtk/examples/Makefile

@@ -1244,11 +1244,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fpindexer/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fpmkunit/Makefile

@@ -646,11 +646,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fppkg/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fuse/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fv/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/fv/examples/Makefile

@@ -1243,11 +1243,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gdbint/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gdbm/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gdbm/examples/Makefile

@@ -920,11 +920,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/ggi/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/ggi/examples/Makefile

@@ -920,11 +920,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gitlab/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gmp/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gmp/examples/Makefile

@@ -920,11 +920,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gnome1/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gnutls/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/googleapi/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/graph/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gtk1/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gtk1/examples/Makefile

@@ -1568,11 +1568,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gtk1/examples/tutorial/Makefile

@@ -596,11 +596,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gtk1/src/gtkgl/Makefile

@@ -1248,11 +1248,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif

packages/gtk2/Makefile

@@ -606,11 +606,11 @@ endif
 endif
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 endif
 endif