Skip to content

Commit 8416c19

Browse files
author
Hubert Badocha
committed
toolchain: remove with_libphoenix flag
JIRA: RTOS-927
1 parent 91a00dd commit 8416c19

2 files changed

Lines changed: 44 additions & 84 deletions

File tree

toolchain/build-toolchain.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ build_libstdcpp() {
225225
# LIBSTDC++ compilation options
226226
# --host -> target is a host for libstdc++
227227
# --with-gxx-include-dir -> configure as a subdir of sysroot for c++ includes to work with external (out-of-toolchain) sysroot
228-
# --with-libphoenix -> use libphoenix as standard C library
229228
# --enable-tls -> enable Thread Local Storage
230229
# --disable-nls -> all compiler messages will be in english
231230
# --disable-shared -> disable building shared libraries [default=yes]
@@ -237,7 +236,6 @@ build_libstdcpp() {
237236
--host="${TARGET}" \
238237
--prefix="${SYSROOT}" \
239238
--with-gxx-include-dir="${SYSROOT}/include/c++" \
240-
--with-libphoenix \
241239
--enable-tls \
242240
--disable-nls \
243241
--disable-shared \

toolchain/gcc-14.2.0-05-libstdcpp.patch

Lines changed: 44 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,7 @@
11
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
22
--- a/libstdc++-v3/configure
33
+++ b/libstdc++-v3/configure
4-
@@ -921,6 +921,7 @@ enable_largefile
5-
with_target_subdir
6-
with_cross_host
7-
with_newlib
8-
+with_libphoenix
9-
enable_maintainer_mode
10-
enable_shared
11-
enable_static
12-
@@ -1697,6 +1698,7 @@ Optional Packages:
13-
configuring in a subdirectory
14-
--with-cross-host=HOST configuring with a cross compiler
15-
--with-newlib assume newlib as a system C library
16-
+ --with-libphoenix assume libphoenix as a system C library
17-
--with-pic try to use only PIC/non-PIC objects [default=use
18-
both]
19-
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
20-
@@ -5571,6 +5573,13 @@ if test "${with_newlib+set}" = set; then :
21-
fi
22-
23-
24-
+# Check whether --with-libphoenix was given.
25-
+if test ${with_libphoenix+y}
26-
+then :
27-
+ withval=$with_libphoenix;
28-
+fi
29-
+
30-
+
31-
# Will set LN_S to either 'ln -s', 'ln', or 'cp -p' (if linking isn't
32-
# available). Uncomment the next line to force a particular method.
33-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
34-
@@ -9239,6 +9248,30 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
4+
@@ -9239,6 +9239,30 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
355
lt_prog_compiler_static='-static'
366

377
case $host_os in
@@ -62,7 +32,7 @@ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
6232
aix*)
6333
# All AIX code is PIC.
6434
if test "$host_cpu" = ia64; then
65-
@@ -9513,6 +9546,36 @@ case $host_os in
35+
@@ -9513,6 +9537,36 @@ case $host_os in
6636
*djgpp*)
6737
lt_prog_compiler_pic=
6838
;;
@@ -99,7 +69,7 @@ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
9969
*)
10070
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
10171
;;
102-
@@ -11987,6 +12050,9 @@ else
72+
@@ -11987,6 +12041,9 @@ else
10373
lt_cv_dlopen_libs=
10474

10575
case $host_os in
@@ -109,7 +79,7 @@ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
10979
beos*)
11080
lt_cv_dlopen="load_add_on"
11181
lt_cv_dlopen_libs=
112-
@@ -14235,6 +14301,31 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
82+
@@ -14235,6 +14292,31 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
11383
lt_prog_compiler_static_CXX='-static'
11484

11585
case $host_os in
@@ -141,7 +111,7 @@ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
141111
aix*)
142112
# All AIX code is PIC.
143113
if test "$host_cpu" = ia64; then
144-
@@ -14545,6 +14636,36 @@ case $host_os in
114+
@@ -14545,6 +14627,36 @@ case $host_os in
145115
*djgpp*)
146116
lt_prog_compiler_pic_CXX=
147117
;;
@@ -178,7 +148,7 @@ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
178148
*)
179149
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
180150
;;
181-
@@ -15783,6 +15904,13 @@ if test "$enable_shared" = yes; then
151+
@@ -15783,6 +15895,13 @@ if test "$enable_shared" = yes; then
182152
glibcxx_compiler_pic_flag="$lt_prog_compiler_pic_CXX"
183153
glibcxx_compiler_shared_flag="-D_GLIBCXX_SHARED"
184154

@@ -192,77 +162,69 @@ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
192162
else
193163
glibcxx_lt_pic_flag=
194164
glibcxx_compiler_pic_flag=
195-
@@ -27336,7 +27464,7 @@ else
196-
# Construct crosses by hand, eliminating bits that need ld...
197-
# GLIBCXX_CHECK_MATH_SUPPORT
165+
@@ -50574,6 +50693,61 @@ _ACEOF
198166

199-
- # First, test for "known" system libraries. We may be using newlib even
200-
+ # First, test for "known" system libraries. We may be using newlib or libphoenix even
201-
# on a hosted environment.
202-
if test "x${with_newlib}" = "xyes"; then
203-
os_include_dir="os/newlib"
204-
@@ -28612,6 +28740,60 @@ _ACEOF
205167

206-
;;
207-
esac
208-
+ elif test "x${with_libphoenix}" = "xyes"; then
209-
+ os_include_dir="os/generic"
210-
+ printf "%s\n" "#define HAVE_HYPOT 1" >>confdefs.h
168+
169+
+ ;;
170+
+ *-phoenix*)
171+
+ os_include_dir="os/generic"
172+
+ printf "%s\n" "#define HAVE_HYPOT 1" >>confdefs.h
211173
+
212174
+
213-
+ # GLIBCXX_CHECK_STDLIB_SUPPORT
214-
+ printf "%s\n" "#define HAVE_STRTOF 1" >>confdefs.h
175+
+ # GLIBCXX_CHECK_STDLIB_SUPPORT
176+
+ printf "%s\n" "#define HAVE_STRTOF 1" >>confdefs.h
215177
+
216178
+
217-
+ printf "%s\n" "#define HAVE_ACOSF 1" >>confdefs.h
179+
+ printf "%s\n" "#define HAVE_ACOSF 1" >>confdefs.h
218180
+
219-
+ printf "%s\n" "#define HAVE_ASINF 1" >>confdefs.h
181+
+ printf "%s\n" "#define HAVE_ASINF 1" >>confdefs.h
220182
+
221-
+ printf "%s\n" "#define HAVE_ATAN2F 1" >>confdefs.h
183+
+ printf "%s\n" "#define HAVE_ATAN2F 1" >>confdefs.h
222184
+
223-
+ printf "%s\n" "#define HAVE_ATANF 1" >>confdefs.h
185+
+ printf "%s\n" "#define HAVE_ATANF 1" >>confdefs.h
224186
+
225-
+ printf "%s\n" "#define HAVE_CEILF 1" >>confdefs.h
187+
+ printf "%s\n" "#define HAVE_CEILF 1" >>confdefs.h
226188
+
227-
+ printf "%s\n" "#define HAVE_COSF 1" >>confdefs.h
189+
+ printf "%s\n" "#define HAVE_COSF 1" >>confdefs.h
228190
+
229-
+ printf "%s\n" "#define HAVE_COSHF 1" >>confdefs.h
191+
+ printf "%s\n" "#define HAVE_COSHF 1" >>confdefs.h
230192
+
231-
+ printf "%s\n" "#define HAVE_EXPF 1" >>confdefs.h
193+
+ printf "%s\n" "#define HAVE_EXPF 1" >>confdefs.h
232194
+
233-
+ printf "%s\n" "#define HAVE_FABSF 1" >>confdefs.h
195+
+ printf "%s\n" "#define HAVE_FABSF 1" >>confdefs.h
234196
+
235-
+ printf "%s\n" "#define HAVE_FLOORF 1" >>confdefs.h
197+
+ printf "%s\n" "#define HAVE_FLOORF 1" >>confdefs.h
236198
+
237-
+ printf "%s\n" "#define HAVE_FMODF 1" >>confdefs.h
199+
+ printf "%s\n" "#define HAVE_FMODF 1" >>confdefs.h
238200
+
239-
+ printf "%s\n" "#define HAVE_FREXPF 1" >>confdefs.h
201+
+ printf "%s\n" "#define HAVE_FREXPF 1" >>confdefs.h
240202
+
241-
+ printf "%s\n" "#define HAVE_LDEXPF 1" >>confdefs.h
203+
+ printf "%s\n" "#define HAVE_LDEXPF 1" >>confdefs.h
242204
+
243-
+ printf "%s\n" "#define HAVE_LOG10F 1" >>confdefs.h
205+
+ printf "%s\n" "#define HAVE_LOG10F 1" >>confdefs.h
244206
+
245-
+ printf "%s\n" "#define HAVE_LOGF 1" >>confdefs.h
207+
+ printf "%s\n" "#define HAVE_LOGF 1" >>confdefs.h
246208
+
247-
+ printf "%s\n" "#define HAVE_MODFF 1" >>confdefs.h
209+
+ printf "%s\n" "#define HAVE_MODFF 1" >>confdefs.h
248210
+
249-
+ printf "%s\n" "#define HAVE_POWF 1" >>confdefs.h
211+
+ printf "%s\n" "#define HAVE_POWF 1" >>confdefs.h
250212
+
251-
+ printf "%s\n" "#define HAVE_SINF 1" >>confdefs.h
213+
+ printf "%s\n" "#define HAVE_SINF 1" >>confdefs.h
252214
+
253-
+ printf "%s\n" "#define HAVE_SINHF 1" >>confdefs.h
215+
+ printf "%s\n" "#define HAVE_SINHF 1" >>confdefs.h
254216
+
255-
+ printf "%s\n" "#define HAVE_SQRTF 1" >>confdefs.h
217+
+ printf "%s\n" "#define HAVE_SQRTF 1" >>confdefs.h
256218
+
257-
+ printf "%s\n" "#define HAVE_TANF 1" >>confdefs.h
219+
+ printf "%s\n" "#define HAVE_TANF 1" >>confdefs.h
258220
+
259-
+ printf "%s\n" "#define HAVE_TANHF 1" >>confdefs.h
221+
+ printf "%s\n" "#define HAVE_TANHF 1" >>confdefs.h
260222
+
261-
+ printf "%s\n" "#define HAVE_STRTOLD 1" >>confdefs.h
262-
elif test "x$with_headers" != "xno"; then
263-
264-
# Base decisions on target environment.
265-
@@ -53875,6 +54057,9 @@ done
223+
+ printf "%s\n" "#define HAVE_STRTOLD 1" >>confdefs.h
224+
;;
225+
*)
226+
as_fn_error $? "No support for this host/target combination." "$LINENO" 5
227+
@@ -53875,6 +54049,9 @@ done
266228
*) have_fcntl=yes ;;
267229
esac
268230
else
@@ -272,7 +234,7 @@ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
272234
ac_fn_c_check_func "$LINENO" "fcntl" "ac_cv_func_fcntl"
273235
if test "x$ac_cv_func_fcntl" = xyes; then :
274236
have_fcntl=yes
275-
@@ -53882,6 +54067,8 @@ else
237+
@@ -53882,6 +54059,8 @@ else
276238
have_fcntl=no
277239
fi
278240

@@ -281,7 +243,7 @@ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
281243
fi
282244
if test "$have_fcntl" = "yes"; then
283245
BACKTRACE_CPPFLAGS="$BACKTRACE_CPPFLAGS -DHAVE_FCNTL=1"
284-
@@ -53906,6 +54093,9 @@ _ACEOF
246+
@@ -53906,6 +54085,9 @@ _ACEOF
285247
*) have_getexecname=no ;;
286248
esac
287249
else
@@ -291,7 +253,7 @@ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
291253
ac_fn_c_check_func "$LINENO" "getexecname" "ac_cv_func_getexecname"
292254
if test "x$ac_cv_func_getexecname" = xyes; then :
293255
have_getexecname=yes
294-
@@ -53913,6 +54103,8 @@ else
256+
@@ -53913,6 +54095,8 @@ else
295257
have_getexecname=no
296258
fi
297259

0 commit comments

Comments
 (0)