--- a/makelib/config-i686-pc-linux-gnu.make	Tue Jun 19 21:26:26 2018 +0100
+++ b/makelib/config-i686-pc-linux-gnu.make	Thu Jun 21 08:07:41 2018 +0000
@@ -12,30 +12,7 @@
 include $(MAKELIB)/config-linux-gnu.make
 include $(MAKELIB)/config-i686.make
 
-AS_CC=as
-AS_CC_CFLAG=
-ASFLAGS=--32
-
-
-# LD=ld -m elf_i386
-# STC_LD=ld -m elf_i386
-STC_LDFLAGS=$(CCCONFOPT) -L/usr/lib -Llib -L/usr/local/lib -L/usr/X11/lib
-CLASSLIB_LD=ld -m elf_i386
-LDFLAGS=$(CCCONFOPT) -Llib -L/usr/local/lib -L/usr/X11/lib -L/usr/lib \
-	-Wl,-rpath,'$$ORIGIN',-rpath,'$$ORIGIN/lib',-rpath,'$$ORIGIN/../lib'
-LD_REL_FLAG=-r
-
-#OPTIONAL_DL_LIB=-ldl
-#OPTIONAL_LIBDL_TARGET=libdld
-
-
-MAKE_ZLIB_ARG= -f Makefile.amd64_mode32
-MAKE_BZ2LIB_ARG= -f Makefile.amd64_mode32
-
-
-FFI_CFLAGS=$(CCCONFOPT)
 #------------------ end of linux-elf/amd64_mode32 ---------------------
-O_RULE=__STANDARD_O_RULE__
 EXTRA_LIBS=-ldl -lX11 -lXext
 
 # Following is a workaround for Debian / Ubuntu boxes.