Changeset 7b884e55 in mainline

Timestamp:

2017-11-08T23:41:26Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4f674d7

Parents:

378948d

Message:

Also temporarily disallow shared libsoftint.

libsoftint conceptually belongs before libc, but the linker scripts are
generated as part of libc build. The linker scripts will be moved
elsewhere in the future, but for now just link statically.

Location:

uspace

Files:

• Makefile.common (modified) (1 diff)
• lib/softint/Makefile (modified) (1 diff)

uspace/Makefile.common ¶

@@ -136 +136 @@
 
 ifeq ($(STATIC_BUILD),y)
-        BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
-else
-        BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.so.0
+        BASE_LIBS = $(LIBC_PREFIX)/libc.a
+else
+        BASE_LIBS = $(LIBC_PREFIX)/libc.so.0
         LINK_DYNAMIC = y
 endif
 
-BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
+BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a $(LIBSOFTINT_PREFIX)/libsoftint.a
 
 ifeq ($(LINK_DYNAMIC),y)

uspace/lib/softint/Makefile ¶

@@ -31 +31 @@
 EXTRA_CFLAGS = -Iinclude
 LIBRARY = libsoftint
-SOVERSION = 0.0
 
 SOURCES = \