Skip to content

Changes needed for me to compile/link on Ubuntu 22 #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changes needed for me to compile/link on Ubuntu 22 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions setup/x86_64.linux-default.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ ifeq ($(GCC_WCONVERSION_IS_SUPPORTED),1)
endif

# Set compiler options
CFLAGS = -std=c99 -D_GNU_SOURCE -DOSPL_LINUX $(CFLAGS_OPT) $(CFLAGS_DEBUG) $(CFLAGS_STRICT) $(CFLAGS_STRICT_UNINITIALIZED) $(MTCFLAGS)
CXXFLAGS = -D_GNU_SOURCE -DOSPL_LINUX $(CFLAGS_OPT) $(CFLAGS_DEBUG) $(CFLAGS_STRICT_UNINITIALIZED) $(MTCFLAGS)
CFLAGS = -std=c99 -D_GNU_SOURCE -DOSPL_LINUX $(CFLAGS_OPT) $(CFLAGS_DEBUG) $(CFLAGS_STRICT) $(MTCFLAGS)
CXXFLAGS = -D_GNU_SOURCE -DOSPL_LINUX $(CFLAGS_OPT) $(CFLAGS_DEBUG) $(MTCFLAGS)
CSFLAGS = -noconfig -nowarn:1701,1702 -warn:4 $(CSFLAGS_DEBUG) -optimize-

# For Linux, this test release version supports symbolic names in stead of IP addresses
Expand Down
2 changes: 1 addition & 1 deletion setup/x86_64.linux-release/config.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include $(OSPL_HOME)/setup/$(PROC).$(OS)$(OS_REV)-default.mak
endif

# Compiler flags
CFLAGS_OPT = -O3 -fno-strict-aliasing
CFLAGS_OPT = -O3 -fno-strict-aliasing -Wno-error
CFLAGS_DEBUG = -DNDEBUG
JCFLAGS = -g -nowarn

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/code/expr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ extern EORB_CPP_node * read_expr_ (void);
extern EORB_CPP_node * read_expr_p (void);
extern int eval_expr (int, int);

int expr_sharp;
extern int expr_sharp;

#endif
3 changes: 3 additions & 0 deletions src/cpp/code/if.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,9 @@ extern void do_endif (int sharp)
}
}

IF *ifstack;
int n_skipped_ifs;

static void iftrue (void)
{
IF *i;
Expand Down
4 changes: 2 additions & 2 deletions src/cpp/code/if.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ extern "C"
#define IFSTATE_FALSE 1
#define IFSTATE_STAYFALSE 2

IF *ifstack;
int n_skipped_ifs;
extern IF *ifstack;
extern int n_skipped_ifs;

extern void do_sharp (void);
extern void do_if (int);
Expand Down
3 changes: 3 additions & 0 deletions src/tools/idlpp/code/idl_genIdlHelper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
#include "idl_keyDef.h"
#include "idl_streamsDef.h"

os_iter idl_idlScopeKeyList;
os_iter idl_idlScopeStreamsList;

/* The functions in this file create a key list and a streams list, that apply
* only to the file being handled. This is in contrast to the lists that are
* created when the meta model is created within the idl_base.l/y code (when the
Expand Down
6 changes: 3 additions & 3 deletions src/tools/idlpp/code/idl_genIdlHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

#include "idl_program.h"

os_iter idl_idlScopeKeyList;
os_iter idl_idlScopeStreamsList;
extern os_iter idl_idlScopeKeyList;
extern os_iter idl_idlScopeStreamsList;

idl_program idl_genIdlHelperProgram (void);
extern idl_program idl_genIdlHelperProgram (void);

#endif /* IDL_GENIDLHELPER_H */
4 changes: 4 additions & 0 deletions src/tools/idlpp/code/idl_genSimulinkHelper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
#include "os_string.h"
#include "os_heap.h"

ut_table simulink_propertiesTable;
ut_table simulink_nameTable;
char *simulink_propertiesFileName;

c_char
*simulinkScope(
idl_scope scope)
Expand Down
6 changes: 3 additions & 3 deletions src/tools/idlpp/code/idl_genSimulinkHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
#include "idl_typeSpecifier.h"
#include "ut_collection.h"

ut_table simulink_propertiesTable;
ut_table simulink_nameTable;
char *simulink_propertiesFileName;
extern ut_table simulink_propertiesTable;
extern ut_table simulink_nameTable;
extern char *simulink_propertiesFileName;

c_char *simulinkScope(idl_scope typeSpec);
ut_table simulink_createTable();
Expand Down