Skip to content

Commit 5aede15

Browse files
AlexPeshkoffAlexPeshkoff
committed
Decimal floating point numbers - first draft
1 parent 05c3ccc commit 5aede15

File tree

114 files changed

+23101
-827
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+23101
-827
lines changed

‎builds/posix/Makefile.in

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ else
6666
GCC=gcc
6767
endif
6868

69-
.PHONY: master_process cross_process firebird Debug Release extern
69+
.PHONY: master_process cross_process firebird Debug Release external
7070

7171
all: firebird
7272

@@ -130,10 +130,13 @@ $(GEN_ROOT)/Make.Version : $(SRC_ROOT)/misc/writeBuildNum.sh
130130
# build external software
131131
#
132132

133-
extern:
133+
external:
134134
$(MAKE) -C $(ROOT)/extern/btyacc
135135
$(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop
136136

137+
$(MAKE) -C $(ROOT)/extern/decNumber
138+
ln -sf $(ROOT)/extern/decNumber/libdecFloat.a $(LIB)
139+
137140
ifeq ($(TOMBUILD_FLG),Y)
138141
CFLAGS="$(CFLAGS)" $(MAKE) -C $(ROOT)/extern/libtommath -f makefile.shared GCC=$(GCC)
139142
ln -sf $(TOMMATH_SO).$(TOMMATH_VER) $(LIB)
@@ -180,7 +183,7 @@ master_process:
180183
ln -sf $(SRC_ROOT)/include/gen/autoconfig.auto $(SRC_ROOT)/include/gen/autoconfig.h
181184
$(MAKE) updateBuildNum
182185
$(MAKE) export_lists
183-
$(MAKE) extern
186+
$(MAKE) external
184187
$(MAKE) updateCloopInterfaces
185188
$(MAKE) boot
186189
$(MAKE) yvalve
@@ -215,7 +218,7 @@ cross1:
215218
ln -sf $(SRC_ROOT)/include/gen/autoconfig.auto $(SRC_ROOT)/include/gen/autoconfig.h
216219
$(MAKE) updateBuildNum
217220
$(MAKE) export_lists
218-
$(MAKE) extern
221+
$(MAKE) external
219222
$(MAKE) updateCloopInterfaces
220223
$(MAKE) boot
221224
$(MAKE) yvalve

‎builds/posix/make.android.arme

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ LDFLAGS += --sysroot=$(CROSS_PLATFORM) -L$(NDK)/sources/cxx-stl/gnu-libstdc++/$(
5656
DroidLibs := -lm -ldl -lsupc++
5757

5858
LINK_LIBS = $(DroidLibs)
59-
STATICLINK_LIBS = $(DroidLibs)
6059
SO_LINK_LIBS = $(DroidLibs)
6160

6261
EXE_LINK_OPTIONS= $(LDFLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) $(LINK_EMPTY_SYMBOLS)

‎builds/posix/make.defaults

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ CAS_OPTIONS=@CAS_OPTIONS@
132132

133133
# multiple-precision integer library
134134
MATHLIB=@MATHLIB@
135+
DECLIB=-ldecFloat
135136

136137
LSB_FLG=@LSB_FLG@
137138
ifeq ($(LSB_FLG), Y)
@@ -177,9 +178,8 @@ STATICLIB_LINK = $(AR) crus
177178
EXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS)
178179
STATICEXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS)
179180

180-
LINK_LIBS = @LIBS@
181-
STATICLINK_LIBS = @LIBS@
182-
SO_LINK_LIBS = @LIBS@
181+
LINK_LIBS = @LIBS@ $(DECLIB)
182+
SO_LINK_LIBS = @LIBS@ $(DECLIB)
183183

184184
# Default extensions
185185

‎builds/posix/make.platform.solaris.examples

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ DEV_FLAGS=$(COMM_SOLX_FLAGS) -ggdb -g3 -p $(WARNINGS)
3030

3131
ifdef SFIO
3232
LINK_LIBS+=$(SFIO_LDFLAGS) -lstdio -lsfio
33-
STATICLINK_LIBS+=$(SFIO_LDFLAGS) -lstdio -lsfio
3433
SO_LINK_LIBS+=$(SFIO_LDFLAGS) -lstdio -lsfio
3534
endif
3635

‎builds/posix/prefix.solx86gcc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ PROD_FLAGS=-w $(COMM_SOLX_FLAGS) -O2 -march=pentium
3636
DEV_FLAGS=$(COMM_SOLX_FLAGS) -ggdb -g3 -p $(WARNINGS)
3737
ifdef SFIO
3838
LINK_LIBS+=$(SFIO_LDFLAGS) -lstdio -lsfio
39-
STATICLINK_LIBS+=$(SFIO_LDFLAGS) -lstdio -lsfio
4039
SO_LINK_LIBS+=$(SFIO_LDFLAGS) -lstdio -lsfio
4140
endif
4241

‎builds/posix/prefix.solx86gcc_64

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# ./configure --build=x86_64-pc-solaris2.10
2828
# copy libncurses.a from the ncurses build to gen/firebird/lib
2929
# make sure that make.defaults uses -lncurses instead of -lcurses for
30-
# LINK_LIBS and STATICLINK_LIBS e.g. -lncurses -leditline
30+
# LINK_LIBS and SO_LINK_LIBS e.g. -lncurses -leditline
3131

3232
WARNINGS=-Wall -Wno-switch -Wno-parentheses -Wno-unused-variable -Wno-non-virtual-dtor
3333
COMM_SOLX_FLAGS:=-DSOLARIS -DBSD_COMP -DAMD64 -pipe -fmessage-length=0 -MMD -fPIC
@@ -46,7 +46,6 @@ PROD_FLAGS=-w $(COMM_SOLX_FLAGS) -O2
4646
DEV_FLAGS=$(COMM_SOLX_FLAGS) -ggdb $(WARNINGS)
4747
ifdef SFIO
4848
LINK_LIBS+=$(SFIO_LDFLAGS) -lstdio -lsfio
49-
STATICLINK_LIBS+=$(SFIO_LDFLAGS) -lstdio -lsfio
5049
SO_LINK_LIBS+=$(SFIO_LDFLAGS) -lstdio -lsfio
5150
endif
5251

‎extern/decNumber/ICU-license.html

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<html>
2+
3+
<head>
4+
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></meta>
5+
<title>ICU License - ICU 1.8.1 and later</title>
6+
</head>
7+
8+
<body>
9+
<h1>ICU License - ICU 1.8.1 and later</h1>
10+
<pre>
11+
COPYRIGHT AND PERMISSION NOTICE
12+
13+
Copyright (c) 1995-2005 International Business Machines Corporation and others
14+
All rights reserved.
15+
16+
Permission is hereby granted, free of charge, to any person obtaining a
17+
copy of this software and associated documentation files (the
18+
"Software"), to deal in the Software without restriction, including
19+
without limitation the rights to use, copy, modify, merge, publish,
20+
distribute, and/or sell copies of the Software, and to permit persons
21+
to whom the Software is furnished to do so, provided that the above
22+
copyright notice(s) and this permission notice appear in all copies of
23+
the Software and that both the above copyright notice(s) and this
24+
permission notice appear in supporting documentation.
25+
26+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
27+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
28+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
29+
OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
30+
HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
31+
INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
32+
FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
33+
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
34+
WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
35+
36+
Except as contained in this notice, the name of a copyright holder
37+
shall not be used in advertising or otherwise to promote the sale, use
38+
or other dealings in this Software without prior written authorization
39+
of the copyright holder.
40+
41+
--------------------------------------------------------------------------------
42+
All trademarks and registered trademarks mentioned herein are the property of their respective owners.
43+
</pre>
44+
</body>
45+
</html>

0 commit comments

Comments
 (0)