From 0bcf49250ffc9101ad11327f40225448e49c1d09 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 15 Dec 2021 14:37:11 +0100 Subject: [PATCH] in clean-classic for linux-x86 add -m32 --- clean-classic/linux-x86/build_clean.sh | 2 +- clean-classic/linux-x86/build_libraries.sh | 4 ++-- clean-classic/linux-x86/setup.sh | 3 ++- clean-classic/linux-x86/txt/Makefile | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/clean-classic/linux-x86/build_clean.sh b/clean-classic/linux-x86/build_clean.sh index d576cfb..88be326 100755 --- a/clean-classic/linux-x86/build_clean.sh +++ b/clean-classic/linux-x86/build_clean.sh @@ -42,7 +42,7 @@ mkdir -p clean/data/ArgEnv for f in ArgEnvC.c ArgEnv.dcl printenv.icl ArgEnv.icl README ; do cp "clean-libraries/Libraries/ArgEnvUnix/$f" "clean/data/ArgEnv/$f" done -cp "clean-libraries/Libraries/ArgEnvUnix/Makefile_no_pic" "clean/data/ArgEnv/Makefile" +cp "clean-libraries/Libraries/ArgEnvUnix/Makefile_32_no_pic" "clean/data/ArgEnv/Makefile" mkdir -p clean/data/Generics cp clean-libraries/Libraries/GenLib/*.[id]cl clean/data/Generics/ diff --git a/clean-classic/linux-x86/build_libraries.sh b/clean-classic/linux-x86/build_libraries.sh index 4298e6e..41e27af 100755 --- a/clean-classic/linux-x86/build_libraries.sh +++ b/clean-classic/linux-x86/build_libraries.sh @@ -16,10 +16,10 @@ mv clean-platform/LICENSE clean-platform/LICENSE.Clean sed -e '1,/License/d' -e 's/LICENSE].LICENCE/LICENCE.Clean](LICENSE.Clean/' -e 's/$/\r/' < clean-platform/README.md > clean-platform/LICENSE cp htoclean/Clean.h "clean-libraries/Libraries/Directory/Clean System Files Unix/Clean.h" -(cd "clean-libraries/Libraries/Directory/Clean System Files Unix"; gcc -fno-pic -c -O cDirectory.c) +(cd "clean-libraries/Libraries/Directory/Clean System Files Unix"; gcc -m32 -fno-pic -c -O cDirectory.c) cp htoclean/Clean.h "clean-libraries/Libraries/TCPIP/Linux_C/Clean.h" -(cd "clean-libraries/Libraries/TCPIP/Linux_C"; gcc -c -O cTCP_121.c) +(cd "clean-libraries/Libraries/TCPIP/Linux_C"; gcc -m32 -c -O cTCP_121.c) (cd "clean-libraries/Libraries/TCPIP"; sed 's/, library "wsock_library"//' ostcp.icl_; rm -f ostcp.icl; mv ostcp.icl_ ostcp.icl) (cd "clean-libraries/Libraries/TCPIP/Linux_C"; sed 's/, library "wsock_library"//' ostcp.icl_; rm -f ostcp.icl; mv ostcp.icl_ ostcp.icl) diff --git a/clean-classic/linux-x86/setup.sh b/clean-classic/linux-x86/setup.sh index 02a3982..e3d3a6c 100755 --- a/clean-classic/linux-x86/setup.sh +++ b/clean-classic/linux-x86/setup.sh @@ -19,6 +19,7 @@ tar -xzf boot_clean.tgz mv clean boot_compiler cd boot_compiler -sed -e "s/gcc/gcc -fno-pic/" -i data/ArgEnv/Makefile +sed -e "s/gcc/gcc -m32 -fno-pic/" -i data/ArgEnv/Makefile make +./bin/patch_bin ./bin/clm LDARGS -m32 cd .. diff --git a/clean-classic/linux-x86/txt/Makefile b/clean-classic/linux-x86/txt/Makefile index 4de847b..cebf2b1 100755 --- a/clean-classic/linux-x86/txt/Makefile +++ b/clean-classic/linux-x86/txt/Makefile @@ -188,7 +188,7 @@ $(INSTALL_LIB_DIR)/Directory: mkdir -p $@/"Clean System Files" install_Directory: $(INSTALL_LIB_DIR)/Directory - ( cd "data/Directory/Clean System Files"; gcc -fno-pic -c -O cDirectory.c -o cDirectory.o ) + ( cd "data/Directory/Clean System Files"; gcc -m32 -fno-pic -c -O cDirectory.c -o cDirectory.o ) cp -R data/Directory/* $(INSTALL_LIB_DIR)/Directory $(INSTALL_LIB_DIR)/MersenneTwister: -- GitLab