Check-in [a33cb7caf7]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:glibc cleanups
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a33cb7caf73d44ba760d1ca04a15396ca9fb140e
User & Date: rkeene 2023-10-06 19:41:48
Context
2023-10-06
22:51
Build-CC 0.16 Leaf check-in: 765ae0548f user: rkeene tags: trunk, 0.16
19:41
glibc cleanups check-in: a33cb7caf7 user: rkeene tags: trunk
19:40
Many updates check-in: 71230f71d0 user: rkeene tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to scripts/post/02-glibc.

43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
	rm -rf "${GLIBC_PORTS_DIR}"
	rm -rf glibc-*-*-*

	exit 0
fi

# Only build glibc for linux-gnu platforms
if ! echo "${CCNAME}" | grep -- '-unknown-linux-gnu' >/dev/null; then
	if ! echo "${CCNAME}" | grep -- '-generic-linux-gnu' >/dev/null; then
		exit 0
	fi
fi

# Determine additional addons
case "${GLIBC_VERS}" in
	2.0|2.1|2.2|2.3|2.4|2.5|2.6|2.7|2.8|2.9|2.10|2.11|2.12|2.13|2.14|2.15|2.16|2.17|2.18|2.19|2.0.*|2.1.*|2.2.*|2.3.*|2.4.*|2.5.*|2.6.*|2.7.*|2.8.*|2.9.*|2.10.*|2.11.*|2.12.*|2.13.*|2.14.*|2.15.*|2.16.*|2.17.*|2.18.*|2.19.*)
		GLIBC_ADDITIONAL_ADDONS="${GLIBC_ADDITIONAL_ADDONS},nptl"
		;;







|
<
|
<







43
44
45
46
47
48
49
50

51

52
53
54
55
56
57
58
	rm -rf "${GLIBC_PORTS_DIR}"
	rm -rf glibc-*-*-*

	exit 0
fi

# Only build glibc for linux-gnu platforms
if ! echo "${CCNAME}" | grep -- '-[^-]*-linux-gnu' >/dev/null; then

	exit 0

fi

# Determine additional addons
case "${GLIBC_VERS}" in
	2.0|2.1|2.2|2.3|2.4|2.5|2.6|2.7|2.8|2.9|2.10|2.11|2.12|2.13|2.14|2.15|2.16|2.17|2.18|2.19|2.0.*|2.1.*|2.2.*|2.3.*|2.4.*|2.5.*|2.6.*|2.7.*|2.8.*|2.9.*|2.10.*|2.11.*|2.12.*|2.13.*|2.14.*|2.15.*|2.16.*|2.17.*|2.18.*|2.19.*)
		GLIBC_ADDITIONAL_ADDONS="${GLIBC_ADDITIONAL_ADDONS},nptl"
		;;
117
118
119
120
121
122
123

124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139

140
141
142
143
144
145
146
147
148
149
150
151
152

	echo "slibdir = ${arch_libdir}" > configparms

	case "${STAGE}" in
		stage1)
			"../${GLIBC_DIR}/configure" --prefix='/' --libdir="${arch_libdir}" --host="${arch_host}" \
				--disable-profile --without-gd --without-cvs --without-selinux --enable-add-ons="${GLIBC_PORTS_DIR}${GLIBC_ADDITIONAL_ADDONS}" --with-tls \

				libc_cv_forced_unwind=yes libc_cv_ctors_header=yes libc_cv_c_cleanup=yes libc_cv_ssp=no || exit 1
			echo '#define HAVE_TLS_SUPPORT 1' >> config.h

			${MAKE} ${BUILD_CC_MAKE_FLAGS} || exit 1

			${MAKE} ${BUILD_CC_MAKE_FLAGS} install_root="${PREFIX}" install || exit 1

			cd ..

			rm -rf "glibc-${CCNAME}-${arch_host}"
			mkdir "glibc-${CCNAME}-${arch_host}"
			cd "glibc-${CCNAME}-${arch_host}" || exit 1

			echo "slibdir = ${arch_libdir}" > configparms

			"../${GLIBC_DIR}/configure" --prefix='/' --libdir="${arch_libdir}" --host="${arch_host}" --enable-add-ons="${GLIBC_PORTS_DIR},libidn${GLIBC_ADDITIONAL_ADDONS}" \

				libc_cv_forced_unwind=yes libc_cv_ctors_header=yes libc_cv_c_cleanup=yes libc_cv_ssp=no || exit 1
			rebuild_binutils_needed='1'
			;;
		stage2)
			"../${GLIBC_DIR}/configure" --prefix='/' --libdir="${arch_libdir}" --host="${arch_host}" --enable-add-ons="${GLIBC_PORTS_DIR},libidn${GLIBC_ADDITIONAL_ADDONS}" \
				--enable-kernel="${LINUX_VERS}" || exit 1
			;;
	esac

	${MAKE} ${BUILD_CC_MAKE_FLAGS} || exit 1

	${MAKE} ${BUILD_CC_MAKE_FLAGS} install_root="${PREFIX}" install || exit 1








>
















>





|







115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152

	echo "slibdir = ${arch_libdir}" > configparms

	case "${STAGE}" in
		stage1)
			"../${GLIBC_DIR}/configure" --prefix='/' --libdir="${arch_libdir}" --host="${arch_host}" \
				--disable-profile --without-gd --without-cvs --without-selinux --enable-add-ons="${GLIBC_PORTS_DIR}${GLIBC_ADDITIONAL_ADDONS}" --with-tls \
				--disable-werror \
				libc_cv_forced_unwind=yes libc_cv_ctors_header=yes libc_cv_c_cleanup=yes libc_cv_ssp=no || exit 1
			echo '#define HAVE_TLS_SUPPORT 1' >> config.h

			${MAKE} ${BUILD_CC_MAKE_FLAGS} || exit 1

			${MAKE} ${BUILD_CC_MAKE_FLAGS} install_root="${PREFIX}" install || exit 1

			cd ..

			rm -rf "glibc-${CCNAME}-${arch_host}"
			mkdir "glibc-${CCNAME}-${arch_host}"
			cd "glibc-${CCNAME}-${arch_host}" || exit 1

			echo "slibdir = ${arch_libdir}" > configparms

			"../${GLIBC_DIR}/configure" --prefix='/' --libdir="${arch_libdir}" --host="${arch_host}" --enable-add-ons="${GLIBC_PORTS_DIR},libidn${GLIBC_ADDITIONAL_ADDONS}" \
				--disable-werror \
				libc_cv_forced_unwind=yes libc_cv_ctors_header=yes libc_cv_c_cleanup=yes libc_cv_ssp=no || exit 1
			rebuild_binutils_needed='1'
			;;
		stage2)
			"../${GLIBC_DIR}/configure" --prefix='/' --libdir="${arch_libdir}" --host="${arch_host}" --enable-add-ons="${GLIBC_PORTS_DIR},libidn${GLIBC_ADDITIONAL_ADDONS}" \
				--disable-werror --enable-kernel="${LINUX_VERS}" || exit 1
			;;
	esac

	${MAKE} ${BUILD_CC_MAKE_FLAGS} || exit 1

	${MAKE} ${BUILD_CC_MAKE_FLAGS} install_root="${PREFIX}" install || exit 1