summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2021-07-28 11:00:43 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-07-28 14:47:51 +0200
commita61a609ef83c511b0c46610225e7109f463eff68 (patch)
treea4f02a920c5f5b05305f4817d47271702a92351a
parent5903d75442f132fd34744846dbd48ffd7794f2c6 (diff)
downloadptxdist-a61a609ef83c511b0c46610225e7109f463eff68.tar.gz
ptxdist-a61a609ef83c511b0c46610225e7109f463eff68.tar.xz
ustr: remove old package
It has been in staging for more than one year. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/ustr-1.0.4/0001-makefile-make-it-possible-to-overwrite-binary-checks.patch61
-rw-r--r--patches/ustr-1.0.4/0002-fixes-gnu-inline.patch875
-rw-r--r--patches/ustr-1.0.4/series5
-rw-r--r--rules/host-ustr.in10
-rw-r--r--rules/host-ustr.make28
-rw-r--r--rules/ustr.in14
-rw-r--r--rules/ustr.make59
7 files changed, 0 insertions, 1052 deletions
diff --git a/patches/ustr-1.0.4/0001-makefile-make-it-possible-to-overwrite-binary-checks.patch b/patches/ustr-1.0.4/0001-makefile-make-it-possible-to-overwrite-binary-checks.patch
deleted file mode 100644
index 0f0b51891..000000000
--- a/patches/ustr-1.0.4/0001-makefile-make-it-possible-to-overwrite-binary-checks.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Wolfram Sang <w.sang@pengutronix.de>
-Date: Mon, 14 Jan 2013 13:20:11 +0100
-Subject: [PATCH] makefile: make it possible to overwrite binary checks
-
-ustr tries to determine 64bit and vsnprintf features by compiling and running
-test programs. Use value defined in ptxdist. Assume stdint.h as always there,
-as we are on linux.
-
-Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- Makefile | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 7a0f31795067..9eab99bbe19b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -457,12 +457,24 @@ ustr-import: ustr-import.in autoconf_64b autoconf_vsnprintf
-
- # Use CFLAGS so that CFLAGS="... -m32" does the right thing
- autoconf_64b: autoconf_64b.c
-+ifdef SZ64
-+ $(HIDE)echo "Faking: auto configuration test: 64bit=$(SZ64)"
-+ $(HIDE)echo "echo $(SZ64)" > $@
-+ $(HIDE)chmod +x $@
-+else
- $(HIDE)echo Compiling: auto configuration test: 64bit
- $(HIDE)$(CC) $(CFLAGS) -o $@ $<
-+endif
-
- autoconf_vsnprintf: autoconf_vsnprintf.c
-+ifdef VSNP
-+ $(HIDE)echo "Faking: auto configuration test: vsnprintf=$(VSNP)"
-+ $(HIDE)echo "echo $(VSNP)" > $@
-+ $(HIDE)chmod +x $@
-+else
- $(HIDE)echo Compiling: auto configuration test: vsnprintf
- $(HIDE)$(CC) -o $@ $<
-+endif
-
- # Use LDFLAGS for LDFLAGS="-m32"
- $(OPT_LIB_SHARED): $(LIB_SHARED_OPT)
-@@ -484,7 +496,7 @@ libustr-debug.a: $(LIB_STATIC_DBG)
-
- ustr-conf.h: ustr-conf.h.in autoconf_64b autoconf_vsnprintf
- $(HIDE)echo Creating $@
-- $(HIDE)have_stdint_h=0; dbg1=0; dbg2=0; \
-+ $(HIDE)have_stdint_h=1; dbg1=0; dbg2=0; \
- sz64=`./autoconf_64b`; vsnp=`./autoconf_vsnprintf`; \
- if test -f "/usr/include/stdint.h"; then have_stdint_h=1; fi; \
- if test -f "$(prefix)/include/stdint.h"; then have_stdint_h=1; fi; \
-@@ -493,7 +505,7 @@ ustr-conf.h: ustr-conf.h.in autoconf_64b autoconf_vsnprintf
-
- ustr-conf-debug.h: ustr-conf.h.in autoconf_64b autoconf_vsnprintf
- $(HIDE)echo Creating $@
-- $(HIDE)have_stdint_h=0; dbg1=1; dbg2=1; \
-+ $(HIDE)have_stdint_h=1; dbg1=1; dbg2=1; \
- sz64=`./autoconf_64b`; vsnp=`./autoconf_vsnprintf`; \
- if test -f "/usr/include/stdint.h"; then have_stdint_h=1; fi; \
- if test -f "$(prefix)/include/stdint.h"; then have_stdint_h=1; fi; \
diff --git a/patches/ustr-1.0.4/0002-fixes-gnu-inline.patch b/patches/ustr-1.0.4/0002-fixes-gnu-inline.patch
deleted file mode 100644
index 6f5c7d9f5..000000000
--- a/patches/ustr-1.0.4/0002-fixes-gnu-inline.patch
+++ /dev/null
@@ -1,875 +0,0 @@
-From: =?UTF-8?q?V=C3=A1clav=20Ovs=C3=ADk?= <vaclav.ovsik@gmail.com>
-Date: Wed, 2 Dec 2015 10:00:56 +0100
-Subject: [PATCH] fixes/gnu-inline
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch adds `__attribute__ ((gnu_inline))' into prototype macros
-before `inline' to force GNU89 behaviour of inline functions
-in C99 mode.
-See http://www.gnu.org/software/gcc/gcc-5/porting_to.html
-
-Signed-off-by: Václav Ovsík <vaclav.ovsik@gmail.com>
----
- ustr-b-dbg-code.c | 8 ++++----
- ustr-b-opt-code.c | 8 ++++----
- ustr-cmp-dbg-code.c | 8 ++++----
- ustr-cmp-opt-code.c | 8 ++++----
- ustr-compiler.h | 4 ++--
- ustr-fmt-dbg-code.c | 8 ++++----
- ustr-fmt-opt-code.c | 8 ++++----
- ustr-ins-dbg-code.c | 8 ++++----
- ustr-ins-opt-code.c | 8 ++++----
- ustr-io-dbg-code.c | 8 ++++----
- ustr-io-opt-code.c | 8 ++++----
- ustr-main-dbg-code.c | 2 +-
- ustr-main-opt-code.c | 2 +-
- ustr-parse-dbg-code.c | 8 ++++----
- ustr-parse-opt-code.c | 8 ++++----
- ustr-pool-dbg-code.c | 8 ++++----
- ustr-pool-opt-code.c | 8 ++++----
- ustr-replace-dbg-code.c | 8 ++++----
- ustr-replace-opt-code.c | 8 ++++----
- ustr-sc-dbg-code.c | 8 ++++----
- ustr-sc-opt-code.c | 8 ++++----
- ustr-set-dbg-code.c | 8 ++++----
- ustr-set-opt-code.c | 8 ++++----
- ustr-split-dbg-code.c | 8 ++++----
- ustr-split-opt-code.c | 8 ++++----
- ustr-spn-dbg-code.c | 8 ++++----
- ustr-spn-opt-code.c | 8 ++++----
- ustr-srch-dbg-code.c | 8 ++++----
- ustr-srch-opt-code.c | 8 ++++----
- ustr-sub-dbg-code.c | 8 ++++----
- ustr-sub-opt-code.c | 8 ++++----
- ustr-utf8-dbg-code.c | 8 ++++----
- ustr-utf8-opt-code.c | 8 ++++----
- 33 files changed, 124 insertions(+), 124 deletions(-)
-
-diff --git a/ustr-b-dbg-code.c b/ustr-b-dbg-code.c
-index 4a7fdac3f68b..60e383e7db36 100644
---- a/ustr-b-dbg-code.c
-+++ b/ustr-b-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-b.h"
-diff --git a/ustr-b-opt-code.c b/ustr-b-opt-code.c
-index 45e9e87c522f..4011898e341e 100644
---- a/ustr-b-opt-code.c
-+++ b/ustr-b-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-b.h"
-diff --git a/ustr-cmp-dbg-code.c b/ustr-cmp-dbg-code.c
-index 7b8af33c0c3b..4c3adc241566 100644
---- a/ustr-cmp-dbg-code.c
-+++ b/ustr-cmp-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-cmp.h"
-diff --git a/ustr-cmp-opt-code.c b/ustr-cmp-opt-code.c
-index 2076d1cd9831..ff5d02c09b17 100644
---- a/ustr-cmp-opt-code.c
-+++ b/ustr-cmp-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-cmp.h"
-diff --git a/ustr-compiler.h b/ustr-compiler.h
-index 9e7127697db3..38ae0268c631 100644
---- a/ustr-compiler.h
-+++ b/ustr-compiler.h
-@@ -92,7 +92,7 @@
- #endif
-
- #if USTR_CONF_COMPILE_USE_INLINE
--#define USTR__INLINE inline
-+#define USTR__INLINE __attribute__ ((gnu_inline)) inline
- #else
- #define USTR__INLINE /* no inline */
- #endif
-@@ -123,7 +123,7 @@
- # if USTR_CONF_INCLUDE_CODEONLY_HEADERS
- # define USTR_CONF_II_PROTO static USTR__INLINE
- # else
--# define USTR_CONF_II_PROTO extern inline
-+# define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- # endif
- #endif
-
-diff --git a/ustr-fmt-dbg-code.c b/ustr-fmt-dbg-code.c
-index 4249bb127ee3..1f147a0e3afa 100644
---- a/ustr-fmt-dbg-code.c
-+++ b/ustr-fmt-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-fmt.h"
-diff --git a/ustr-fmt-opt-code.c b/ustr-fmt-opt-code.c
-index c73e3752ac03..989b29f24827 100644
---- a/ustr-fmt-opt-code.c
-+++ b/ustr-fmt-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-fmt.h"
-diff --git a/ustr-ins-dbg-code.c b/ustr-ins-dbg-code.c
-index 39f9bba6561d..4c6d5ea0dd8a 100644
---- a/ustr-ins-dbg-code.c
-+++ b/ustr-ins-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-fmt.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
-@@ -17,5 +17,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-ins.h"
-diff --git a/ustr-ins-opt-code.c b/ustr-ins-opt-code.c
-index 1aca8276e1e7..859b44d638ac 100644
---- a/ustr-ins-opt-code.c
-+++ b/ustr-ins-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-fmt.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
-@@ -17,5 +17,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-ins.h"
-diff --git a/ustr-io-dbg-code.c b/ustr-io-dbg-code.c
-index c361c936da01..d42e43f0286d 100644
---- a/ustr-io-dbg-code.c
-+++ b/ustr-io-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-io.h"
-diff --git a/ustr-io-opt-code.c b/ustr-io-opt-code.c
-index b1b452564237..ae8de8774eeb 100644
---- a/ustr-io-opt-code.c
-+++ b/ustr-io-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-io.h"
-diff --git a/ustr-main-dbg-code.c b/ustr-main-dbg-code.c
-index 4b821ce96788..abaa53a814cb 100644
---- a/ustr-main-dbg-code.c
-+++ b/ustr-main-dbg-code.c
-@@ -7,5 +7,5 @@
- #define USTR_CONF_E_PROTO extern
- #define USTR_CONF_I_PROTO
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
-diff --git a/ustr-main-opt-code.c b/ustr-main-opt-code.c
-index 233fb60d05c8..7ef6e988cb45 100644
---- a/ustr-main-opt-code.c
-+++ b/ustr-main-opt-code.c
-@@ -7,5 +7,5 @@
- #define USTR_CONF_E_PROTO extern
- #define USTR_CONF_I_PROTO
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
-diff --git a/ustr-parse-dbg-code.c b/ustr-parse-dbg-code.c
-index c9653afc35fa..6e1707d1082a 100644
---- a/ustr-parse-dbg-code.c
-+++ b/ustr-parse-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-parse.h"
-diff --git a/ustr-parse-opt-code.c b/ustr-parse-opt-code.c
-index 0c8df4db34ae..fc96db23d3a0 100644
---- a/ustr-parse-opt-code.c
-+++ b/ustr-parse-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-parse.h"
-diff --git a/ustr-pool-dbg-code.c b/ustr-pool-dbg-code.c
-index adf751990a8d..957f9ca65b43 100644
---- a/ustr-pool-dbg-code.c
-+++ b/ustr-pool-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-pool.h"
-diff --git a/ustr-pool-opt-code.c b/ustr-pool-opt-code.c
-index 2b0367c13022..c1b24131e03d 100644
---- a/ustr-pool-opt-code.c
-+++ b/ustr-pool-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-pool.h"
-diff --git a/ustr-replace-dbg-code.c b/ustr-replace-dbg-code.c
-index fe0218730dfc..90531ac4ad51 100644
---- a/ustr-replace-dbg-code.c
-+++ b/ustr-replace-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-set.h"
- #include "ustr-srch.h"
-@@ -19,5 +19,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-replace.h"
-diff --git a/ustr-replace-opt-code.c b/ustr-replace-opt-code.c
-index e76b3bbf0468..6232753831a4 100644
---- a/ustr-replace-opt-code.c
-+++ b/ustr-replace-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-set.h"
- #include "ustr-srch.h"
-@@ -19,5 +19,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-replace.h"
-diff --git a/ustr-sc-dbg-code.c b/ustr-sc-dbg-code.c
-index 0011c63b3074..d7ce3174d79c 100644
---- a/ustr-sc-dbg-code.c
-+++ b/ustr-sc-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-spn.h"
- #include "ustr-utf8.h"
-@@ -18,5 +18,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-sc.h"
-diff --git a/ustr-sc-opt-code.c b/ustr-sc-opt-code.c
-index 7cb81ba5d8be..4a97ed9109c9 100644
---- a/ustr-sc-opt-code.c
-+++ b/ustr-sc-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-spn.h"
- #include "ustr-utf8.h"
-@@ -18,5 +18,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-sc.h"
-diff --git a/ustr-set-dbg-code.c b/ustr-set-dbg-code.c
-index 023875ac5058..cf7707140b5a 100644
---- a/ustr-set-dbg-code.c
-+++ b/ustr-set-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-fmt.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
-@@ -17,5 +17,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-set.h"
-diff --git a/ustr-set-opt-code.c b/ustr-set-opt-code.c
-index e72688898885..34dcaf6849d0 100644
---- a/ustr-set-opt-code.c
-+++ b/ustr-set-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-fmt.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
-@@ -17,5 +17,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-set.h"
-diff --git a/ustr-split-dbg-code.c b/ustr-split-dbg-code.c
-index 03e5ca51cbfb..e40d2a599740 100644
---- a/ustr-split-dbg-code.c
-+++ b/ustr-split-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-set.h"
- #include "ustr-spn.h"
-@@ -19,5 +19,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-split.h"
-diff --git a/ustr-split-opt-code.c b/ustr-split-opt-code.c
-index d64e3003e61a..74f4b1c46327 100644
---- a/ustr-split-opt-code.c
-+++ b/ustr-split-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-set.h"
- #include "ustr-spn.h"
-@@ -19,5 +19,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-split.h"
-diff --git a/ustr-spn-dbg-code.c b/ustr-spn-dbg-code.c
-index ff97432885c7..b0b09d4dee5d 100644
---- a/ustr-spn-dbg-code.c
-+++ b/ustr-spn-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-srch.h"
- #include "ustr-utf8.h"
-@@ -18,5 +18,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-spn.h"
-diff --git a/ustr-spn-opt-code.c b/ustr-spn-opt-code.c
-index 3ff0a079bb5f..92c5ccc40a8d 100644
---- a/ustr-spn-opt-code.c
-+++ b/ustr-spn-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-srch.h"
- #include "ustr-utf8.h"
-@@ -18,5 +18,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-spn.h"
-diff --git a/ustr-srch-dbg-code.c b/ustr-srch-dbg-code.c
-index 40e4dbfb230f..0f4da216dd7f 100644
---- a/ustr-srch-dbg-code.c
-+++ b/ustr-srch-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-cmp-internal.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
-@@ -17,6 +17,6 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-srch.h"
-
-diff --git a/ustr-srch-opt-code.c b/ustr-srch-opt-code.c
-index 635464d1ab82..8dde13dde4ae 100644
---- a/ustr-srch-opt-code.c
-+++ b/ustr-srch-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-cmp-internal.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
-@@ -17,6 +17,6 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-srch.h"
-
-diff --git a/ustr-sub-dbg-code.c b/ustr-sub-dbg-code.c
-index f994716564d2..b1712e6b40e7 100644
---- a/ustr-sub-dbg-code.c
-+++ b/ustr-sub-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-fmt.h"
- #include "ustr-ins.h"
-@@ -19,5 +19,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-sub.h"
-diff --git a/ustr-sub-opt-code.c b/ustr-sub-opt-code.c
-index 8cdb4ebe741b..91780c790450 100644
---- a/ustr-sub-opt-code.c
-+++ b/ustr-sub-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #include "ustr-fmt.h"
- #include "ustr-ins.h"
-@@ -19,5 +19,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-sub.h"
-diff --git a/ustr-utf8-dbg-code.c b/ustr-utf8-dbg-code.c
-index 2666fc26f7b8..30786e991055 100644
---- a/ustr-utf8-dbg-code.c
-+++ b/ustr-utf8-dbg-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf-debug.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-utf8.h"
-diff --git a/ustr-utf8-opt-code.c b/ustr-utf8-opt-code.c
-index 91fa75401178..abdf4c0727f2 100644
---- a/ustr-utf8-opt-code.c
-+++ b/ustr-utf8-opt-code.c
-@@ -3,11 +3,11 @@
- #include "ustr-conf.h"
- #define USTR_CONF_USE_DYNAMIC_CONF USTR_CONF_HAVE_DYNAMIC_CONF
- #define USTR_CONF_e_PROTO extern
--#define USTR_CONF_i_PROTO extern inline
-+#define USTR_CONF_i_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_E_PROTO extern
--#define USTR_CONF_I_PROTO extern inline
-+#define USTR_CONF_I_PROTO extern __attribute__ ((gnu_inline)) inline
- #define USTR_CONF_EI_PROTO extern
--#define USTR_CONF_II_PROTO extern inline
-+#define USTR_CONF_II_PROTO extern __attribute__ ((gnu_inline)) inline
- #include "ustr-main.h"
- #undef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 1
-@@ -16,5 +16,5 @@
- #undef USTR_CONF_I_PROTO
- #define USTR_CONF_I_PROTO
- #undef USTR_CONF_II_PROTO
--#define USTR_CONF_II_PROTO inline
-+#define USTR_CONF_II_PROTO __attribute__ ((gnu_inline)) inline
- #include "ustr-utf8.h"
diff --git a/patches/ustr-1.0.4/series b/patches/ustr-1.0.4/series
deleted file mode 100644
index b4cf0691b..000000000
--- a/patches/ustr-1.0.4/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-makefile-make-it-possible-to-overwrite-binary-checks.patch
-0002-fixes-gnu-inline.patch
-# a5d3b61715d72e5bada7c2b16481b1b7 - git-ptx-patches magic
diff --git a/rules/host-ustr.in b/rules/host-ustr.in
deleted file mode 100644
index 65c8c2b89..000000000
--- a/rules/host-ustr.in
+++ /dev/null
@@ -1,10 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=hosttools_noprompt
-
-config HOST_USTR
- tristate
- default y if ALLYES
- help
- STAGING: remove in PTXdist 2021.07.0
- No new versions since 2008, and fails to download.
diff --git a/rules/host-ustr.make b/rules/host-ustr.make
deleted file mode 100644
index 11f55e06e..000000000
--- a/rules/host-ustr.make
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2013 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_USTR) += host-ustr
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HOST_USTR_CONF_TOOL := NO
-HOST_USTR_MAKE_OPT := \
- all-shared \
- prefix=
-HOST_USTR_INSTALL_OPT := \
- $(HOST_USTR_MAKE_OPT) \
- install
-
-HOST_USTR_CFLAGS := -fgnu89-inline
-
-# vim: syntax=make
diff --git a/rules/ustr.in b/rules/ustr.in
deleted file mode 100644
index 60cfe89f8..000000000
--- a/rules/ustr.in
+++ /dev/null
@@ -1,14 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=system_libraries
-
-config USTR
- tristate
- prompt "ustr"
- help
- ustr (Micro string library) is a string API for C. It has tiny overhead over
- just plain strdup(), is much safer, is easier to use, is faster for many
- operations, can be used with read-only or automatically allocated data.
-
- STAGING: remove in PTXdist 2021.07.0
- No new versions since 2008, and fails to download.
diff --git a/rules/ustr.make b/rules/ustr.make
deleted file mode 100644
index 513f5535c..000000000
--- a/rules/ustr.make
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2012 by Wolfram Sang <w.sang@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_USTR) += ustr
-
-#
-# Paths and names
-#
-USTR_VERSION := 1.0.4
-USTR_MD5 := 93147d9f0c9765d4cd0f04f7e44bdfce
-USTR := ustr-$(USTR_VERSION)
-USTR_SUFFIX := tar.bz2
-USTR_URL := http://www.and.org/ustr/$(USTR_VERSION)/$(USTR).$(USTR_SUFFIX)
-USTR_SOURCE := $(SRCDIR)/$(USTR).$(USTR_SUFFIX)
-USTR_DIR := $(BUILDDIR)/$(USTR)
-USTR_LICENSE := LGPL-2.0-or-later AND MIT AND BSD
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-USTR_CONF_TOOL := NO
-USTR_MAKE_OPT := \
- $(CROSS_ENV_PROGS) \
- VSNP=0 \
- SZ64=$(call ptx/ifdef, PTXCONF_ARCH_LP64,1,0) \
- all-shared
-USTR_INSTALL_OPT := \
- $(USTR_MAKE_OPT) \
- install
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/ustr.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, ustr)
- @$(call install_fixup, ustr,PRIORITY,optional)
- @$(call install_fixup, ustr,SECTION,base)
- @$(call install_fixup, ustr,AUTHOR,"Wolfram Sang <w.sang@pengutronix.de>")
- @$(call install_fixup, ustr,DESCRIPTION,missing)
-
- @$(call install_lib, ustr, 0, 0, 0644, libustr-1.0)
-
- @$(call install_finish, ustr)
-
- @$(call touch)
-
-# vim: syntax=make